From 8a577bc38ad4f50ba9f75cb4dd701e1d96551091 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 8 Sep 2024 21:09:17 +0200 Subject: [PATCH] hosts: switch to cr --- hosts/{vali => cr}/hermit/configuration.nix | 0 hosts/{vali => cr}/hermit/default.nix | 0 hosts/{vali => cr}/hermit/hardware-configuration.nix | 0 hosts/{vali => cr}/hermit/hardware/default.nix | 0 hosts/{vali => cr}/hermit/hardware/fs.nix | 0 hosts/{vali => cr}/hermit/hardware/monitors.nix | 0 hosts/{vali => cr}/hermit/kernel/default.nix | 0 hosts/{vali => cr}/hermit/programs.nix | 0 hosts/{vali => cr}/temperance/configuration.nix | 0 hosts/{vali => cr}/temperance/default.nix | 0 hosts/{vali => cr}/temperance/hardware-configuration.nix | 0 hosts/{vali => cr}/temperance/hardware/default.nix | 0 hosts/{vali => cr}/temperance/hardware/monitors.nix | 0 hosts/{vali => cr}/temperance/profile.nix | 0 hosts/{vali => cr}/temperance/programs.nix | 0 hosts/default.nix | 6 ++++-- 16 files changed, 4 insertions(+), 2 deletions(-) rename hosts/{vali => cr}/hermit/configuration.nix (100%) rename hosts/{vali => cr}/hermit/default.nix (100%) rename hosts/{vali => cr}/hermit/hardware-configuration.nix (100%) rename hosts/{vali => cr}/hermit/hardware/default.nix (100%) rename hosts/{vali => cr}/hermit/hardware/fs.nix (100%) rename hosts/{vali => cr}/hermit/hardware/monitors.nix (100%) rename hosts/{vali => cr}/hermit/kernel/default.nix (100%) rename hosts/{vali => cr}/hermit/programs.nix (100%) rename hosts/{vali => cr}/temperance/configuration.nix (100%) rename hosts/{vali => cr}/temperance/default.nix (100%) rename hosts/{vali => cr}/temperance/hardware-configuration.nix (100%) rename hosts/{vali => cr}/temperance/hardware/default.nix (100%) rename hosts/{vali => cr}/temperance/hardware/monitors.nix (100%) rename hosts/{vali => cr}/temperance/profile.nix (100%) rename hosts/{vali => cr}/temperance/programs.nix (100%) diff --git a/hosts/vali/hermit/configuration.nix b/hosts/cr/hermit/configuration.nix similarity index 100% rename from hosts/vali/hermit/configuration.nix rename to hosts/cr/hermit/configuration.nix diff --git a/hosts/vali/hermit/default.nix b/hosts/cr/hermit/default.nix similarity index 100% rename from hosts/vali/hermit/default.nix rename to hosts/cr/hermit/default.nix diff --git a/hosts/vali/hermit/hardware-configuration.nix b/hosts/cr/hermit/hardware-configuration.nix similarity index 100% rename from hosts/vali/hermit/hardware-configuration.nix rename to hosts/cr/hermit/hardware-configuration.nix diff --git a/hosts/vali/hermit/hardware/default.nix b/hosts/cr/hermit/hardware/default.nix similarity index 100% rename from hosts/vali/hermit/hardware/default.nix rename to hosts/cr/hermit/hardware/default.nix diff --git a/hosts/vali/hermit/hardware/fs.nix b/hosts/cr/hermit/hardware/fs.nix similarity index 100% rename from hosts/vali/hermit/hardware/fs.nix rename to hosts/cr/hermit/hardware/fs.nix diff --git a/hosts/vali/hermit/hardware/monitors.nix b/hosts/cr/hermit/hardware/monitors.nix similarity index 100% rename from hosts/vali/hermit/hardware/monitors.nix rename to hosts/cr/hermit/hardware/monitors.nix diff --git a/hosts/vali/hermit/kernel/default.nix b/hosts/cr/hermit/kernel/default.nix similarity index 100% rename from hosts/vali/hermit/kernel/default.nix rename to hosts/cr/hermit/kernel/default.nix diff --git a/hosts/vali/hermit/programs.nix b/hosts/cr/hermit/programs.nix similarity index 100% rename from hosts/vali/hermit/programs.nix rename to hosts/cr/hermit/programs.nix diff --git a/hosts/vali/temperance/configuration.nix b/hosts/cr/temperance/configuration.nix similarity index 100% rename from hosts/vali/temperance/configuration.nix rename to hosts/cr/temperance/configuration.nix diff --git a/hosts/vali/temperance/default.nix b/hosts/cr/temperance/default.nix similarity index 100% rename from hosts/vali/temperance/default.nix rename to hosts/cr/temperance/default.nix diff --git a/hosts/vali/temperance/hardware-configuration.nix b/hosts/cr/temperance/hardware-configuration.nix similarity index 100% rename from hosts/vali/temperance/hardware-configuration.nix rename to hosts/cr/temperance/hardware-configuration.nix diff --git a/hosts/vali/temperance/hardware/default.nix b/hosts/cr/temperance/hardware/default.nix similarity index 100% rename from hosts/vali/temperance/hardware/default.nix rename to hosts/cr/temperance/hardware/default.nix diff --git a/hosts/vali/temperance/hardware/monitors.nix b/hosts/cr/temperance/hardware/monitors.nix similarity index 100% rename from hosts/vali/temperance/hardware/monitors.nix rename to hosts/cr/temperance/hardware/monitors.nix diff --git a/hosts/vali/temperance/profile.nix b/hosts/cr/temperance/profile.nix similarity index 100% rename from hosts/vali/temperance/profile.nix rename to hosts/cr/temperance/profile.nix diff --git a/hosts/vali/temperance/programs.nix b/hosts/cr/temperance/programs.nix similarity index 100% rename from hosts/vali/temperance/programs.nix rename to hosts/cr/temperance/programs.nix diff --git a/hosts/default.nix b/hosts/default.nix index 74cb26f..df2349d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -8,13 +8,15 @@ inherit (lib.extendedLib.modules) mkModuleTree'; inherit (lib.lists) concatLists flatten singleton; + # NOTE: This was inspired by raf, and I find this + # to be quite a sane way of managing all modules in my flake. + mkModulesFor = hostname: flatten ( concatLists [ # Derive host specific module path from the first argument of the # function. Should be a string, obviously. - (singleton ./vali/${hostname}/default.nix) - + (singleton ./cr/${hostname}/default.nix) # Recursively import all module trees (i.e. directories with a `module.nix`) # for given moduleTree directories, and in addition, roles.