diff --git a/configuration.nix b/configuration.nix index 3b26fcd..78a1738 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,7 +6,6 @@ }: { imports = [ - ./hardware-configuration.nix ./easyroam.nix ./stylix.nix ./nixvim/nixvim.nix diff --git a/flake.nix b/flake.nix index 5b5ea48..dd70ec5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { modules = [ + ./configuration.nix ./nixvim/nixvim.nix nix-easyroam.nixosModules.nix-easyroam @@ -56,6 +57,10 @@ } ({ lib, ... }: { networking.hostName = lib.mkForce "seele"; + imports = [ + ./hardware-configuration-laptop.nix + ]; + }) ]; @@ -78,6 +83,9 @@ lanzaboote.nixosModules.lanzaboote ({ pkgs, lib, ... }: { + imports = [ + ./hardware-configuration-desktop.nix + ]; networking.hostName = lib.mkForce "nerv"; environment.systemPackages = [ # For debugging and troubleshooting Secure Boot. diff --git a/hardware-configuration-desktop.nix b/hardware-configuration-desktop.nix new file mode 100644 index 0000000..64df67f --- /dev/null +++ b/hardware-configuration-desktop.nix @@ -0,0 +1,31 @@ +# 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 = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/64a37727-0c5f-41d4-afac-dc26978916c1"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F424-0E3E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hardware-configuration.nix b/hardware-configuration-laptop.nix similarity index 100% rename from hardware-configuration.nix rename to hardware-configuration-laptop.nix