60 files changed, 16 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index 2749aed..8c63e01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable";
+
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -16,7 +17,8 @@
       inherit system;
       modules = [
         { networking.hostName = host; }
-        ./hosts/${host}/configuration.nix
+        ./nixos/${host}/configuration.nix
+
         sops-nix.nixosModules.sops
       ];
     };
@@ -26,6 +28,7 @@
     );
   in
   {
-    nixosConfigurations = makeX86 [ "cez" "kay" "lia" "fscusat" "dspace" ];
+    nixosConfigurations =
+      makeX86 [ "cez" "kay" "lia" "fscusat" "dspace" ];
   };
 }
diff --git a/hosts/cez/configuration.nix b/nixos/cez/configuration.nix
index 6a801b0..20d7d5b 100644
--- a/hosts/cez/configuration.nix
+++ b/nixos/cez/configuration.nix
@@ -5,12 +5,13 @@ let
 in
 {
   imports = [
+    ../common/configuration.nix
     ./hardware-configuration.nix
+
     ./modules/wayland.nix
     ./modules/sshfs.nix
     ./modules/wireguard.nix
     ./modules/network.nix
-    ../../common.nix
   ];
 
   boot = {
diff --git a/hosts/cez/hardware-configuration.nix b/nixos/cez/hardware-configuration.nix
index 19313e5..19313e5 100644
--- a/hosts/cez/hardware-configuration.nix
+++ b/nixos/cez/hardware-configuration.nix
diff --git a/hosts/cez/modules/network.nix b/nixos/cez/modules/network.nix
index fb30056..fb30056 100644
--- a/hosts/cez/modules/network.nix
+++ b/nixos/cez/modules/network.nix
diff --git a/hosts/cez/modules/sshfs.nix b/nixos/cez/modules/sshfs.nix
index a9ff183..a9ff183 100644
--- a/hosts/cez/modules/sshfs.nix
+++ b/nixos/cez/modules/sshfs.nix
diff --git a/hosts/cez/modules/wayland.nix b/nixos/cez/modules/wayland.nix
index c04d1bf..c04d1bf 100644
--- a/hosts/cez/modules/wayland.nix
+++ b/nixos/cez/modules/wayland.nix
diff --git a/hosts/cez/modules/wireguard.nix b/nixos/cez/modules/wireguard.nix
index d8e8dd0..d8e8dd0 100644
--- a/hosts/cez/modules/wireguard.nix
+++ b/nixos/cez/modules/wireguard.nix
diff --git a/hosts/cez/secrets.yaml b/nixos/cez/secrets.yaml
index f72eba6..f72eba6 100644
--- a/hosts/cez/secrets.yaml
+++ b/nixos/cez/secrets.yaml
diff --git a/common.nix b/nixos/common/configuration.nix
index b9d2dab..5121cd6 100644
--- a/common.nix
+++ b/nixos/common/configuration.nix
@@ -20,7 +20,7 @@ in
   ];
 
   sops = {
-    defaultSopsFile = ./hosts/${host}/secrets.yaml;
+    defaultSopsFile = ../${host}/secrets.yaml;
     age.keyFile = "/var/secrets/${host}.sops";
   };
   system.stateVersion = "23.11";
diff --git a/modules/dev.nix b/nixos/common/modules/dev.nix
index 7223d08..7223d08 100644
--- a/modules/dev.nix
+++ b/nixos/common/modules/dev.nix
diff --git a/modules/pppd.nix b/nixos/common/modules/pppd.nix
index 772cb29..772cb29 100644
--- a/modules/pppd.nix
+++ b/nixos/common/modules/pppd.nix
diff --git a/modules/stalwart-mail.nix b/nixos/common/modules/stalwart-mail.nix
index ebeedd9..ebeedd9 100644
--- a/modules/stalwart-mail.nix
+++ b/nixos/common/modules/stalwart-mail.nix
diff --git a/modules/tmux.nix b/nixos/common/modules/tmux.nix
index eeaafbb..eeaafbb 100644
--- a/modules/tmux.nix
+++ b/nixos/common/modules/tmux.nix
diff --git a/modules/userdata.nix b/nixos/common/modules/userdata.nix
index 00f0e13..00f0e13 100644
--- a/modules/userdata.nix
+++ b/nixos/common/modules/userdata.nix
diff --git a/pkgs/stalwart-mail-config.nix b/nixos/common/pkgs/stalwart-mail-config.nix
index 77fc366..77fc366 100644
--- a/pkgs/stalwart-mail-config.nix
+++ b/nixos/common/pkgs/stalwart-mail-config.nix
diff --git a/hosts/dspace/configuration.nix b/nixos/dspace/configuration.nix
index a3a1ead..48334af 100644
--- a/hosts/dspace/configuration.nix
+++ b/nixos/dspace/configuration.nix
@@ -5,10 +5,11 @@ let
 in
 {
   imports = [
+    ../common/configuration.nix
     ./hardware-configuration.nix
+
     ./modules/network.nix
     ./modules/www.nix
-    ../../common.nix
   ];
 
 
diff --git a/hosts/dspace/hardware-configuration.nix b/nixos/dspace/hardware-configuration.nix
index aaad3b7..aaad3b7 100644
--- a/hosts/dspace/hardware-configuration.nix
+++ b/nixos/dspace/hardware-configuration.nix
diff --git a/hosts/dspace/modules/network.nix b/nixos/dspace/modules/network.nix
index 007cfba..007cfba 100644
--- a/hosts/dspace/modules/network.nix
+++ b/nixos/dspace/modules/network.nix
diff --git a/hosts/dspace/modules/www.nix b/nixos/dspace/modules/www.nix
index 90ab841..90ab841 100644
--- a/hosts/dspace/modules/www.nix
+++ b/nixos/dspace/modules/www.nix
diff --git a/hosts/dspace/secrets.yaml b/nixos/dspace/secrets.yaml
index 42143ac..42143ac 100644
--- a/hosts/dspace/secrets.yaml
+++ b/nixos/dspace/secrets.yaml
diff --git a/hosts/fscusat/configuration.nix b/nixos/fscusat/configuration.nix
index 779f0ec..e515783 100644
--- a/hosts/fscusat/configuration.nix
+++ b/nixos/fscusat/configuration.nix
@@ -2,11 +2,12 @@
 
 {
   imports = [
+    ../common/configuration.nix
     ./hardware-configuration.nix
+
     ./modules/network.nix
     ./modules/www.nix
     ./modules/mirror
-    ../../common.nix
   ];
 
   services.openssh.ports = [ 22 465 ];
diff --git a/hosts/fscusat/hardware-configuration.nix b/nixos/fscusat/hardware-configuration.nix
index 8bb54ed..8bb54ed 100644
--- a/hosts/fscusat/hardware-configuration.nix
+++ b/nixos/fscusat/hardware-configuration.nix
diff --git a/hosts/fscusat/modules/mirror/debian/default.nix b/nixos/fscusat/modules/mirror/debian/default.nix
index da56ade..da56ade 100644
--- a/hosts/fscusat/modules/mirror/debian/default.nix
+++ b/nixos/fscusat/modules/mirror/debian/default.nix
diff --git a/hosts/fscusat/modules/mirror/debian/ftpsync.nix b/nixos/fscusat/modules/mirror/debian/ftpsync.nix
index 29fb55b..29fb55b 100644
--- a/hosts/fscusat/modules/mirror/debian/ftpsync.nix
+++ b/nixos/fscusat/modules/mirror/debian/ftpsync.nix
diff --git a/hosts/fscusat/modules/mirror/default.nix b/nixos/fscusat/modules/mirror/default.nix
index c5fd462..c5fd462 100644
--- a/hosts/fscusat/modules/mirror/default.nix
+++ b/nixos/fscusat/modules/mirror/default.nix
diff --git a/hosts/fscusat/modules/mirror/www.nix b/nixos/fscusat/modules/mirror/www.nix
index ebde425..ebde425 100644
--- a/hosts/fscusat/modules/mirror/www.nix
+++ b/nixos/fscusat/modules/mirror/www.nix
diff --git a/hosts/fscusat/modules/network.nix b/nixos/fscusat/modules/network.nix
index 53367f8..53367f8 100644
--- a/hosts/fscusat/modules/network.nix
+++ b/nixos/fscusat/modules/network.nix
diff --git a/hosts/fscusat/modules/www.nix b/nixos/fscusat/modules/www.nix
index 24398da..24398da 100644
--- a/hosts/fscusat/modules/www.nix
+++ b/nixos/fscusat/modules/www.nix
diff --git a/hosts/fscusat/pkgs/archvsync/Makefile.patch b/nixos/fscusat/pkgs/archvsync/Makefile.patch
index e82ada4..e82ada4 100644
--- a/hosts/fscusat/pkgs/archvsync/Makefile.patch
+++ b/nixos/fscusat/pkgs/archvsync/Makefile.patch
diff --git a/hosts/fscusat/pkgs/archvsync/common.patch b/nixos/fscusat/pkgs/archvsync/common.patch
index d101f40..d101f40 100644
--- a/hosts/fscusat/pkgs/archvsync/common.patch
+++ b/nixos/fscusat/pkgs/archvsync/common.patch
diff --git a/hosts/fscusat/pkgs/archvsync/default.nix b/nixos/fscusat/pkgs/archvsync/default.nix
index bd3560e..bd3560e 100644
--- a/hosts/fscusat/pkgs/archvsync/default.nix
+++ b/nixos/fscusat/pkgs/archvsync/default.nix
diff --git a/hosts/fscusat/secrets.yaml b/nixos/fscusat/secrets.yaml
index bed58ce..bed58ce 100644
--- a/hosts/fscusat/secrets.yaml
+++ b/nixos/fscusat/secrets.yaml
diff --git a/hosts/kay/configuration.nix b/nixos/kay/configuration.nix
index 1e264e2..24cc246 100644
--- a/hosts/kay/configuration.nix
+++ b/nixos/kay/configuration.nix
@@ -2,7 +2,9 @@
 
 {
   imports = [
+    ../common/configuration.nix
     ./hardware-configuration.nix
+
     ./modules/network.nix
     ./modules/www.nix
     ./modules/sftp.nix
@@ -10,7 +12,6 @@
     ./modules/mail.nix
     ./modules/dns
     ./modules/sshfwd.nix
-    ../../common.nix
   ];
 
   boot.consoleLogLevel = 3;
diff --git a/hosts/kay/hardware-configuration.nix b/nixos/kay/hardware-configuration.nix
index 306e9ba..306e9ba 100644
--- a/hosts/kay/hardware-configuration.nix
+++ b/nixos/kay/hardware-configuration.nix
diff --git a/hosts/kay/modules/acme.nix b/nixos/kay/modules/acme.nix
index f4ded0a..f4ded0a 100644
--- a/hosts/kay/modules/acme.nix
+++ b/nixos/kay/modules/acme.nix
diff --git a/hosts/kay/modules/cgit.nix b/nixos/kay/modules/cgit.nix
index 2ef95fb..2ef95fb 100644
--- a/hosts/kay/modules/cgit.nix
+++ b/nixos/kay/modules/cgit.nix
diff --git a/hosts/kay/modules/dendrite.nix b/nixos/kay/modules/dendrite.nix
index 8277e21..8277e21 100644
--- a/hosts/kay/modules/dendrite.nix
+++ b/nixos/kay/modules/dendrite.nix
diff --git a/hosts/kay/modules/dns/5.6.e.e.0.7.4.0.1.0.0.2.ip6.arpa.zone b/nixos/kay/modules/dns/5.6.e.e.0.7.4.0.1.0.0.2.ip6.arpa.zone
index 69b3524..69b3524 100644
--- a/hosts/kay/modules/dns/5.6.e.e.0.7.4.0.1.0.0.2.ip6.arpa.zone
+++ b/nixos/kay/modules/dns/5.6.e.e.0.7.4.0.1.0.0.2.ip6.arpa.zone
diff --git a/hosts/kay/modules/dns/ddns.nix b/nixos/kay/modules/dns/ddns.nix
index e6e417a..e6e417a 100644
--- a/hosts/kay/modules/dns/ddns.nix
+++ b/nixos/kay/modules/dns/ddns.nix
diff --git a/hosts/kay/modules/dns/default.nix b/nixos/kay/modules/dns/default.nix
index 1146cc3..1146cc3 100644
--- a/hosts/kay/modules/dns/default.nix
+++ b/nixos/kay/modules/dns/default.nix
diff --git a/hosts/kay/modules/dns/sinanmohd.com.zone b/nixos/kay/modules/dns/sinanmohd.com.zone
index 0409efc..0409efc 100644
--- a/hosts/kay/modules/dns/sinanmohd.com.zone
+++ b/nixos/kay/modules/dns/sinanmohd.com.zone
diff --git a/hosts/kay/modules/hurricane.nix b/nixos/kay/modules/hurricane.nix
index 9e22bf5..9e22bf5 100644
--- a/hosts/kay/modules/hurricane.nix
+++ b/nixos/kay/modules/hurricane.nix
diff --git a/hosts/kay/modules/iperf3.nix b/nixos/kay/modules/iperf3.nix
index 901a93d..901a93d 100644
--- a/hosts/kay/modules/iperf3.nix
+++ b/nixos/kay/modules/iperf3.nix
diff --git a/hosts/kay/modules/mail.nix b/nixos/kay/modules/mail.nix
index 63959b8..63959b8 100644
--- a/hosts/kay/modules/mail.nix
+++ b/nixos/kay/modules/mail.nix
diff --git a/hosts/kay/modules/matrix-sliding-sync.nix b/nixos/kay/modules/matrix-sliding-sync.nix
index ebdc34d..ebdc34d 100644
--- a/hosts/kay/modules/matrix-sliding-sync.nix
+++ b/nixos/kay/modules/matrix-sliding-sync.nix
diff --git a/hosts/kay/modules/network.nix b/nixos/kay/modules/network.nix
index 929fb1b..929fb1b 100644
--- a/hosts/kay/modules/network.nix
+++ b/nixos/kay/modules/network.nix
diff --git a/hosts/kay/modules/router.nix b/nixos/kay/modules/router.nix
index d2785a5..d2785a5 100644
--- a/hosts/kay/modules/router.nix
+++ b/nixos/kay/modules/router.nix
diff --git a/hosts/kay/modules/sftp.nix b/nixos/kay/modules/sftp.nix
index 07b1449..07b1449 100644
--- a/hosts/kay/modules/sftp.nix
+++ b/nixos/kay/modules/sftp.nix
diff --git a/hosts/kay/modules/sshfwd.nix b/nixos/kay/modules/sshfwd.nix
index d70b893..d70b893 100644
--- a/hosts/kay/modules/sshfwd.nix
+++ b/nixos/kay/modules/sshfwd.nix
diff --git a/hosts/kay/modules/wireguard.nix b/nixos/kay/modules/wireguard.nix
index f90b1ec..f90b1ec 100644
--- a/hosts/kay/modules/wireguard.nix
+++ b/nixos/kay/modules/wireguard.nix
diff --git a/hosts/kay/modules/www.nix b/nixos/kay/modules/www.nix
index 3891bf6..3891bf6 100644
--- a/hosts/kay/modules/www.nix
+++ b/nixos/kay/modules/www.nix
diff --git a/hosts/kay/secrets.yaml b/nixos/kay/secrets.yaml
index 47be11b..47be11b 100644
--- a/hosts/kay/secrets.yaml
+++ b/nixos/kay/secrets.yaml
diff --git a/hosts/lia/configuration.nix b/nixos/lia/configuration.nix
index 4cc057e..ab4c46b 100644
--- a/hosts/lia/configuration.nix
+++ b/nixos/lia/configuration.nix
@@ -2,8 +2,9 @@
 
 {
   imports = [
+    ../common/configuration.nix
     ./hardware-configuration.nix
-    ../../common.nix
+
     ./modules/network
     ./modules/users.nix
     ./modules/lxc.nix
diff --git a/hosts/lia/hardware-configuration.nix b/nixos/lia/hardware-configuration.nix
index 6f4c6a4..6f4c6a4 100644
--- a/hosts/lia/hardware-configuration.nix
+++ b/nixos/lia/hardware-configuration.nix
diff --git a/hosts/lia/modules/lxc.nix b/nixos/lia/modules/lxc.nix
index 259c316..259c316 100644
--- a/hosts/lia/modules/lxc.nix
+++ b/nixos/lia/modules/lxc.nix
diff --git a/hosts/lia/modules/network/default.nix b/nixos/lia/modules/network/default.nix
index 927b2b5..927b2b5 100644
--- a/hosts/lia/modules/network/default.nix
+++ b/nixos/lia/modules/network/default.nix
diff --git a/hosts/lia/modules/network/router.nix b/nixos/lia/modules/network/router.nix
index a6aef80..a6aef80 100644
--- a/hosts/lia/modules/network/router.nix
+++ b/nixos/lia/modules/network/router.nix
diff --git a/hosts/lia/modules/sshfwd.nix b/nixos/lia/modules/sshfwd.nix
index 3c7c006..3c7c006 100644
--- a/hosts/lia/modules/sshfwd.nix
+++ b/nixos/lia/modules/sshfwd.nix
diff --git a/hosts/lia/modules/users.nix b/nixos/lia/modules/users.nix
index 13617ff..13617ff 100644
--- a/hosts/lia/modules/users.nix
+++ b/nixos/lia/modules/users.nix
diff --git a/hosts/lia/secrets.yaml b/nixos/lia/secrets.yaml
index b2b5218..b2b5218 100644
--- a/hosts/lia/secrets.yaml
+++ b/nixos/lia/secrets.yaml