summary refs log tree commit diff stats
path: root/hosts/server1
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-02-08 17:33:02 +0100
committerene <ene@sils.li>2023-02-08 17:33:02 +0100
commitc50431b189e982a631d2d4864b304f33169bacdb (patch)
tree164c350e503c7dfda585ed505536b08882e00323 /hosts/server1
parentMerge pull request 'Imported the headless profile' (#13) from server1_headles... (diff)
parentMerge branch 'server1_minecraft2' into server1 (diff)
downloadnixos-server-c50431b189e982a631d2d4864b304f33169bacdb.tar.gz
nixos-server-c50431b189e982a631d2d4864b304f33169bacdb.zip
Merge pull request 'Merge to server1' (#16) from server1_develop into server1
Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/16
Diffstat (limited to '')
-rw-r--r--hosts/server1/configuration.nix (renamed from configuration.nix)11
-rw-r--r--hosts/server1/networking.nix (renamed from networking.nix)0
2 files changed, 5 insertions, 6 deletions
diff --git a/configuration.nix b/hosts/server1/configuration.nix
index 8fc047a..729ef0f 100644
--- a/configuration.nix
+++ b/hosts/server1/configuration.nix
@@ -1,13 +1,10 @@
 {pkgs, ...}: {
   imports = [
-    ./hardware-configuration.nix
-    ./packages.nix
     ./networking.nix # network configuration that just works
-    ./users.nix
 
-    ./services/minecraft.nix
-    ./services/rust-motd.nix
-    ./services/opensshd.nix
+    ../../system
+
+    ../../services
   ];
 
   boot.cleanTmpDir = true;
@@ -15,6 +12,8 @@
   networking.hostName = "server1";
   networking.domain = "vhack.eu";
 
+  system.fileSystemLayouts.mainDisk = "/dev/vda3";
+
   system.stateVersion = "22.11";
 }
 # vim: ts=2
diff --git a/networking.nix b/hosts/server1/networking.nix
index 26d6719..26d6719 100644
--- a/networking.nix
+++ b/hosts/server1/networking.nix