From 47a69f76ec6241ac7c933dfba49455b3d364a6eb Mon Sep 17 00:00:00 2001 From: ene Date: Sun, 5 Feb 2023 13:00:04 +0100 Subject: Feat: Switch to Default.nix files This make the imported path somewhat shorter. --- hosts/Apzu/configuration.nix | 6 +++--- hosts/Apzu/hardware/default.nix | 28 ++++++++++++++++++++++++++++ hosts/Apzu/hardware/hardware.nix | 28 ---------------------------- hosts/Tiamat/configuration.nix | 6 +++--- hosts/Tiamat/hardware/default.nix | 28 ++++++++++++++++++++++++++++ hosts/Tiamat/hardware/hardware.nix | 28 ---------------------------- services/default.nix | 7 +++++++ services/services.nix | 7 ------- system/default.nix | 10 ++++++++++ system/system.nix | 10 ---------- 10 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 hosts/Apzu/hardware/default.nix delete mode 100644 hosts/Apzu/hardware/hardware.nix create mode 100644 hosts/Tiamat/hardware/default.nix delete mode 100644 hosts/Tiamat/hardware/hardware.nix create mode 100644 services/default.nix delete mode 100644 services/services.nix create mode 100644 system/default.nix delete mode 100644 system/system.nix diff --git a/hosts/Apzu/configuration.nix b/hosts/Apzu/configuration.nix index e42cb05f..8e78949b 100644 --- a/hosts/Apzu/configuration.nix +++ b/hosts/Apzu/configuration.nix @@ -7,12 +7,12 @@ ... }: { imports = [ - ./hardware/hardware.nix + ./hardware ./networking.nix - ../../system/system.nix + ../../system - ../../services/services.nix + ../../services ]; system.stateVersion = "23.05"; diff --git a/hosts/Apzu/hardware/default.nix b/hosts/Apzu/hardware/default.nix new file mode 100644 index 00000000..c36b7062 --- /dev/null +++ b/hosts/Apzu/hardware/default.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? + ./cpu.nix + ./gpu.nix + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + system.filesystemLayouts = { + enable = true; + mainDisk = "/dev/disk/by-uuid/"; + efiDisk = "/dev/disk/by-uuid/"; + }; + + boot = { + kernelModules = ["kvm-amd"]; + + # TODO check this: + initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + }; +} diff --git a/hosts/Apzu/hardware/hardware.nix b/hosts/Apzu/hardware/hardware.nix deleted file mode 100644 index c36b7062..00000000 --- a/hosts/Apzu/hardware/hardware.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? - ./cpu.nix - ./gpu.nix - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - system.filesystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/"; - efiDisk = "/dev/disk/by-uuid/"; - }; - - boot = { - kernelModules = ["kvm-amd"]; - - # TODO check this: - initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; - }; -} diff --git a/hosts/Tiamat/configuration.nix b/hosts/Tiamat/configuration.nix index e42cb05f..8e78949b 100644 --- a/hosts/Tiamat/configuration.nix +++ b/hosts/Tiamat/configuration.nix @@ -7,12 +7,12 @@ ... }: { imports = [ - ./hardware/hardware.nix + ./hardware ./networking.nix - ../../system/system.nix + ../../system - ../../services/services.nix + ../../services ]; system.stateVersion = "23.05"; diff --git a/hosts/Tiamat/hardware/default.nix b/hosts/Tiamat/hardware/default.nix new file mode 100644 index 00000000..c36b7062 --- /dev/null +++ b/hosts/Tiamat/hardware/default.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? + ./cpu.nix + ./gpu.nix + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + system.filesystemLayouts = { + enable = true; + mainDisk = "/dev/disk/by-uuid/"; + efiDisk = "/dev/disk/by-uuid/"; + }; + + boot = { + kernelModules = ["kvm-amd"]; + + # TODO check this: + initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + }; +} diff --git a/hosts/Tiamat/hardware/hardware.nix b/hosts/Tiamat/hardware/hardware.nix deleted file mode 100644 index c36b7062..00000000 --- a/hosts/Tiamat/hardware/hardware.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? - ./cpu.nix - ./gpu.nix - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - system.filesystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/"; - efiDisk = "/dev/disk/by-uuid/"; - }; - - boot = { - kernelModules = ["kvm-amd"]; - - # TODO check this: - initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; - }; -} diff --git a/services/default.nix b/services/default.nix new file mode 100644 index 00000000..27e5086f --- /dev/null +++ b/services/default.nix @@ -0,0 +1,7 @@ +{config, ...}: { + imports = [ + ./zsh/zsh.nix + ./printing/printing.nix + ./nix/nix.nix + ]; +} diff --git a/services/services.nix b/services/services.nix deleted file mode 100644 index 27e5086f..00000000 --- a/services/services.nix +++ /dev/null @@ -1,7 +0,0 @@ -{config, ...}: { - imports = [ - ./zsh/zsh.nix - ./printing/printing.nix - ./nix/nix.nix - ]; -} diff --git a/system/default.nix b/system/default.nix new file mode 100644 index 00000000..17e78968 --- /dev/null +++ b/system/default.nix @@ -0,0 +1,10 @@ +{config, ...}: { + imports = [ + ./boot/boot.nix + ./filesystemLayouts/filesystemLayouts.nix + ./locale/locale.nix + ./packages/packages.nix + ./sound/sound.nix + ./users/users.nix + ]; +} diff --git a/system/system.nix b/system/system.nix deleted file mode 100644 index 17e78968..00000000 --- a/system/system.nix +++ /dev/null @@ -1,10 +0,0 @@ -{config, ...}: { - imports = [ - ./boot/boot.nix - ./filesystemLayouts/filesystemLayouts.nix - ./locale/locale.nix - ./packages/packages.nix - ./sound/sound.nix - ./users/users.nix - ]; -} -- cgit 1.4.1