diff --git a/flake.nix b/flake.nix index d1f70b3..dd5d8c4 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,7 @@ desktop1 = mkHost ./hosts/desktop1/configuration.nix; server1 = mkHost ./hosts/server1/configuration.nix; laptop1 = mkHost ./hosts/laptop1/configuration.nix; + laptop2 = mkHost ./hosts/laptop2/configuration.nix; }; }; diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix index 14bbcaf..6752425 100644 --- a/hosts/laptop1/configuration.nix +++ b/hosts/laptop1/configuration.nix @@ -10,6 +10,7 @@ laptop.enable = true; hyprland.enable = true; kde.enable = true; + grub-on-lap.enable = true; }; home-manager = { diff --git a/hosts/laptop2/configuration.nix b/hosts/laptop2/configuration.nix new file mode 100644 index 0000000..0d9e4cf --- /dev/null +++ b/hosts/laptop2/configuration.nix @@ -0,0 +1,29 @@ +{ inputs, config, ... }: + +{ + imports = [ + ../common/common.nix + ./hardware-configuration.nix + ]; + + smayzy = { + laptop.enable = true; + hyprland.enable = true; + kde.enable = true; + }; + + home-manager = { + extraSpecialArgs = { + inherit inputs; + smayzy = config.smayzy; + }; + users = { + smayzy = import ./home.nix; + }; + backupFileExtension = "backup"; + }; + + system.stateVersion = "24.11"; + + networking.hostName = "laptop2"; +} diff --git a/hosts/laptop2/hardware-configuration.nix b/hosts/laptop2/hardware-configuration.nix new file mode 100644 index 0000000..b19bbbf --- /dev/null +++ b/hosts/laptop2/hardware-configuration.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ceed0ac4-72b3-4050-b8a3-0b91aa845da0"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/65F0-BF7E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/3567a75d-12cc-4c3e-a37d-9b99708cbfea"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/laptop2/home.nix b/hosts/laptop2/home.nix new file mode 100644 index 0000000..e328f19 --- /dev/null +++ b/hosts/laptop2/home.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ../common/home.nix + ]; +} diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index 6ec7a89..9eacdaf 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -18,7 +18,6 @@ in smayzy = { base = true; power = "laptop"; - grub-on-lap.enable = true; audio.enable = true; office.enable = true; sddm.enable = true;