From cba7b6b8335797137b387e08fa7ac955cb5692b2 Mon Sep 17 00:00:00 2001 From: andromeda Date: Tue, 30 Dec 2025 01:40:54 +0100 Subject: change machine specification --- flake.nix | 4 +-- hardware-configuration.nix | 41 ------------------------------ machines/laptop.nix | 5 ---- machines/laptop/hardware-configuration.nix | 41 ++++++++++++++++++++++++++++++ machines/laptop/machine.nix | 6 +++++ 5 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 hardware-configuration.nix delete mode 100644 machines/laptop.nix create mode 100644 machines/laptop/hardware-configuration.nix create mode 100644 machines/laptop/machine.nix diff --git a/flake.nix b/flake.nix index dad3a4f..f71dc4e 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ stylix, ... }: let - laptop = import ./machines/laptop.nix; + laptop = import ./machines/laptop/machine.nix; in { nixosConfigurations.${laptop.hostname} = nixpkgs.lib.nixosSystem { system = laptop.system; @@ -66,7 +66,7 @@ impermanence.nixosModules.impermanence noshell.nixosModules.default ./configuration.nix - ./hardware-configuration.nix + laptop.hardware-configuration ]; }; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 2c0a93f..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# 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" "sdhci_pci"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - options = ["defaults" "size=25%" "mode=755"]; - }; - - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6"; - fsType = "btrfs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/F425-55BA"; - fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; - }; - - swapDevices = []; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/machines/laptop.nix b/machines/laptop.nix deleted file mode 100644 index c70deb9..0000000 --- a/machines/laptop.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - hostname = "lenovo"; - usernames = ["andromeda"]; - system = "x86_64-linux"; -} diff --git a/machines/laptop/hardware-configuration.nix b/machines/laptop/hardware-configuration.nix new file mode 100644 index 0000000..e0a98d9 --- /dev/null +++ b/machines/laptop/hardware-configuration.nix @@ -0,0 +1,41 @@ +# 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" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + options = ["defaults" "size=60%" "mode=755"]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/F425-55BA"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; + + swapDevices = []; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/laptop/machine.nix b/machines/laptop/machine.nix new file mode 100644 index 0000000..d6b1e01 --- /dev/null +++ b/machines/laptop/machine.nix @@ -0,0 +1,6 @@ +{ + hostname = "lenovo"; + usernames = ["andromeda"]; + system = "x86_64-linux"; + hardware-configuration = ./hardware-configuration.nix; +} -- cgit v1.3