diff --git a/flake.lock b/flake.lock
index 440d199afc5b0cc166d5e50e1ad6af427a9047f5..048e2c76eccefc780452790cf1a39a27e057ebd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,9 +3,7 @@   "nodes": {
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": [
-          "home-manager"
-        ],
+        "home-manager": [],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -27,7 +25,9 @@       }
     },
     "cfg": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1729195705,
@@ -98,10 +98,28 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
@@ -123,7 +141,9 @@       }
     },
     "gomodinit": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1734153556,
@@ -143,7 +163,6 @@     "helix": {
       "inputs": {
         "jolheiser": "jolheiser",
         "nixpkgs": [
-          "helix",
           "jolheiser",
           "nixpkgs"
         ]
@@ -184,7 +203,25 @@       }
     },
     "jolheiser": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1739904102,
+        "narHash": "sha256-Oh+ckGaUrnH5mMCsPvU9XViSAIfbigW7H0Rq/ZbbhlI=",
+        "ref": "refs/heads/main",
+        "rev": "0abadd849d3d36ca87fda7ea9ed637f25a0e9dae",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.jolheiser.com/nixpkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jolheiser.com/nixpkgs.git"
+      }
+    },
+    "jolheiser_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1739904102,
@@ -218,11 +255,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741246872,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "lastModified": 1739736696,
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {
@@ -266,22 +303,6 @@       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1741037377,
-        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
         "lastModified": 1739736696,
         "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
@@ -296,7 +317,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1734119587,
         "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
@@ -312,7 +333,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1734119587,
         "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
@@ -328,39 +349,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1741037377,
-        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1741246872,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@@ -378,7 +367,7 @@     },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -397,7 +386,10 @@       }
     },
     "pokego": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": [
+          "jolheiser",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1741123315,
@@ -417,12 +409,14 @@     "root": {
       "inputs": {
         "agenix": "agenix",
         "cfg": "cfg",
+        "flake-utils": "flake-utils",
         "ghostty": "ghostty",
         "gomodinit": "gomodinit",
         "helix": "helix",
         "home-manager": "home-manager",
+        "jolheiser": "jolheiser_2",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nur": "nur",
         "pokego": "pokego",
         "spectre": "spectre",
@@ -431,7 +425,9 @@       }
     },
     "spectre": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1732207908,
@@ -494,8 +490,10 @@       }
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
-        "utils": "utils"
+        "nixpkgs": "nixpkgs_5",
+        "utils": [
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1733922802,
@@ -529,24 +527,6 @@       },
       "original": {
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index a5e629ebc52b49b6164e7b60b6236a4fdfb9641f..a761e2f50f707177460e3d78f222e751854a410c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,9 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git";
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -10,20 +13,40 @@     };
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
-        darwin.follows = "";
-        home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
+        darwin.follows = "";
+        home-manager.follows = "";
       };
     };
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     nur.url = "github:nix-community/NUR";
-    helix.url = "git+https://git.jolheiser.com/helix.drv.git";
-    gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git";
-    cfg.url = "git+https://git.jolheiser.com/cfg.git";
-    spectre.url = "git+https://git.jolheiser.com/go-spectre.git";
-    pokego.url = "git+https://git.jolheiser.com/pokego.git";
+    helix = {
+      url = "git+https://git.jolheiser.com/helix.drv.git";
+      inputs.nixpkgs.follows = "jolheiser/nixpkgs";
+    };
+    gomodinit = {
+      url = "git+https://git.jolheiser.com/gomodinit.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    cfg = {
+      url = "git+https://git.jolheiser.com/cfg.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    spectre = {
+      url = "git+https://git.jolheiser.com/go-spectre.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    pokego = {
+      url = "git+https://git.jolheiser.com/pokego.git";
+      inputs.nixpkgs.follows = "jolheiser/nixpkgs";
+    };
     ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
-    tclip.url = "github:tailscale-dev/tclip";
+    tclip = {
+      url = "github:tailscale-dev/tclip";
+      inputs = {
+        utils.follows = "flake-utils";
+      };
+    };
   };
 
   outputs =
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index d168dde1b0f9fafd683bd6e3a92986b2c2853e44..1a348a61a8a6ec070c47ba830f1a956127151440 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -55,7 +55,7 @@       experimental-features = [
         "flakes"
         "nix-command"
       ];
-      optimise = true;
+      auto-optimise-store = true;
       warn-dirty = false;
       substituters = [ "https://jolheiser.cachix.org" ];
       trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];