Merge configs

flake.lock

@@ -2,8 +2,8 @@
   "nodes": {
     "currentSystem": {
       "locked": {
-        "lastModified": 1717562249,
+        "lastModified": 1717720072,
-        "narHash": "sha256-WdcVxEl64ZRLVUmnn9ZVXBId0eGkzxwZSVDxZDy0mgU=",
+        "narHash": "sha256-JAMWMGlJFDt+7bbpWIDoRzvL0/A7YY6Wg6xENX9ohUY=",
         "path": "/etc/nixos/hostname",
         "type": "path"
       },

flake.nix

@@ -93,11 +93,17 @@
 
             };
 
+
             gui = {
                 enable = true;
                 protonmail = true;
                 matrix = true;
 
+                sway = {
+                    enable = true;
+                    desktop = false;
+                };
+
                 monitors = utils.mkMonitor {
                     monitor = "eDP-1";
                     resolution = "1920x1200";

hosts/alpheratz/home.nix

@@ -14,7 +14,6 @@
         homeDirectory = "/home/eesim";
     };
 
-    home.file.".config/sway/config".source = ./dotfiles/sway/config;
     home.file.".config/nvim".source = ./dotfiles/nvim;
     home.file.".config/waybar".source = ./dotfiles/waybar;
     home.file.".config/fish/config.fish".source = ./dotfiles/fish/config.fish;

hosts/alpheratz/system.nix

@@ -36,24 +36,24 @@
         "/nix".options = [ "compress=zstd" "noatime" ];
     };
 
-    networking.wg-quick.interfaces = {
+    # networking.wg-quick.interfaces = {
-        wg0 = {
+    #     wg0 = {
-            address = [ "10.6.0.5" ];
+    #         address = [ "10.6.0.5" ];
-            listenPort = 51820;
+    #         listenPort = 51820;
-            privateKeyFile = "/root/wireguard-keys/wg0/private";
+    #         privateKeyFile = "/root/wireguard-keys/wg0/private";
-            dns = [ "10.2.0.100" ];
+    #         dns = [ "10.2.0.100" ];
 
-            peers = [
+    #         peers = [
-                {
+    #             {
-                    publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
+    #                 publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
-                    presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
+    #                 presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
-                    allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
+    #                 allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
-                    endpoint = "simmer505.com:51820";
+    #                 endpoint = "simmer505.com:51820";
-                    persistentKeepalive = 25;
+    #                 persistentKeepalive = 25;
-                }
+    #             }
-            ];
+    #         ];
-        };
+    #     };
-    };
+    # };
 
     # Set your time zone.
     time.timeZone = "America/Chicago";