rename all Lix references to Nix, remove Lix cache entries from CI

Lillecarl · Lillecarl · commit 919d897da5ba · 2026-05-27T23:30:06.000+02:00
diff --git a/.github/actions/setup-nix/action.yaml b/.github/actions/setup-nix/action.yaml
@@ -22,10 +22,10 @@ runs:
         # - Update substituters: https://nix-csi.cachix.org → https://nixkube.cachix.org
         # - Recreate/migrate Cachix cache from nix-csi to nixkube
         nix_conf: |
-          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= nixbuild.net/CHEAKK-1:IvfuR1Ldmkef8pMcSuCl9N2jppEb8KpBzdoB8uKQdxE= nix-csi.cachix.org-1:i4w33gR4efO67jpz8U7g/MdvRQ6mQ3LEF9fB8tES60g=
+          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixbuild.net/CHEAKK-1:IvfuR1Ldmkef8pMcSuCl9N2jppEb8KpBzdoB8uKQdxE= nix-csi.cachix.org-1:i4w33gR4efO67jpz8U7g/MdvRQ6mQ3LEF9fB8tES60g=
           extra-platforms = aarch64-linux qemu-user
           # builders = ssh-ng://eu.nixbuild.net aarch64-linux ; ssh-ng://eu.nixbuild.net x86_64-linux
-          substituters = https://cache.nixos.org?priority=1 https://nix-csi.cachix.org?priority=2 https://cache.lix.systems?priority=3 ssh-ng://eu.nixbuild.net?priority=4
+          substituters = https://cache.nixos.org?priority=1 https://nix-csi.cachix.org?priority=2 ssh-ng://eu.nixbuild.net?priority=4
           keep-env-derivations = true
           keep-outputs = true
     - name: Restore and save Nix store
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -50,11 +50,11 @@ jobs:
           unlink nix-envs || true
           nix build --show-trace --file . push --out-link nix-envs
           ./nix-envs/bin/push
-      - name: Build and push amd64 lix image
+      - name: Build and push amd64 nix image
         run: |
-          unlink nix-lix || true
-          nix build --show-trace --file . lixImage.pushArch.x86_64-linux --out-link nix-lix
-          ./nix-lix/bin/push-lix-x86_64-linux
+          unlink nix-nix || true
+          nix build --show-trace --file . nixImage.pushArch.x86_64-linux --out-link nix-nix
+          ./nix-nix/bin/push-nix-x86_64-linux
   build-arm64:
     runs-on: ubuntu-24.04-arm
     steps:
@@ -71,11 +71,11 @@ jobs:
           unlink nix-envs || true
           nix build --show-trace --file . push --out-link nix-envs
           ./nix-envs/bin/push
-      - name: Build and push arm64 lix image
+      - name: Build and push arm64 nix image
         run: |
-          unlink nix-lix || true
-          nix build --show-trace --file . lixImage.pushArch.aarch64-linux --out-link nix-lix
-          ./nix-lix/bin/push-lix-aarch64-linux
+          unlink nix-nix || true
+          nix build --show-trace --file . nixImage.pushArch.aarch64-linux --out-link nix-nix
+          ./nix-nix/bin/push-nix-aarch64-linux
   build-manifests:
     needs: [build-amd64, build-arm64]
     runs-on: ubuntu-latest
@@ -88,11 +88,11 @@ jobs:
           nixbuild_key: ${{ secrets.NIXBUILD_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           cache_key: build-manifests
-      - name: Create lix multi-arch manifest
+      - name: Create nix multi-arch manifest
         run: |
           unlink nix-manifest || true
-          nix build --show-trace --file . lixImage.pushManifest --out-link nix-manifest
-          ./nix-manifest/bin/push-lix-manifest
+          nix build --show-trace --file . nixImage.pushManifest --out-link nix-manifest
+          ./nix-manifest/bin/push-nix-manifest
       - name: Build and push scratch image
         run: |
           unlink nix-scratches || true
diff --git a/.github/workflows/test-nixos.yaml b/.github/workflows/test-nixos.yaml
@@ -22,9 +22,9 @@ jobs:
           nix_conf: |
             experimental-features = nix-command flakes
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= nixbuild.net/CHEAKK-1:IvfuR1Ldmkef8pMcSuCl9N2jppEb8KpBzdoB8uKQdxE= nix-csi.cachix.org-1:i4w33gR4efO67jpz8U7g/MdvRQ6mQ3LEF9fB8tES60g=
+            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixbuild.net/CHEAKK-1:IvfuR1Ldmkef8pMcSuCl9N2jppEb8KpBzdoB8uKQdxE= nix-csi.cachix.org-1:i4w33gR4efO67jpz8U7g/MdvRQ6mQ3LEF9fB8tES60g=
             # builders = ssh-ng://eu.nixbuild.net aarch64-linux ; ssh-ng://eu.nixbuild.net x86_64-linux
-            substituters = https://cache.nixos.org?priority=1 https://nix-csi.cachix.org?priority=2 https://cache.lix.systems?priority=3 ssh-ng://eu.nixbuild.net?priority=4
+            substituters = https://cache.nixos.org?priority=1 https://nix-csi.cachix.org?priority=2 ssh-ng://eu.nixbuild.net?priority=4
             sandbox = relaxed
       - name: Configure SSH Keys
         shell: bash
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -116,7 +116,7 @@ The integration test (runs in CI via `.github/workflows/integration-test.yaml`):
 - Confirms cache and node pods are operational
 
 **Build job** (runs once, pushes to cachix and container registry):
-1. Builds and pushes Lix image
+1. Builds and pushes Nix image
 2. Builds and pushes cache/node environments
 3. Builds and pushes scratch image
 
@@ -202,7 +202,7 @@ The `config-reconciler` service runs continuously to sync SSH keys and Nix confi
 - `kubenix/builder.nix`: Optional builder pods for distributed builds
 - `pkgs/nixkube/src/csi/server.py`: CSI driver gRPC server
 - `pkgs/nixkube/src/nri/server.py`: NRI plugin ttrpc handler
-- `liximage.nix`: Builds the Lix container used by initContainers
+- `niximage.nix`: Builds the Nix container used by initContainers
 
 ## Code Review Standards
 
diff --git a/default.nix b/default.nix
@@ -225,6 +225,6 @@ rec {
     programs.yamlfmt.enable = true;
   };
 
-  lixImage = pkgs.callPackage ./liximage.nix { };
+  nixImage = pkgs.callPackage ./niximage.nix { };
   scratchImage = pkgs.callPackage ./scratchimage.nix { };
 }
diff --git a/demo/pod.nix b/demo/pod.nix
@@ -20,7 +20,7 @@ let
         pkgs.fishMinimal
         pkgs.coreutils
         pkgs.moreutils
-        pkgs.lix
+        pkgs.nix
       ];
     };
 
diff --git a/environments/cache/default.nix b/environments/cache/default.nix
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-# Cache uses lruLix which is Lix patched to keep storePaths registrationTime up2date when they're referenced
+# Cache uses a patched Nix to keep storePaths registrationTime up2date when they're referenced
 # through the Daemon protocol
 {
   pkgs,
diff --git a/environments/modules/gc.nix b/environments/modules/gc.nix
@@ -23,7 +23,7 @@
       command = pkgs.writeShellApplication {
         name = "gc";
         runtimeInputs = [
-          pkgs.lruLix
+          pkgs.nix
           pkgs.jq
         ];
         text =
diff --git a/environments/modules/nix-daemon.nix b/environments/modules/nix-daemon.nix
@@ -8,7 +8,7 @@
 {
   config = {
     services.nix-daemon = {
-      command = "${lib.getExe pkgs.lruLix} daemon --store local";
+      command = "${lib.getExe pkgs.nix} daemon --store local";
       depends-on = [ "setup" ];
       log-type = "file";
       logfile = "/var/log/nix-daemon.log";
diff --git a/environments/modules/setup.nix b/environments/modules/setup.nix
@@ -19,7 +19,7 @@
         runtimeInputs = [
           pkgs.rsync
           pkgs.coreutils
-          pkgs.lruLix
+          pkgs.nix
         ];
         text = # bash
           ''
diff --git a/kubenix/daemonset.nix b/kubenix/daemonset.nix
@@ -74,7 +74,7 @@ in
                 initContainers = lib.mkNumberedList {
                   "1" = {
                     name = "initcopy";
-                    image = "ghcr.io/lillecarl/nix-csi/lix:${curPkgs.lruLix.version}-${cfg.version}";
+                    image = "ghcr.io/lillecarl/nix-csi/nix:${curPkgs.nix.version}-${cfg.version}";
                     imagePullPolicy = "Always";
                     securityContext.privileged = true; # chroot store
                     env = lib.mkNamedList {
diff --git a/kubenix/secret.nix b/kubenix/secret.nix
@@ -91,8 +91,7 @@ in
                 serviceAccountName = "nixkube";
                 containers = lib.mkNamedList {
                   init = {
-                    # Use normal lix so we don't have to build lruLix locally
-                    image = "ghcr.io/lillecarl/nix-csi/lix:${curPkgs.lruLix.version}-${cfg.version}";
+                    image = "ghcr.io/lillecarl/nix-csi/nix:${curPkgs.nix.version}-${cfg.version}";
                     imagePullPolicy = "Always";
                     command = [ "init-secrets" ];
                     volumeMounts = lib.mkNamedList {
diff --git a/metadata/next.md b/metadata/next.md
@@ -26,7 +26,7 @@
 - Remove ConfigMap.push — transformer preserves context when push=true @claude
 - Limit kubenixPush to currentSystem to avoid cross-compilation @claude
 - Single DaemonSet with JSON NODE_ENV, split CI per-arch builds @claude
-- Per-system DaemonSets with direct store paths and versioned lix image tag
+- Per-system DaemonSets with direct store paths and versioned nix image tag
 
 ## Outstanding Ideas (Deferred)
 - **GitHub Actions Generation with Nix** (user wants to revisit when not tired)
diff --git a/niximage.nix b/niximage.nix
@@ -29,7 +29,7 @@ rec {
       runtimeInputs = [
         sysPkgs.coreutils
         sysPkgs.gitMinimal
-        sysPkgs.lruLix
+        sysPkgs.nix
         sysPkgs.rsync
         sysPkgs.openssh
         sysPkgs.kubectl
@@ -85,8 +85,8 @@ rec {
 
     in
     pkgs.dockerTools.streamLayeredImage {
-      name = "${repo}/lix";
-      tag = "${sysPkgs.lruLix.version}-${nixkubeVersion}-${sysPkgs.stdenv.hostPlatform.system}";
+      name = "${repo}/nix";
+      tag = "${sysPkgs.nix.version}-${nixkubeVersion}-${sysPkgs.stdenv.hostPlatform.system}";
       architecture = sysPkgs.go.GOARCH;
 
       maxLayers = 125;
@@ -116,7 +116,7 @@ rec {
   pushArch = lib.mapAttrs (
     system: image:
     pkgs.writeShellApplication {
-      name = "push-lix-${system}";
+      name = "push-nix-${system}";
       runtimeInputs = [
         pkgs.skopeo
         pkgs.gzip
@@ -133,15 +133,15 @@ rec {
 
   # Manifest creation (used by dependent CI job after both arches are pushed)
   pushManifest = pkgs.writeShellApplication {
-    name = "push-lix-manifest";
+    name = "push-nix-manifest";
     runtimeInputs = [ pkgs.regctl ];
     text = # bash
       ''
         regctl registry login -u="$REPO_USERNAME" -p="$REPO_TOKEN" ${server}
-        regctl index create ${repo}/lix:${pkgs.lruLix.version}-${nixkubeVersion} \
+        regctl index create ${repo}/nix:${pkgs.nix.version}-${nixkubeVersion} \
           --ref ${imageRef "aarch64-linux"} \
           --ref ${imageRef "x86_64-linux"}
-        regctl index create ${repo}/lix:latest \
+        regctl index create ${repo}/nix:latest \
           --ref ${imageRef "aarch64-linux"} \
           --ref ${imageRef "x86_64-linux"}
       '';
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -31,18 +31,8 @@ self: pkgs: {
   #   python310 = pkgs.python3;
   # };
 
-  stdLix = pkgs.lixPackageSets.lix_2_94.lix;
-  lruLix = pkgs.lixPackageSets.lix_2_94.lix.overrideAttrs (oldAttrs: {
-    src = builtins.fetchTree {
-      type = "github";
-      owner = "lillecarl";
-      repo = "lix";
-      ref = "regtimeabuse2.94";
-    };
-    # src = pkgs.lib.fileset.toSource {
-    #   root = /home/lillecarl/Code/lix;
-    #   fileset = pkgs.lib.fileset.gitTracked /home/lillecarl/Code/lix;
-    # };
+  stdNix = pkgs.nix;
+  nix = pkgs.nix.overrideAttrs (oldAttrs: {
     doCheck = false;
     doInstallCheck = false;
   });
diff --git a/pkgs/nixkube/default.nix b/pkgs/nixkube/default.nix
@@ -11,10 +11,10 @@
   nri-proto-python, # NRI ttRPC bindings
   grpclib-nri, # NRI protocol utilities
   googleapis-common-protos, # Google Errors
-  gitMinimal, # Lix requires Git since it doesn't use libgit2
+  gitMinimal,
   kr8s, # Kubernetes API
   shellous, # subprocessing
-  lruLix, # We need a Nix implementation.... :)
+  nix,
   nix_init_db, # Import from one nix DB to another
   openssh, # Copying to cache
   lib,
@@ -47,7 +47,7 @@ buildPythonApplication {
     gitMinimal
     kr8s
     shellous
-    lruLix
+    nix
     nix_init_db
     openssh
     util-linuxMinimal

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,6 @@ rec {`
`225`	`225`	`programs.yamlfmt.enable = true;`
`226`	`226`	`};`
`227`	`227`
`228`		`- lixImage = pkgs.callPackage ./liximage.nix { };`
	`228`	`+ nixImage = pkgs.callPackage ./niximage.nix { };`
`229`	`229`	`scratchImage = pkgs.callPackage ./scratchimage.nix { };`
`230`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# SPDX-License-Identifier: MIT`
`2`	`2`
`3`		`-# Cache uses lruLix which is Lix patched to keep storePaths registrationTime up2date when they're referenced`
	`3`	`+# Cache uses a patched Nix to keep storePaths registrationTime up2date when they're referenced`
`4`	`4`	`# through the Daemon protocol`
`5`	`5`	`{`
`6`	`6`	`pkgs,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`{`
`9`	`9`	`config = {`
`10`	`10`	`services.nix-daemon = {`
`11`		`- command = "${lib.getExe pkgs.lruLix} daemon --store local";`
	`11`	`+ command = "${lib.getExe pkgs.nix} daemon --store local";`
`12`	`12`	`depends-on = [ "setup" ];`
`13`	`13`	`log-type = "file";`
`14`	`14`	`logfile = "/var/log/nix-daemon.log";`