From 081848ddfc45f6b1038bd3ecc5601056a33b5837 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 9 Sep 2024 11:11:53 +0200 Subject: [PATCH] hosts: remove cr, move systems up directory --- hosts/default.nix | 4 ++-- hosts/{cr => }/hermit/configuration.nix | 1 + hosts/{cr => }/hermit/default.nix | 0 hosts/{cr => }/hermit/hardware-configuration.nix | 0 hosts/{cr => }/hermit/hardware/default.nix | 0 hosts/{cr => }/hermit/hardware/fs.nix | 0 hosts/{cr => }/hermit/hardware/monitors.nix | 0 hosts/{cr => }/hermit/kernel/default.nix | 0 hosts/{cr => }/hermit/programs.nix | 0 hosts/{cr => }/temperance/configuration.nix | 0 hosts/{cr => }/temperance/default.nix | 0 hosts/{cr => }/temperance/hardware-configuration.nix | 0 hosts/{cr => }/temperance/hardware/default.nix | 0 hosts/{cr => }/temperance/hardware/monitors.nix | 0 hosts/{cr => }/temperance/profile.nix | 0 hosts/{cr => }/temperance/programs.nix | 0 16 files changed, 3 insertions(+), 2 deletions(-) rename hosts/{cr => }/hermit/configuration.nix (98%) rename hosts/{cr => }/hermit/default.nix (100%) rename hosts/{cr => }/hermit/hardware-configuration.nix (100%) rename hosts/{cr => }/hermit/hardware/default.nix (100%) rename hosts/{cr => }/hermit/hardware/fs.nix (100%) rename hosts/{cr => }/hermit/hardware/monitors.nix (100%) rename hosts/{cr => }/hermit/kernel/default.nix (100%) rename hosts/{cr => }/hermit/programs.nix (100%) rename hosts/{cr => }/temperance/configuration.nix (100%) rename hosts/{cr => }/temperance/default.nix (100%) rename hosts/{cr => }/temperance/hardware-configuration.nix (100%) rename hosts/{cr => }/temperance/hardware/default.nix (100%) rename hosts/{cr => }/temperance/hardware/monitors.nix (100%) rename hosts/{cr => }/temperance/profile.nix (100%) rename hosts/{cr => }/temperance/programs.nix (100%) diff --git a/hosts/default.nix b/hosts/default.nix index df2349d..1724c7d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -16,10 +16,10 @@ concatLists [ # Derive host specific module path from the first argument of the # function. Should be a string, obviously. - (singleton ./cr/${hostname}/default.nix) + (singleton ./${hostname}/default.nix) # Recursively import all module trees (i.e. directories with a `module.nix`) - # for given moduleTree directories, and in addition, roles. + # for given moduleTree directories (mkModuleTree' {path = ../modules;}) ] ); diff --git a/hosts/cr/hermit/configuration.nix b/hosts/hermit/configuration.nix similarity index 98% rename from hosts/cr/hermit/configuration.nix rename to hosts/hermit/configuration.nix index a626477..41b2554 100644 --- a/hosts/cr/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -17,6 +17,7 @@ fstrim.enable = lib.mkDefault true; thermald.enable = true; auto-cpufreq.enable = true; + printing.enable = true; }; modules = { diff --git a/hosts/cr/hermit/default.nix b/hosts/hermit/default.nix similarity index 100% rename from hosts/cr/hermit/default.nix rename to hosts/hermit/default.nix diff --git a/hosts/cr/hermit/hardware-configuration.nix b/hosts/hermit/hardware-configuration.nix similarity index 100% rename from hosts/cr/hermit/hardware-configuration.nix rename to hosts/hermit/hardware-configuration.nix diff --git a/hosts/cr/hermit/hardware/default.nix b/hosts/hermit/hardware/default.nix similarity index 100% rename from hosts/cr/hermit/hardware/default.nix rename to hosts/hermit/hardware/default.nix diff --git a/hosts/cr/hermit/hardware/fs.nix b/hosts/hermit/hardware/fs.nix similarity index 100% rename from hosts/cr/hermit/hardware/fs.nix rename to hosts/hermit/hardware/fs.nix diff --git a/hosts/cr/hermit/hardware/monitors.nix b/hosts/hermit/hardware/monitors.nix similarity index 100% rename from hosts/cr/hermit/hardware/monitors.nix rename to hosts/hermit/hardware/monitors.nix diff --git a/hosts/cr/hermit/kernel/default.nix b/hosts/hermit/kernel/default.nix similarity index 100% rename from hosts/cr/hermit/kernel/default.nix rename to hosts/hermit/kernel/default.nix diff --git a/hosts/cr/hermit/programs.nix b/hosts/hermit/programs.nix similarity index 100% rename from hosts/cr/hermit/programs.nix rename to hosts/hermit/programs.nix diff --git a/hosts/cr/temperance/configuration.nix b/hosts/temperance/configuration.nix similarity index 100% rename from hosts/cr/temperance/configuration.nix rename to hosts/temperance/configuration.nix diff --git a/hosts/cr/temperance/default.nix b/hosts/temperance/default.nix similarity index 100% rename from hosts/cr/temperance/default.nix rename to hosts/temperance/default.nix diff --git a/hosts/cr/temperance/hardware-configuration.nix b/hosts/temperance/hardware-configuration.nix similarity index 100% rename from hosts/cr/temperance/hardware-configuration.nix rename to hosts/temperance/hardware-configuration.nix diff --git a/hosts/cr/temperance/hardware/default.nix b/hosts/temperance/hardware/default.nix similarity index 100% rename from hosts/cr/temperance/hardware/default.nix rename to hosts/temperance/hardware/default.nix diff --git a/hosts/cr/temperance/hardware/monitors.nix b/hosts/temperance/hardware/monitors.nix similarity index 100% rename from hosts/cr/temperance/hardware/monitors.nix rename to hosts/temperance/hardware/monitors.nix diff --git a/hosts/cr/temperance/profile.nix b/hosts/temperance/profile.nix similarity index 100% rename from hosts/cr/temperance/profile.nix rename to hosts/temperance/profile.nix diff --git a/hosts/cr/temperance/programs.nix b/hosts/temperance/programs.nix similarity index 100% rename from hosts/cr/temperance/programs.nix rename to hosts/temperance/programs.nix