From 1b73e041b1aff42d3fdb448931c4aafdea986da8 Mon Sep 17 00:00:00 2001 From: ene Date: Sun, 5 Feb 2023 10:25:28 +0100 Subject: Feat: Use default.nix --- hosts/server1/configuration.nix | 4 ++-- services/default.nix | 8 ++++++++ services/services.nix | 8 -------- system/default.nix | 8 ++++++++ system/system.nix | 8 -------- 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 services/default.nix delete mode 100644 services/services.nix create mode 100644 system/default.nix delete mode 100644 system/system.nix diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index 6f91fc0..729ef0f 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -2,9 +2,9 @@ imports = [ ./networking.nix # network configuration that just works - ../../system/system.nix + ../../system - ../../services/services.nix + ../../services ]; boot.cleanTmpDir = true; diff --git a/services/default.nix b/services/default.nix new file mode 100644 index 0000000..6983529 --- /dev/null +++ b/services/default.nix @@ -0,0 +1,8 @@ +{config, ...}: { + imports = [ + ./services/minecraft.nix + ./services/nix.nix + ./services/opensshd.nix + ./services/rust-motd.nix + ]; +} diff --git a/services/services.nix b/services/services.nix deleted file mode 100644 index 6983529..0000000 --- a/services/services.nix +++ /dev/null @@ -1,8 +0,0 @@ -{config, ...}: { - imports = [ - ./services/minecraft.nix - ./services/nix.nix - ./services/opensshd.nix - ./services/rust-motd.nix - ]; -} diff --git a/system/default.nix b/system/default.nix new file mode 100644 index 0000000..2af4982 --- /dev/null +++ b/system/default.nix @@ -0,0 +1,8 @@ +{config, ...}: { + imports = [ + ./system/fileSystemLayouts.nix + ./system/hardware.nix + ./system/packages.nix + ./system/users.nix + ]; +} diff --git a/system/system.nix b/system/system.nix deleted file mode 100644 index 2af4982..0000000 --- a/system/system.nix +++ /dev/null @@ -1,8 +0,0 @@ -{config, ...}: { - imports = [ - ./system/fileSystemLayouts.nix - ./system/hardware.nix - ./system/packages.nix - ./system/users.nix - ]; -} -- cgit 1.4.1