let nixpkgs roam free

Signed-off-by: jolheiser <git@jolheiser.com>

flake.lock

@@ -3,7 +3,9 @@
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": [],
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -25,9 +27,7 @@
     },
     "cfg": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1729195705,
@@ -98,28 +98,10 @@
         "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_2",
+        "flake-utils": "flake-utils",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
@@ -141,9 +123,7 @@
     },
     "gomodinit": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1734153556,
@@ -163,6 +143,7 @@
       "inputs": {
         "jolheiser": "jolheiser",
         "nixpkgs": [
+          "helix",
           "jolheiser",
           "nixpkgs"
         ]
@@ -203,25 +184,7 @@
     },
     "jolheiser": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_3"
-      },
-      "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,
@@ -255,11 +218,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739736696,
+        "lastModified": 1741246872,
-        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {
@@ -303,27 +266,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1739736696,
+        "lastModified": 1741037377,
-        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1734119587,
+        "lastModified": 1739736696,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {
@@ -350,6 +313,54 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "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": {
       "locked": {
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@@ -367,7 +378,7 @@
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -386,10 +397,7 @@
     },
     "pokego": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_6"
-          "jolheiser",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1741123315,
@@ -409,14 +417,12 @@
       "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_3",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "pokego": "pokego",
         "spectre": "spectre",
@@ -425,9 +431,7 @@
     },
     "spectre": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_7"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1732207908,
@@ -490,10 +494,8 @@
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_8",
-        "utils": [
+        "utils": "utils"
-          "flake-utils"
-        ]
       },
       "locked": {
         "lastModified": 1733922802,
@@ -530,6 +532,24 @@
         "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"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -3,9 +3,6 @@
 
   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";
@@ -13,40 +10,20 @@
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
         darwin.follows = "";
-        home-manager.follows = "";
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
       };
     };
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     nur.url = "github:nix-community/NUR";
-    helix = {
+    helix.url = "git+https://git.jolheiser.com/helix.drv.git";
-      url = "git+https://git.jolheiser.com/helix.drv.git";
+    gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git";
-      inputs.nixpkgs.follows = "jolheiser/nixpkgs";
+    cfg.url = "git+https://git.jolheiser.com/cfg.git";
-    };
+    spectre.url = "git+https://git.jolheiser.com/go-spectre.git";
-    gomodinit = {
+    pokego.url = "git+https://git.jolheiser.com/pokego.git";
-      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 = {
+    tclip.url = "github:tailscale-dev/tclip";
-      url = "github:tailscale-dev/tclip";
-      inputs = {
-        utils.follows = "flake-utils";
-      };
-    };
   };
 
   outputs =

machines/common/nogui/default.nix

@@ -55,7 +55,7 @@
         "flakes"
         "nix-command"
       ];
-      auto-optimise-store = true;
+      optimise = true;
       warn-dirty = false;
       substituters = [ "https://jolheiser.cachix.org" ];
       trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];