Lots of changes

config/base.nix

@@ -76,7 +76,7 @@
   };
 
   networking.networkmanager.enable = true;
-  systemd.services.NetworkManager-wait-online.enable = false;
+  # systemd.services.NetworkManager-wait-online.enable = false;
 
   # networking.nameservers = [ "8.8.8.8" ];
   # networking.resolvconf.enable = pkgs.lib.mkForce false;
@@ -95,6 +95,7 @@
       fonts = [
         "Hack"
         "FiraCode"
+        "ComicShannsMono"
       ];
     })
   ];
@@ -144,10 +145,9 @@
 	omnisharp-roslyn
 	nodePackages.vscode-json-languageserver
 	tailwindcss-language-server
+	dmenu
   ];
 
-systemd.services.NetworkManager-wait-online.enable = false;
-
 
   services = {
     picom.enable = true;
@@ -169,11 +169,9 @@ systemd.services.NetworkManager-wait-online.enable = false;
         layout = "se";
         variant = "";
       };
-      windowManager = {
+	  windowManager.dwm = {
-        dwm = {
+      enable = true;
-          enable = true;
+		};
-        };
-      };
     };
     locate = {
       enable = true;

maskiner/laptop/configuration.nix

@@ -18,13 +18,6 @@
 
   networking.hostName = myhostname;
 
-	environment.systemPackages = with pkgs; [
-		qgis
-		koreader
-		foliate
-		k3sup
-	];
-
   services.xserver.dpi = 140;
 
   services = {

maskiner/macmini/configuration.nix

@@ -7,42 +7,55 @@
   pkgs,
   myhostname,
   ...
-}: {
+}:
+{
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-	../../config/users.nix
+    ../../config/users.nix
   ];
 
-	environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
-		unstable.lego
+    unstable.lego
-	];
-networking.firewall = {
-  enable = true;
-  allowedTCPPorts = [ 80 443 3000 8384 22000];
-  allowedUDPPortRanges = [
-    { from = 4000; to = 4007; }
-    { from = 8000; to = 8010; }
   ];
-};
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [
+      80
+      443
+      3000
+      8384
+      8008
+      8009
+      22000
+    ];
+    allowedUDPPortRanges = [
+      {
+        from = 1;
+        to = 65535;
+      }
+    ];
+  };
 
-   networking.firewall.allowedUDPPorts = [ 22000 21027 ];
+  networking.firewall.allowedUDPPorts = [
-
+    22000
-	services = {
+    21027
-		openssh = {
+  ];
-			enable = true;
-			ports = [22];
-			settings = {
-				PermitRootLogin = "no";
-				PasswordAuthentication = false;
-				X11Forwarding = true;
-			};
-			extraConfig = ''
-			  AllowUsers fw
-			'';
-		};
-	  };
 
+  services = {
+    openssh = {
+      enable = true;
+      ports = [ 22 ];
+      settings = {
+        PermitRootLogin = "no";
+        PasswordAuthentication = false;
+        X11Forwarding = true;
+      };
+      extraConfig = ''
+        			  AllowUsers fw
+        			'';
+    };
+  };
 
   security.rtkit.enable = true;
   networking.hostName = myhostname;

shared/ssh.nix

@@ -3,18 +3,6 @@
   programs.ssh = {
     enable = true;
     matchBlocks = {
-      "git.wastring.com" = {
-        hostname = "git.wastring.com";
-        port = 55503;
-        user = "git";
-        identityFile = "/home/fw/.ssh/id_rsa";
-      };
-      "desktop" = {
-        hostname = "wastring.com";
-        port = 55502;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/id_rsa";
-      };
       "lth" = {
         hostname = "login.student.lth.se";
         port = 22;
@@ -44,18 +32,6 @@
         port = 22;
         user = "root";
       };
-      "disa" = {
-        hostname = "62.63.222.22";
-        port = 55505;
-        user = "disah";
-        identityFile = "/home/fw/.ssh/id_rsa";
-      };
-      "laptop" = {
-        hostname = "62.63.222.22";
-        port = 55504;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/id_rsa";
-      };
       "kube01" = {
         hostname = "192.168.0.177";
         port = 22;
@@ -86,12 +62,6 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "table" = {
-        hostname = "192.168.0.157";
-        port = 22;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/fw-ssh-key";
-      };
     };
   };
 }