flake: remove hyprswitch input

common/wireguard-peers.nix

@@ -1,38 +0,0 @@
-[
-  { # Sulu
-    publicKey = "j6YVekgGS4nhL5zUiOTeK2BVQkYGlTQaiUpwcqQyfRk=";
-    allowedIPs = [
-      "10.100.0.3/32"
-    ];
-  }
-  { # Worf
-    publicKey = "kW8SyzCh2tw8GzZV6bPn+IQVNUoUhseNfEm3rHnR1So=";
-    allowedIPs = [
-      "10.100.0.4/32"
-    ];
-  }
-  { # Phone
-    publicKey = "axFXtcTYtW6m1FT9Czn9DRvG+b05D7j+0yRMjn/FJEk=";
-    allowedIPs = [
-      "10.100.0.5/32"
-    ];
-  }
-  { # Riker
-    publicKey = "r715vpgH1H0zvN+Z5wcNKcOo5e6UM3fBfh9BZwTBjmA=";
-    allowedIPs = [
-      "10.100.0.6/32"
-    ];
-  }
-  { # fa-t14-2025
-    publicKey = "UPpUVWQqOKT65MFym1sFDTstNmuynDYE4LOOtbWqEng=";
-    allowedIPs = [
-      "10.100.0.7/32"
-    ];
-  }
-  { # Turtle
-    publicKey = "mDzAtRPv+O5TDHa9DGodF/KKuFXRBYwSqfPyeWfdfRI=";
-    allowedIPs = [
-      "10.100.0.8/32"
-    ];
-  }
-]

flake.lock

@@ -75,16 +75,16 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1753216555,
+        "lastModified": 1717234745,
-        "narHash": "sha256-qfgVfgXjVPV7vEER4PVFiGUOUW08GHH71CVXgYW8EVc=",
+        "narHash": "sha256-MFyKRdw4WQD6V3vRGbP6MYbtJhZp712zwzjW6YiOBYM=",
         "owner": "dali99",
         "repo": "nixos-matrix-modules",
-        "rev": "099db715d1eba526a464f271b05cead5166fd9a9",
+        "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456",
         "type": "github"
       },
       "original": {
         "owner": "dali99",
-        "ref": "v0.7.1",
+        "ref": "v0.6.0",
         "repo": "nixos-matrix-modules",
         "type": "github"
       }
@@ -159,11 +159,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1753694789,
+        "lastModified": 1751271578,
-        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
+        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
+        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1753749649,
+        "lastModified": 1751211869,
-        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
         "type": "github"
       },
       "original": {
@@ -225,11 +225,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544651,
+        "lastModified": 1734546875,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,7 +12,7 @@
     home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.7.1";
+    matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
     extra-config.url = "git+file:///home/felixalb/nix-extra-config";

hosts/burnham/services/wireguard.nix

@@ -32,7 +32,37 @@ in {
           ];
           endpoint = "site3.feal.no:51902";
         }
-      ] ++ (import ../../../common/wireguard-peers.nix);
+        { # Worf
+          publicKey = "kW8SyzCh2tw8GzZV6bPn+IQVNUoUhseNfEm3rHnR1So=";
+          allowedIPs = [
+            "10.100.0.4/32"
+          ];
+        }
+        { # Phone
+          publicKey = "axFXtcTYtW6m1FT9Czn9DRvG+b05D7j+0yRMjn/FJEk=";
+          allowedIPs = [
+            "10.100.0.5/32"
+          ];
+        }
+        { # Riker
+          publicKey = "r715vpgH1H0zvN+Z5wcNKcOo5e6UM3fBfh9BZwTBjmA=";
+          allowedIPs = [
+            "10.100.0.6/32"
+          ];
+        }
+        { # Work-laptop
+          publicKey = "px4YstB16lFjgdLQkH55wz8gQRupX/LTxg8dNFijDTA=";
+          allowedIPs = [
+            "10.100.0.7/32"
+          ];
+        }
+        { # Turtle
+          publicKey = "mDzAtRPv+O5TDHa9DGodF/KKuFXRBYwSqfPyeWfdfRI=";
+          allowedIPs = [
+            "10.100.0.8/32"
+          ];
+        }
+      ];
     };
   };
 }

hosts/defiant/configuration.nix

@@ -26,7 +26,7 @@
       # ./services/koillection.nix
       ./services/matrix
       ./services/microbin.nix
-      # ./services/minecraft/home.nix
+      ./services/minecraft/home.nix
       ./services/monitoring
       # ./services/rtl-tcp.nix
       ./services/searx.nix

hosts/defiant/services/matrix/synapse.nix

@@ -12,6 +12,12 @@
     group = "matrix-synapse";
   };
 
+  sops.secrets."matrix/slidingsyncsecret" = {
+    restartUnits = [ "matrix-synapse.service" ];
+    owner = "matrix-synapse";
+    group = "matrix-synapse";
+  };
+
   services.matrix-synapse-next = {
     enable = true;
     enableNginx = true;
@@ -95,6 +101,8 @@
     };
   };
 
+  services.matrix-synapse.sliding-sync.environmentFile = config.sops.secrets."matrix/slidingsyncsecret".path;
+
   services.redis.servers."".enable = true;
 
   services.postgresqlBackup.databases = [ "matrix-synapse" ];

hosts/defiant/services/wireguard.nix

@@ -32,7 +32,43 @@ in {
           ];
           endpoint = "site2.feal.no:51902";
         }
-      ] ++ (import ../../../common/wireguard-peers.nix);
+        { # Sulu
+          publicKey = "j6YVekgGS4nhL5zUiOTeK2BVQkYGlTQaiUpwcqQyfRk=";
+          allowedIPs = [
+            "10.100.0.3/32"
+          ];
+        }
+        { # Worf
+          publicKey = "kW8SyzCh2tw8GzZV6bPn+IQVNUoUhseNfEm3rHnR1So=";
+          allowedIPs = [
+            "10.100.0.4/32"
+          ];
+        }
+        { # Phone
+          publicKey = "axFXtcTYtW6m1FT9Czn9DRvG+b05D7j+0yRMjn/FJEk=";
+          allowedIPs = [
+            "10.100.0.5/32"
+          ];
+        }
+        { # Riker
+          publicKey = "r715vpgH1H0zvN+Z5wcNKcOo5e6UM3fBfh9BZwTBjmA=";
+          allowedIPs = [
+            "10.100.0.6/32"
+          ];
+        }
+        { # Work-laptop
+          publicKey = "px4YstB16lFjgdLQkH55wz8gQRupX/LTxg8dNFijDTA=";
+          allowedIPs = [
+            "10.100.0.7/32"
+          ];
+        }
+        { # Turtle
+          publicKey = "mDzAtRPv+O5TDHa9DGodF/KKuFXRBYwSqfPyeWfdfRI=";
+          allowedIPs = [
+            "10.100.0.8/32"
+          ];
+        }
+      ];
     };
   };
 }