Merge branch 'main' of https://gitea.cobia-ghost.ts.net/caleb/Surface-Nixos

application-configuration.nix

@@ -17,6 +17,12 @@
         tor-browser-bundle-bin
         yubikey-manager-qt
         libsForQt5.kdeconnect-kde
+
+        docker-compose
+
+        ## temp
+        electron-bin
+        nodejs_22
       ];
   };
 
@@ -40,3 +46,8 @@
 
   # yubikey
   services.pcscd.enable = true;
+
+  # docker
+  virtualisation.docker.enable = true;
+  users.users.caleb.extraGroups = [ "docker" ];
+}

networking-configuration.nix

@@ -31,7 +31,7 @@
   services.tailscale.enable = true;
 
   # exclude tailscale IPs from mullvad routing
-  networking.nftables = {
+ /*  networking.nftables = {
     enable = true;
     ruleset = ''
       define TAILNET_DNS = {
@@ -52,5 +52,5 @@
         }
       }
     '';
-  };
+  }; */
 }