From fca6296841fb55d9c3e8394bc25af9d1150e61e8 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 13 Apr 2024 19:05:42 +0200 Subject: [PATCH] Group shared system settings --- system/default.nix | 13 ++----------- system/{ => shared}/boot/default.nix | 0 system/{ => shared}/boot/generic.nix | 0 system/{ => shared}/boot/initrd.nix | 0 system/{ => shared}/boot/loaders/default.nix | 0 system/{ => shared}/boot/loaders/systemd-boot.nix | 0 system/{ => shared}/boot/plymouth.nix | 0 system/{ => shared}/boot/secure-boot.nix | 0 system/shared/default.nix | 14 ++++++++++++++ system/{ => shared}/environment/default.nix | 0 system/{ => shared}/environment/packages.nix | 0 system/{ => shared}/environment/paths.nix | 0 system/{ => shared}/environment/variables.nix | 0 system/{ => shared}/hardware/cpu/amd.nix | 0 system/{ => shared}/hardware/cpu/default.nix | 0 system/{ => shared}/hardware/cpu/intel.nix | 0 system/{ => shared}/hardware/default.nix | 0 system/{ => shared}/hardware/generic.nix | 0 system/{ => shared}/hardware/tpm.nix | 0 system/{ => shared}/impermanence/autowipe.nix | 0 system/{ => shared}/impermanence/default.nix | 0 system/{ => shared}/impermanence/root.nix | 0 system/{ => shared}/localisation.nix | 0 system/{ => shared}/network.nix | 0 system/{ => shared}/nix/cachix.nix | 0 system/{ => shared}/nix/default.nix | 0 system/{ => shared}/nix/gc.nix | 0 system/{ => shared}/programs.nix | 0 system/{ => shared}/services/default.nix | 0 system/{ => shared}/services/fwupd.nix | 0 system/{ => shared}/services/logrotate.nix | 0 system/{ => shared}/services/oomd.nix | 0 system/{ => shared}/services/ssh.nix | 0 system/{ => shared}/services/thermald.nix | 0 system/{ => shared}/system.nix | 0 35 files changed, 16 insertions(+), 11 deletions(-) rename system/{ => shared}/boot/default.nix (100%) rename system/{ => shared}/boot/generic.nix (100%) rename system/{ => shared}/boot/initrd.nix (100%) rename system/{ => shared}/boot/loaders/default.nix (100%) rename system/{ => shared}/boot/loaders/systemd-boot.nix (100%) rename system/{ => shared}/boot/plymouth.nix (100%) rename system/{ => shared}/boot/secure-boot.nix (100%) create mode 100644 system/shared/default.nix rename system/{ => shared}/environment/default.nix (100%) rename system/{ => shared}/environment/packages.nix (100%) rename system/{ => shared}/environment/paths.nix (100%) rename system/{ => shared}/environment/variables.nix (100%) rename system/{ => shared}/hardware/cpu/amd.nix (100%) rename system/{ => shared}/hardware/cpu/default.nix (100%) rename system/{ => shared}/hardware/cpu/intel.nix (100%) rename system/{ => shared}/hardware/default.nix (100%) rename system/{ => shared}/hardware/generic.nix (100%) rename system/{ => shared}/hardware/tpm.nix (100%) rename system/{ => shared}/impermanence/autowipe.nix (100%) rename system/{ => shared}/impermanence/default.nix (100%) rename system/{ => shared}/impermanence/root.nix (100%) rename system/{ => shared}/localisation.nix (100%) rename system/{ => shared}/network.nix (100%) rename system/{ => shared}/nix/cachix.nix (100%) rename system/{ => shared}/nix/default.nix (100%) rename system/{ => shared}/nix/gc.nix (100%) rename system/{ => shared}/programs.nix (100%) rename system/{ => shared}/services/default.nix (100%) rename system/{ => shared}/services/fwupd.nix (100%) rename system/{ => shared}/services/logrotate.nix (100%) rename system/{ => shared}/services/oomd.nix (100%) rename system/{ => shared}/services/ssh.nix (100%) rename system/{ => shared}/services/thermald.nix (100%) rename system/{ => shared}/system.nix (100%) diff --git a/system/default.nix b/system/default.nix index 5ed5a2c..2f3be58 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,14 +1,5 @@ -_: { +{ imports = [ - ./hardware - ./boot - ./services - ./nix - ./environment - ./impermanence - ./programs.nix - ./system.nix - ./network.nix - ./localisation.nix + ./shared ]; } diff --git a/system/boot/default.nix b/system/shared/boot/default.nix similarity index 100% rename from system/boot/default.nix rename to system/shared/boot/default.nix diff --git a/system/boot/generic.nix b/system/shared/boot/generic.nix similarity index 100% rename from system/boot/generic.nix rename to system/shared/boot/generic.nix diff --git a/system/boot/initrd.nix b/system/shared/boot/initrd.nix similarity index 100% rename from system/boot/initrd.nix rename to system/shared/boot/initrd.nix diff --git a/system/boot/loaders/default.nix b/system/shared/boot/loaders/default.nix similarity index 100% rename from system/boot/loaders/default.nix rename to system/shared/boot/loaders/default.nix diff --git a/system/boot/loaders/systemd-boot.nix b/system/shared/boot/loaders/systemd-boot.nix similarity index 100% rename from system/boot/loaders/systemd-boot.nix rename to system/shared/boot/loaders/systemd-boot.nix diff --git a/system/boot/plymouth.nix b/system/shared/boot/plymouth.nix similarity index 100% rename from system/boot/plymouth.nix rename to system/shared/boot/plymouth.nix diff --git a/system/boot/secure-boot.nix b/system/shared/boot/secure-boot.nix similarity index 100% rename from system/boot/secure-boot.nix rename to system/shared/boot/secure-boot.nix diff --git a/system/shared/default.nix b/system/shared/default.nix new file mode 100644 index 0000000..5ed5a2c --- /dev/null +++ b/system/shared/default.nix @@ -0,0 +1,14 @@ +_: { + imports = [ + ./hardware + ./boot + ./services + ./nix + ./environment + ./impermanence + ./programs.nix + ./system.nix + ./network.nix + ./localisation.nix + ]; +} diff --git a/system/environment/default.nix b/system/shared/environment/default.nix similarity index 100% rename from system/environment/default.nix rename to system/shared/environment/default.nix diff --git a/system/environment/packages.nix b/system/shared/environment/packages.nix similarity index 100% rename from system/environment/packages.nix rename to system/shared/environment/packages.nix diff --git a/system/environment/paths.nix b/system/shared/environment/paths.nix similarity index 100% rename from system/environment/paths.nix rename to system/shared/environment/paths.nix diff --git a/system/environment/variables.nix b/system/shared/environment/variables.nix similarity index 100% rename from system/environment/variables.nix rename to system/shared/environment/variables.nix diff --git a/system/hardware/cpu/amd.nix b/system/shared/hardware/cpu/amd.nix similarity index 100% rename from system/hardware/cpu/amd.nix rename to system/shared/hardware/cpu/amd.nix diff --git a/system/hardware/cpu/default.nix b/system/shared/hardware/cpu/default.nix similarity index 100% rename from system/hardware/cpu/default.nix rename to system/shared/hardware/cpu/default.nix diff --git a/system/hardware/cpu/intel.nix b/system/shared/hardware/cpu/intel.nix similarity index 100% rename from system/hardware/cpu/intel.nix rename to system/shared/hardware/cpu/intel.nix diff --git a/system/hardware/default.nix b/system/shared/hardware/default.nix similarity index 100% rename from system/hardware/default.nix rename to system/shared/hardware/default.nix diff --git a/system/hardware/generic.nix b/system/shared/hardware/generic.nix similarity index 100% rename from system/hardware/generic.nix rename to system/shared/hardware/generic.nix diff --git a/system/hardware/tpm.nix b/system/shared/hardware/tpm.nix similarity index 100% rename from system/hardware/tpm.nix rename to system/shared/hardware/tpm.nix diff --git a/system/impermanence/autowipe.nix b/system/shared/impermanence/autowipe.nix similarity index 100% rename from system/impermanence/autowipe.nix rename to system/shared/impermanence/autowipe.nix diff --git a/system/impermanence/default.nix b/system/shared/impermanence/default.nix similarity index 100% rename from system/impermanence/default.nix rename to system/shared/impermanence/default.nix diff --git a/system/impermanence/root.nix b/system/shared/impermanence/root.nix similarity index 100% rename from system/impermanence/root.nix rename to system/shared/impermanence/root.nix diff --git a/system/localisation.nix b/system/shared/localisation.nix similarity index 100% rename from system/localisation.nix rename to system/shared/localisation.nix diff --git a/system/network.nix b/system/shared/network.nix similarity index 100% rename from system/network.nix rename to system/shared/network.nix diff --git a/system/nix/cachix.nix b/system/shared/nix/cachix.nix similarity index 100% rename from system/nix/cachix.nix rename to system/shared/nix/cachix.nix diff --git a/system/nix/default.nix b/system/shared/nix/default.nix similarity index 100% rename from system/nix/default.nix rename to system/shared/nix/default.nix diff --git a/system/nix/gc.nix b/system/shared/nix/gc.nix similarity index 100% rename from system/nix/gc.nix rename to system/shared/nix/gc.nix diff --git a/system/programs.nix b/system/shared/programs.nix similarity index 100% rename from system/programs.nix rename to system/shared/programs.nix diff --git a/system/services/default.nix b/system/shared/services/default.nix similarity index 100% rename from system/services/default.nix rename to system/shared/services/default.nix diff --git a/system/services/fwupd.nix b/system/shared/services/fwupd.nix similarity index 100% rename from system/services/fwupd.nix rename to system/shared/services/fwupd.nix diff --git a/system/services/logrotate.nix b/system/shared/services/logrotate.nix similarity index 100% rename from system/services/logrotate.nix rename to system/shared/services/logrotate.nix diff --git a/system/services/oomd.nix b/system/shared/services/oomd.nix similarity index 100% rename from system/services/oomd.nix rename to system/shared/services/oomd.nix diff --git a/system/services/ssh.nix b/system/shared/services/ssh.nix similarity index 100% rename from system/services/ssh.nix rename to system/shared/services/ssh.nix diff --git a/system/services/thermald.nix b/system/shared/services/thermald.nix similarity index 100% rename from system/services/thermald.nix rename to system/shared/services/thermald.nix diff --git a/system/system.nix b/system/shared/system.nix similarity index 100% rename from system/system.nix rename to system/shared/system.nix