From 1f8776e82841243b2a1b336f3ab2261565682cb3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 21 May 2024 16:52:23 -0400 Subject: [PATCH] Clean up --- modules/desktop/{main.nix => default.nix} | 0 modules/main.nix | 6 +++--- modules/nix/{core.nix => default.nix} | 0 modules/nix/main.nix | 12 ------------ modules/os/{main.nix => default.nix} | 0 5 files changed, 3 insertions(+), 15 deletions(-) rename modules/desktop/{main.nix => default.nix} (100%) rename modules/nix/{core.nix => default.nix} (100%) delete mode 100644 modules/nix/main.nix rename modules/os/{main.nix => default.nix} (100%) diff --git a/modules/desktop/main.nix b/modules/desktop/default.nix similarity index 100% rename from modules/desktop/main.nix rename to modules/desktop/default.nix diff --git a/modules/main.nix b/modules/main.nix index 0026c9e..458a4cc 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -19,12 +19,12 @@ { ... }: { imports = [ - (import ./nix/main.nix { + (import ./nix { user = user; systemStateVersion = systemStateVersion; }) ] ++ (if desktop.enable then [ - (import ./desktop/main.nix { + (import ./desktop { user = user; enableKDE = desktop.enableKDE; enableHypr = desktop.enableHypr; @@ -32,7 +32,7 @@ enableWine = desktop.enableWine; }) ] else [ ]) ++ (if os.enable then [ - (import ./os/main.nix { + (import ./os { user = user; hostName = hostName; firewall = os.firewall; diff --git a/modules/nix/core.nix b/modules/nix/default.nix similarity index 100% rename from modules/nix/core.nix rename to modules/nix/default.nix diff --git a/modules/nix/main.nix b/modules/nix/main.nix deleted file mode 100644 index 8472fa2..0000000 --- a/modules/nix/main.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ user -, systemStateVersion -}: -{ ... }: -{ - imports = [ - (import ./core.nix { - user = user; - systemStateVersion = systemStateVersion; - }) - ]; -} diff --git a/modules/os/main.nix b/modules/os/default.nix similarity index 100% rename from modules/os/main.nix rename to modules/os/default.nix