diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/server1/configuration.nix (renamed from hosts/vhack.eu/configuration.nix) | 9 | ||||
| -rw-r--r-- | hosts/server1/networking.nix (renamed from hosts/vhack.eu/networking.nix) | 0 | ||||
| -rw-r--r-- | services/services.nix | 8 | ||||
| -rw-r--r-- | services/services/minecraft.nix (renamed from services/minecraft.nix) | 0 | ||||
| -rw-r--r-- | services/services/nix.nix | 18 | ||||
| -rw-r--r-- | services/services/opensshd.nix (renamed from services/opensshd.nix) | 0 | ||||
| -rw-r--r-- | services/services/rust-motd.nix (renamed from services/rust-motd.nix) | 0 | ||||
| -rw-r--r-- | system/system.nix | 8 | ||||
| -rw-r--r-- | system/system/fileSystemLayouts.nix (renamed from system/fileSystemLayouts.nix) | 0 | ||||
| -rw-r--r-- | system/system/hardware.nix (renamed from system/hardware.nix) | 0 | ||||
| -rw-r--r-- | system/system/packages.nix (renamed from system/packages.nix) | 0 | ||||
| -rw-r--r-- | system/system/users.nix (renamed from system/users.nix) | 0 |
13 files changed, 38 insertions, 9 deletions
diff --git a/flake.nix b/flake.nix index a6d95b6..2e52203 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,10 @@ nixpkgs, ... } @ attrs: { - nixosConfigurations."vhack.eu" = nixpkgs.lib.nixosSystem { + nixosConfigurations."server1" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - modules = [./hosts/vhack.eu/configuration.nix]; + modules = [./hosts/server1/configuration.nix]; }; }; } diff --git a/hosts/vhack.eu/configuration.nix b/hosts/server1/configuration.nix index a58e58d..6f91fc0 100644 --- a/hosts/vhack.eu/configuration.nix +++ b/hosts/server1/configuration.nix @@ -2,14 +2,9 @@ imports = [ ./networking.nix # network configuration that just works - ../../system/hardware.nix - ../../system/fileSystemLayouts.nix - ../../system/packages.nix - ../../system/users.nix + ../../system/system.nix - ../../services/minecraft.nix - ../../services/rust-motd.nix - ../../services/opensshd.nix + ../../services/services.nix ]; boot.cleanTmpDir = true; diff --git a/hosts/vhack.eu/networking.nix b/hosts/server1/networking.nix index 26d6719..26d6719 100644 --- a/hosts/vhack.eu/networking.nix +++ b/hosts/server1/networking.nix diff --git a/services/services.nix b/services/services.nix new file mode 100644 index 0000000..6983529 --- /dev/null +++ b/services/services.nix @@ -0,0 +1,8 @@ +{config, ...}: { + imports = [ + ./services/minecraft.nix + ./services/nix.nix + ./services/opensshd.nix + ./services/rust-motd.nix + ]; +} diff --git a/services/minecraft.nix b/services/services/minecraft.nix index 5882d9a..5882d9a 100644 --- a/services/minecraft.nix +++ b/services/services/minecraft.nix diff --git a/services/services/nix.nix b/services/services/nix.nix new file mode 100644 index 0000000..bd562ec --- /dev/null +++ b/services/services/nix.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + ... +}: { + nix = { + # gc = { + # automatic = true; + # dates = "daily"; + # options = "--delete-older-than 3"; + # }; + settings = { + auto-optimise-store = true; + experimental-features = ["nix-command" "flakes"]; + }; + }; +} diff --git a/services/opensshd.nix b/services/services/opensshd.nix index cb9f2ba..cb9f2ba 100644 --- a/services/opensshd.nix +++ b/services/services/opensshd.nix diff --git a/services/rust-motd.nix b/services/services/rust-motd.nix index 21bc1cd..21bc1cd 100644 --- a/services/rust-motd.nix +++ b/services/services/rust-motd.nix diff --git a/system/system.nix b/system/system.nix new file mode 100644 index 0000000..2af4982 --- /dev/null +++ b/system/system.nix @@ -0,0 +1,8 @@ +{config, ...}: { + imports = [ + ./system/fileSystemLayouts.nix + ./system/hardware.nix + ./system/packages.nix + ./system/users.nix + ]; +} diff --git a/system/fileSystemLayouts.nix b/system/system/fileSystemLayouts.nix index 9d03a05..9d03a05 100644 --- a/system/fileSystemLayouts.nix +++ b/system/system/fileSystemLayouts.nix diff --git a/system/hardware.nix b/system/system/hardware.nix index c4c7dc9..c4c7dc9 100644 --- a/system/hardware.nix +++ b/system/system/hardware.nix diff --git a/system/packages.nix b/system/system/packages.nix index 4d33c6e..4d33c6e 100644 --- a/system/packages.nix +++ b/system/system/packages.nix diff --git a/system/users.nix b/system/system/users.nix index 34e1648..34e1648 100644 --- a/system/users.nix +++ b/system/system/users.nix |