Clean up home manager stuff

home-manager/bat.nix

@@ -1,6 +1,14 @@
 { config, lib, pkgs, ... }:
 
 {
+
+  options.nathans-home.bat = with lib; {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+    };
+  };
+  config = lib.mkIf config.nathans-home.bat.enable {
     programs.bat = {
       enable = true;
       config = {
@@ -8,4 +16,5 @@
         style = "header,rule,snip,changes";
       };
     };
+  };
 }

home-manager/fish.nix

@@ -1,6 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
+  options.nathans-home.fish = with lib; {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+    };
+  };
+  config = lib.mkIf config.nathans-home.fish.enable {
     ## Shell
     # Shell proper
     programs.fish = {
@@ -54,4 +61,5 @@
         };
       };
     };
+  };
 }

home-manager/ssh.nix

@@ -1,6 +1,14 @@
 { config, lib, pkgs, ... }:
 
 {
+  options.nathans-home.ssh = with lib; {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+    };
+  };
+
+  config = lib.mkIf config.nathans-home.ssh.enable {
     programs.ssh = {
       # SSH configuration
       enable = true;
@@ -16,17 +24,17 @@
         "levitation" = {
           forwardAgent = true;
           user = "nathan";
-        hostname = "172.23.12.134";
+          hostname = "100.95.223.6";
         };
         "perception" = {
           forwardAgent = true;
           user = "nathan";
-        hostname = "172.23.55.145";
+          hostname = "100.67.146.101";
         };
         "oracles" = {
           forwardAgent = true;
           user = "nathan";
-        hostname = "172.23.108.12";
+          hostname = "100.66.15.34";
         };
         "tounge" = {
           forwardAgent = true;
@@ -41,7 +49,7 @@
         "matrix.community.rs" = {
           forwardAgent = true;
           user = "nathan";
-        hostname = "172.23.129.209";
+          hostname = "100.113.74.107";
         };
         "de1955" = {
           user = "de1955";
@@ -49,4 +57,5 @@
         };
       };
     };
+  };
 }

machines/levitation.nix

@@ -8,6 +8,7 @@
     domain = "mccarty.io";
     useDHCP = false;
     interfaces.enp5s0.useDHCP = true;
+    nat.externalInterface = "enp5s0";
   };
   ###
   ## Enable programs we don't want on every machine

modules/docker.nix

@@ -7,4 +7,11 @@
     # Automatically prune to keep things lean
     autoPrune.enable = true;
   };
+  # Setup networking for nixos containers
+  networking = {
+    nat = {
+      enable = true;
+      internalInterfaces = [ "ve-+" ];
+    };
+  };
 }

modules/sway.nix

@@ -183,6 +183,10 @@
         groupBy = "app-name";
         # Bottom right corner
         anchor = "bottom-right";
+        # Maximum visible notifications
+        maxVisible = 10;
+        # Sort by time in descending order (newest first)
+        sort = "-time";
       };
       # Swayidle for automatic screen locking
       services.swayidle = {