System Gen235 @ 2026-06-19-21:07:09 by jonas@comfy-station

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780894562,
+        "lastModified": 1781152676,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1781064146,
+        "lastModified": 1781409739,
-        "narHash": "sha256-HjjvV8nCE6/sTgghlTW1ht8Rs3VZB55tV8wWces8DwY=",
+        "narHash": "sha256-6dadOVlqPpjy0w4WuwvX+Qx0Kkaabm3tahMrCrr72Rg=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "5213e7922ccfed3b070bf125c103504bc37852eb",
+        "rev": "ef56de5faccb3ac59d95aa31cce551ff72e35bed",
         "type": "gitlab"
       },
       "original": {
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781063120,
+        "lastModified": 1781319724,
-        "narHash": "sha256-1UIF/mDJluwJQjmmcZ2j1L2+mjYsefe82QCLj0TYSOg=",
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "baa46aeb6d02e0ba13de67cd35e3d57aedfacf01",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1781020964,
+        "lastModified": 1781168557,
-        "narHash": "sha256-fS7xTi2j2iso5Hj7RNZLv/acDlCT+fgMVkVk40A7Uco=",
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "32c2cd9e46286c4eced3dc6b613c659126bf3cca",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -203,11 +203,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1780749050,
+        "lastModified": 1781074563,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780902259,
+        "lastModified": 1781216227,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1781101834,
+        "lastModified": 1781425310,
-        "narHash": "sha256-gNVY6SYglFe37FpD+NnOjTipsqvVMM2vh/uc22KDEsA=",
+        "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "0243dd6707c969fc8440216c811b3f2e4a4cceb7",
+        "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441",
         "type": "github"
       },
       "original": {

hosts/comfy-station/default.nix

@@ -27,6 +27,7 @@
       self.nixosModules.firefox
       self.nixosModules.kdeconnect
       self.nixosModules.ntsync
+      self.nixosModules.follow-hive-nixpkgs
     ];
   };
 }

hosts/monolith/default.nix

@@ -34,6 +34,7 @@
       self.nixosModules.spotify-shortcuts
       self.nixosModules.ntsync
       self.nixosModules.spicetify
+      self.nixosModules.follow-hive-nixpkgs
     ];
   };
 }

modules/tools/follow-hive-nixpkgs/.envrc

@@ -0,0 +1 @@
+use flake ../../#follow-hive-nixpkgs --show-trace

modules/tools/follow-hive-nixpkgs/_derivation.nix

@@ -0,0 +1,8 @@
+{python3Packages}:
+with python3Packages;
+  buildPythonApplication {
+    name = "follow-hive-nixpkgs";
+    pyproject = true;
+    build-system = [setuptools];
+    src = ./.;
+  }

modules/tools/follow-hive-nixpkgs/_shell.nix

@@ -0,0 +1,15 @@
+{pkgs ? import <nixpkgs> {}}: let
+  drv = pkgs.callPackage ./_derivation.nix {};
+in
+  pkgs.mkShell {
+    packages = [
+      pkgs.pyright
+      pkgs.black
+    ];
+
+    inputsFrom = [drv];
+
+    shellHook = ''
+      export PYTHONPATH="$PYTHONPATH:$(pwd)"
+    '';
+  }

modules/tools/follow-hive-nixpkgs/default.nix

@@ -0,0 +1,26 @@
+{self, ...}: {
+  flake.overlays.follow-hive-nixpkgs = final: prev: {
+    follow-hive-nixpkgs = final.callPackage ./_derivation.nix {};
+  };
+
+  perSystem = {pkgs, ...}: {
+    packages.follow-hive-nixpkgs = pkgs.callPackage ./_derivation.nix {};
+    devShells.follow-hive-nixpkgs = import ./_shell.nix {inherit pkgs;};
+  };
+
+  flake.nixosModules.follow-hive-nixpkgs-overlay = {
+    nixpkgs.overlays = [
+      self.overlays.follow-hive-nixpkgs
+    ];
+  };
+
+  flake.nixosModules.follow-hive-nixpkgs = {pkgs, ...}: {
+    imports = [
+      self.nixosModules.follow-hive-nixpkgs-overlay
+    ];
+
+    environment.systemPackages = [
+      pkgs.follow-hive-nixpkgs
+    ];
+  };
+}

modules/tools/follow-hive-nixpkgs/follow_hive_nixpkgs/app/__init__.py

@@ -0,0 +1,5 @@
+from follow_hive_nixpkgs.app import app
+
+
+def main():
+    app.main()

modules/tools/follow-hive-nixpkgs/follow_hive_nixpkgs/app/app.py

@@ -0,0 +1,30 @@
+from follow_hive_nixpkgs.config import Config
+from follow_hive_nixpkgs.lock import loadNixpkgs, writeNixpkgs
+from pathlib import Path
+import json
+
+
+def dry_run(c: Config):
+    s = loadNixpkgs(c.source_lock, c.source_nixpkgs)
+    t = loadNixpkgs(c.target_lock, "nixpkgs")
+
+    print(
+        f"Would change {c.target_lock} from:\n{json.dumps(t, indent=2)} to:\n{json.dumps(s, indent=2)}\nWith values from {c.source_lock}"
+    )
+
+
+def main():
+    c = Config.load(
+        [
+            Path.home() / ".config/follow-hive-nixpkgs/config.json",
+            Path("/etc/follow-hive-nixpkgs/config.json"),
+        ]
+    )
+
+    print(c)
+
+    if c.dry:
+        dry_run(c)
+    else:
+        s = loadNixpkgs(c.source_lock, c.source_nixpkgs)
+        writeNixpkgs(s, c.target_lock)

modules/tools/follow-hive-nixpkgs/follow_hive_nixpkgs/config.py

@@ -0,0 +1,76 @@
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Self
+import argparse
+import sys
+import json
+
+
+@dataclass
+class Config:
+    source_lock: Path = Path.home() / ".hive/flake.lock"
+    source_nixpkgs: str = "nixpkgs-unstable"
+    target_lock: Path = Path.cwd() / "flake.lock"
+    dry: bool = False
+
+    @classmethod
+    def load(cls, paths: list[Path]) -> Self:
+        c = cls()
+
+        args = cls.argparse()
+
+        c.dry = args.dry
+
+        # Target lock can only be set via args
+        if args.target_lock:
+            c.target_lock = Path(args.target_lock)
+
+        # We do not need to read config files.
+        if args.source_lock:
+            c.source_lock = Path(args.source_lock)
+            return c
+
+        # Check if source_lock is set somewhere
+        for p in paths:
+            if not p.exists():
+                continue
+
+            with p.open(mode="r") as f:
+                cfg = json.load(f)
+                c.source_lock = Path(cfg["source_lock"])
+                c.source_nixpkgs = cfg["source_nixpkgs"]
+                break
+
+        return c
+
+    @staticmethod
+    def argparse() -> argparse.Namespace:
+        args = argparse.ArgumentParser()
+        args.add_argument(
+            "--source_lock",
+            type=Path,
+            default=None,
+            required=False,
+            help="The flake.lock file to read nixpkgs from.",
+        )
+        args.add_argument(
+            "--source_nixpkgs",
+            type=Path,
+            default=None,
+            required=False,
+            help="The nixpkgs in flake.lock to use.",
+        )
+        args.add_argument(
+            "--target_lock",
+            type=Path,
+            default=None,
+            required=False,
+            help="The flake.lock file to write nixpkgs to. Use CWD/flake.lock if unset",
+        )
+        args.add_argument(
+            "--dry",
+            action="store_true",
+            help="Only show what would be done.",
+        )
+
+        return args.parse_args(sys.argv[1:])

modules/tools/follow-hive-nixpkgs/follow_hive_nixpkgs/lock.py

@@ -0,0 +1,34 @@
+import json
+from pathlib import Path
+import sys
+
+
+def loadNixpkgs(source: Path, nixpkgs: str) -> dict:
+    if not source.exists():
+        print(f"{source} does not exist.")
+        sys.exit(1)
+
+    with source.open(mode="r") as f:
+        src = json.load(f)
+        if nixpkgs not in src["nodes"]:
+            print(f"There is no {nixpkgs} entry in {source}")
+            sys.exit(1)
+        return src["nodes"][nixpkgs]
+
+
+def writeNixpkgs(nixpkgs: dict, target: Path):
+    if not target.exists():
+        print(f"{target} does not exist.")
+        sys.exit(1)
+
+    with target.open(mode="r+") as f:
+        tgt = json.load(f)
+        if "nixpkgs" not in tgt["nodes"]:
+            print(f"There is no nixpkgs entry in {target}")
+            sys.exit(1)
+
+        tgt["nodes"]["nixpkgs"] = nixpkgs
+
+        f.seek(0)
+        json.dump(tgt, f, indent=2)
+        f.truncate()

modules/tools/follow-hive-nixpkgs/setup.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from setuptools import setup, find_packages
+
+setup(
+    name="follow_hive_nixpkgs",
+    version="1.0",
+    packages=find_packages(),
+    entry_points={
+        "console_scripts": [
+            "follow-hive-nixpkgs=follow_hive_nixpkgs.app:main",
+        ],
+    },
+)

templates/_uv-python/.envrc

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# ^ make editor happy
+
+#
+# Use https://direnv.net/ to automatically load the dev shell.
+#
+
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+fi  
+
+watch_file nix/**
+watch_file -- **/*.nix
+watch_file uv.lock
+
+# Adding files to git includes them in a flake
+# But it is also a bit much reloading.
+# watch_file .git/index .git/HEAD
+use flake . --show-trace

templates/_uv-python/flake.nix

@@ -0,0 +1,95 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
+    pyproject-nix.url = "github:pyproject-nix/pyproject.nix";
+    pyproject-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    uv2nix.url = "github:pyproject-nix/uv2nix";
+    uv2nix.inputs.pyproject-nix.follows = "pyproject-nix";
+    uv2nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs";
+    pyproject-build-systems.inputs.pyproject-nix.follows = "pyproject-nix";
+    pyproject-build-systems.inputs.uv2nix.follows = "uv2nix";
+    pyproject-build-systems.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs @ {
+    flake-parts,
+    pyproject-nix,
+    uv2nix,
+    pyproject-build-systems,
+    ...
+  }: let
+    projectName = "YOUR_PROJECT_NAME"; # TODO: Fill in your project name
+  in
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      systems = ["x86_64-linux"];
+
+      perSystem = {
+        pkgs,
+        self',
+        ...
+      }: let
+        workspace = uv2nix.lib.workspace.loadWorkspace {workspaceRoot = ./.;};
+        python = pkgs.lib.head (pyproject-nix.lib.util.filterPythonInterpreters {
+          inherit (workspace) requires-python;
+          inherit (pkgs) pythonInterpreters;
+        });
+        overlay = workspace.mkPyprojectOverlay {
+          sourcePreference = "wheel";
+        };
+        pythonBase = pkgs.callPackage pyproject-nix.build.packages {
+          inherit python;
+        };
+        pythonSet = pythonBase.overrideScope (
+          pkgs.lib.composeManyExtensions [
+            pyproject-build-systems.overlays.wheel
+            overlay
+          ]
+        );
+        editableOverlay = workspace.mkEditablePyprojectOverlay {
+          root = "$REPO_ROOT";
+        };
+        editablePythonSet = pythonSet.overrideScope editableOverlay;
+        devvenv = editablePythonSet.mkVirtualEnv "${projectName}-dev-env" workspace.deps.all;
+        venv = pythonSet.mkVirtualEnv "${projectName}-env" workspace.deps.default;
+      in {
+        packages.default = self'.packages.${projectName};
+        packages.${projectName} = (pkgs.callPackage pyproject-nix.build.util {}).mkApplication {
+          inherit venv;
+          package = pythonSet.${projectName};
+        };
+
+        apps.default = self'.apps.${projectName};
+        apps.${projectName} = {
+          type = "app";
+          program = "${self'.packages.default}/bin/${projectName}";
+        };
+
+        devShells.default = pkgs.mkShell {
+          packages = [
+            devvenv
+            pkgs.uv
+          ];
+
+          env = {
+            UV_NO_SYNC = "1";
+            UV_PYTHON = editablePythonSet.python.interpreter;
+            UV_PYTHON_DOWNLOADS = "never";
+          };
+
+          shellHook = ''
+            unset PYTHONPATH
+            export REPO_ROOT=$(git rev-parse --show-toplevel)
+          '';
+        };
+
+        devShells.uv = pkgs.mkShell {
+          packages = with pkgs; [python3 uv];
+        };
+      };
+    };
+}

templates/uv-python.nix

@@ -0,0 +1,17 @@
+_: {
+  flake.templates.uv-python = {
+    path = ./_uv-python;
+    description = "A simple uv2nix python project";
+    welcomeText = ''
+      # Setup your uv project first
+      - Run `nix develop .#uv`
+      - Run `uv init --app --packages`
+      - Run `uv lock`
+      - Edit `projectName` in flake.nix
+
+      # Start developing
+      - Run `direnv allow` or `nix develop`
+      - Add packages with `uv add --dev black pyright`
+    '';
+  };
+}