From b44cb78571f3bfde2075807451d214a6ee1ecb74 Mon Sep 17 00:00:00 2001 From: MasterEnderman Date: Sun, 26 Jul 2026 14:55:45 +0200 Subject: [PATCH] drop modules/core/ dir Signed-off-by: MasterEnderman --- lib/mk-host.nix | 2 +- modules/{core => }/boot.nix | 0 modules/{core => }/core.nix | 0 modules/core/default.nix | 5 ----- modules/default.nix | 5 +++++ modules/{core => }/hardware.nix | 0 modules/{core => }/kernel.nix | 0 modules/{core => }/locale.nix | 0 modules/{core => }/network.nix | 2 +- modules/{core => }/niri.nix | 0 modules/{core => }/nix.nix | 0 modules/{core => }/noctalia.nix | 0 modules/{core => }/preservation.nix | 0 modules/{core => }/security.nix | 0 modules/{core => }/services.nix | 0 modules/{core => }/sops.nix | 2 +- modules/{core => }/ssh.nix | 0 modules/{core => }/stylix.nix | 0 modules/{core => }/user.nix | 2 +- 19 files changed, 9 insertions(+), 9 deletions(-) rename modules/{core => }/boot.nix (100%) rename modules/{core => }/core.nix (100%) delete mode 100644 modules/core/default.nix create mode 100644 modules/default.nix rename modules/{core => }/hardware.nix (100%) rename modules/{core => }/kernel.nix (100%) rename modules/{core => }/locale.nix (100%) rename modules/{core => }/network.nix (96%) rename modules/{core => }/niri.nix (100%) rename modules/{core => }/nix.nix (100%) rename modules/{core => }/noctalia.nix (100%) rename modules/{core => }/preservation.nix (100%) rename modules/{core => }/security.nix (100%) rename modules/{core => }/services.nix (100%) rename modules/{core => }/sops.nix (86%) rename modules/{core => }/ssh.nix (100%) rename modules/{core => }/stylix.nix (100%) rename modules/{core => }/user.nix (97%) diff --git a/lib/mk-host.nix b/lib/mk-host.nix index d957c7c..12c04f2 100644 --- a/lib/mk-host.nix +++ b/lib/mk-host.nix @@ -36,7 +36,7 @@ in system.stateVersion = stateVersion; } (hostsDir + "/${name}") - ../modules/core + ../modules inputs.disko.nixosModules.disko inputs.home-manager.nixosModules.home-manager inputs.preservation.nixosModules.preservation diff --git a/modules/core/boot.nix b/modules/boot.nix similarity index 100% rename from modules/core/boot.nix rename to modules/boot.nix diff --git a/modules/core/core.nix b/modules/core.nix similarity index 100% rename from modules/core/core.nix rename to modules/core.nix diff --git a/modules/core/default.nix b/modules/core/default.nix deleted file mode 100644 index 1591cc5..0000000 --- a/modules/core/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{lib, ...}: let - autoImport = import ../../lib/auto-import.nix {inherit lib;}; -in { - imports = autoImport ./.; -} diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..ab04c4e --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,5 @@ +{lib, ...}: let + autoImport = import ../lib/auto-import.nix {inherit lib;}; +in { + imports = autoImport ./.; +} diff --git a/modules/core/hardware.nix b/modules/hardware.nix similarity index 100% rename from modules/core/hardware.nix rename to modules/hardware.nix diff --git a/modules/core/kernel.nix b/modules/kernel.nix similarity index 100% rename from modules/core/kernel.nix rename to modules/kernel.nix diff --git a/modules/core/locale.nix b/modules/locale.nix similarity index 100% rename from modules/core/locale.nix rename to modules/locale.nix diff --git a/modules/core/network.nix b/modules/network.nix similarity index 96% rename from modules/core/network.nix rename to modules/network.nix index c937d73..bc0aed6 100644 --- a/modules/core/network.nix +++ b/modules/network.nix @@ -3,7 +3,7 @@ lib, ... }: let - connectionsDir = ../../secrets/connections; + connectionsDir = ../secrets/connections; connectionFiles = if builtins.pathExists connectionsDir diff --git a/modules/core/niri.nix b/modules/niri.nix similarity index 100% rename from modules/core/niri.nix rename to modules/niri.nix diff --git a/modules/core/nix.nix b/modules/nix.nix similarity index 100% rename from modules/core/nix.nix rename to modules/nix.nix diff --git a/modules/core/noctalia.nix b/modules/noctalia.nix similarity index 100% rename from modules/core/noctalia.nix rename to modules/noctalia.nix diff --git a/modules/core/preservation.nix b/modules/preservation.nix similarity index 100% rename from modules/core/preservation.nix rename to modules/preservation.nix diff --git a/modules/core/security.nix b/modules/security.nix similarity index 100% rename from modules/core/security.nix rename to modules/security.nix diff --git a/modules/core/services.nix b/modules/services.nix similarity index 100% rename from modules/core/services.nix rename to modules/services.nix diff --git a/modules/core/sops.nix b/modules/sops.nix similarity index 86% rename from modules/core/sops.nix rename to modules/sops.nix index bc9a628..d9c264f 100644 --- a/modules/core/sops.nix +++ b/modules/sops.nix @@ -9,7 +9,7 @@ ]; sops = { age.sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"]; - defaultSopsFile = ../../secrets/system.yaml; + defaultSopsFile = ../secrets/system.yaml; defaultSopsFormat = "yaml"; }; } diff --git a/modules/core/ssh.nix b/modules/ssh.nix similarity index 100% rename from modules/core/ssh.nix rename to modules/ssh.nix diff --git a/modules/core/stylix.nix b/modules/stylix.nix similarity index 100% rename from modules/core/stylix.nix rename to modules/stylix.nix diff --git a/modules/core/user.nix b/modules/user.nix similarity index 97% rename from modules/core/user.nix rename to modules/user.nix index 1cefab7..9740a87 100644 --- a/modules/core/user.nix +++ b/modules/user.nix @@ -18,7 +18,7 @@ inputs.sops-nix.homeManagerModules.sops ]; useGlobalPkgs = true; - users.${username} = import ../../home; + users.${username} = import ../home; }; preservation.preserveAt."/persist".users.${username} = lib.mkIf config.modules.impermanence.enable { directories = [ -- 2.51.2