updates

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735471104,
+        "lastModified": 1738824222,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
         "type": "github"
       },
       "original": {

flake.nix

@@ -103,7 +103,7 @@
 
             shellHook = ''
               if [ -z "''${SKIP_MOD_WORKTREES:-}" ]; then
-                mod_worktrees
+                mod_worktrees &
               fi
             '';
           };

hosts/linode/l002/nginx.nix

@@ -33,6 +33,18 @@
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     virtualHosts = {
+      # default that is put first for fallbacks
+      # Note that order here doesn't matter it orders alphabetically so `0` puts it first
+      # I had an issue tha the first SSL port 443 site would catch any https traffic instead
+      # of hitting my default fallback and this fixes that issue and ensure this is hit instead
+      "0.joshuabell.xyz" = {
+        default = true;
+        enableACME = true;
+        forceSSL = true;
+        locations."/" = {
+          return = "444"; # 404 for not found or 444 for drop
+        };
+      };
       # PROXY HOSTS
       "chat.joshuabell.xyz" = {
         enableACME = true;
@@ -42,14 +54,6 @@
           proxyPass = "http://10.20.40.104:3080";
         };
       };
-      "affine.joshuabell.xyz" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/" = {
-          proxyWebsockets = true;
-          proxyPass = "http://10.20.40.104:3010";
-        };
-      };
       "gist.joshuabell.xyz" = {
         enableACME = true;
         forceSSL = true;
@@ -138,13 +142,6 @@
           return = "444";
         };
       };
-
-      "_" = {
-        default = true;
-        locations."/" = {
-          return = "444"; # 404 for not found or 444 for drop
-        };
-      };
     };
 
     # STREAMS
@@ -166,5 +163,3 @@
     4242 # nebula
   ];
 }
-
-# TODO

hosts/lio/flake.lock

@@ -144,17 +144,12 @@
       }
     },
     "mod_common": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1737140780,
+        "lastModified": 1738982162,
-        "narHash": "sha256-qf0GX8TZcu05RqBdqm3kYz82EVWH0Ijl7FMa89UMAks=",
+        "narHash": "sha256-X9VXqyrWGf0yqc7TMGlMbAnp7/y99kY0PXrq4jw+sAc=",
         "ref": "mod_common",
-        "rev": "172ff3a299bbd8463fdd71a2ac2dc257bc7331e8",
+        "rev": "11f0e600a883db8daa6007cc3e0696a637cfe491",
-        "revCount": 11,
+        "revCount": 18,
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       },
@@ -183,9 +178,7 @@
     "mod_home-manager": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1736544172,
@@ -272,6 +265,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@@ -287,7 +296,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1725634671,
         "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@@ -303,13 +312,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1737885640,
+        "lastModified": 1738843498,
-        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
+        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
+        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
         "type": "github"
       },
       "original": {
@@ -319,7 +328,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1737567054,
         "narHash": "sha256-LI1z4HET4hgP6iyWehrWRd5luNbUk9zz/GFzqI1iAFo=",
@@ -1251,7 +1260,7 @@
         "agenix": "agenix",
         "crane": "crane",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
@@ -1271,7 +1280,7 @@
     "ringofstorms-stormd": {
       "inputs": {
         "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -1297,13 +1306,13 @@
         "mod_nebula": "mod_nebula",
         "mod_ros_stormd": "mod_ros_stormd",
         "mod_secrets": "mod_secrets",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "ros_neovim": "ros_neovim"
       }
     },
     "ros_neovim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
         "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
         "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",

hosts/lio/flake.nix

@@ -1,20 +1,16 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
     mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
-    mod_common.inputs.nixpkgs.follows = "nixpkgs";
+    mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";
     mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
     mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
-    # mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic";
-    # mod_de_hyprland.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_hyprland";
     mod_de_gnome.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_gnome";
     mod_ros_stormd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_stormd";
     mod_nebula.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_nebula";
-    mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";
-    mod_home-manager.inputs.home-manager.url = "github:rycee/home-manager/release-24.11";
-    mod_home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -55,6 +51,13 @@
                     ../../components/nix/steam.nix
                   ];
 
+                  environment.systemPackages = with pkgs; [
+                    lua
+                    qdirstat
+                    qflipper
+                    steam
+                  ];
+
                   # Also allow this key to work for root user, this will let us use this as a remote builder easier
                   users.users.root.openssh.authorizedKeys.keys = [
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
@@ -93,7 +96,7 @@
                             discord
                             firefox-esr
                             # freecad
-                            # openscad
+                            openscad
                             # ladybird
                             # ollama
                             vlc