fix: bootstrap script not working with nix-plugins

SwarselSystems.org

@@ -1340,9 +1340,39 @@ Lastly, in the =perSystem= attribute set, we see that it is actually passed some
           };
         };
 
-        devshells.default = let
+        devshells = {
-          nix-version = "2_30";
+          deploy =
+            let
+              nix-version = "2_28";
             in {
+            packages = [
+              (builtins.trace "alarm: pinned nix_${nix-version}" pkgs.stable25_05.nixVersions."nix_${nix-version}")
+              pkgs.git
+              pkgs.just
+              pkgs.age
+              pkgs.ssh-to-age
+              pkgs.sops
+            ];
+
+            env =
+              [
+                {
+                  name = "NIX_CONFIG";
+                  value = ''
+                    plugin-files = ${pkgs.stable25_05.nix-plugins.overrideAttrs (o: {
+                      buildInputs = [pkgs.stable25_05.nixVersions."nix_${nix-version}" pkgs.stable25_05.boost];
+                      patches = (o.patches or []) ++ [./nix-plugins.patch];
+                    })}/lib/nix/plugins
+                    extra-builtins-file = ${self + /nix/extra-builtins.nix}
+                  '';
+                }
+              ];
+          };
+          default =
+            let
+              nix-version = "2_30";
+            in
+            {
               packages = [
                 (builtins.trace "alarm: pinned nix_${nix-version}" pkgs.nixVersions."nix_${nix-version}")
                 pkgs.git
@@ -1429,14 +1459,14 @@ Lastly, in the =perSystem= attribute set, we see that it is actually passed some
 
               devshell.startup.pre-commit-install.text = "pre-commit install";
 
-          env = let
+              env =
+                let
                   nix-plugins = pkgs.nix-plugins.override {
                     nixComponents = pkgs.nixVersions."nixComponents_${nix-version}";
                   };
-          in [
+                in
+                [
                   {
-              # Additionally configure nix-plugins with our extra builtins file.
-              # We need this for our repo secrets.
                     name = "NIX_CONFIG";
                     value = ''
                       plugin-files = ${nix-plugins}/lib/nix/plugins
@@ -1446,6 +1476,7 @@ Lastly, in the =perSystem= attribute set, we see that it is actually passed some
                 ];
             };
         };
+      };
   }
 #+end_src
 
@@ -4801,7 +4832,7 @@ This is also exposed to home-manager configurations, in case this ever breaks, I
 
 #+begin_src nix-ts :tangle modules/nixos/common/pii.nix
   # largely based on https://github.com/oddlama/nix-config/blob/main/modules/secrets.nix
-  { config, inputs, lib, minimal, ... }:
+  { config, inputs, lib, ... }:
   let
     # If the given expression is a bare set, it will be wrapped in a function,
     # so that the imported file can always be applied to the inputs, similar to
@@ -4867,7 +4898,7 @@ This is also exposed to home-manager configurations, in case this ever breaks, I
         let
           local = config.node.secretsDir + "/pii.nix.enc";
         in
-        (lib.optionalAttrs (lib.pathExists local && !minimal) { inherit local; }) // lib.optionalAttrs (!minimal) {
+        (lib.optionalAttrs (lib.pathExists local) { inherit local; }) // lib.optionalAttrs true {
           common = ../../../secrets/repo/pii.nix.enc;
         };
     };
@@ -17904,6 +17935,7 @@ This program sets up a new NixOS host remotely. It also takes care of secret man
   fi
 
   cd "$FLAKE"
+
   rm install/flake.lock || true
   git_root=$(git rev-parse --show-toplevel)
   # ------------------------
@@ -23872,12 +23904,9 @@ This file defines a few workflows that I often need to run when working on my co
   update:
     nix flake update
 
-  iso:
+  iso CONFIG="live-iso":
     rm -rf result
-    nix build .#nixosConfigurations.iso.config.system.build.isoImage && ln -sf result/iso/*.iso latest.iso
+    nix build --print-out-paths .#live-iso
-
-  iso-flake FLAKE SYSTEM="x86_64" FORMAT="iso":
-    nixos-generate --flake .#{{FLAKE}} -f {{FORMAT}} --system {{SYSTEM}}
 
   iso-install DRIVE: iso
     sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
@@ -23888,6 +23917,9 @@ This file defines a few workflows that I often need to run when working on my co
   sync USER HOST:
     rsync -rltv --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:.dotfiles/
 
+  bootstrap DEST CONFIG ARCH="x86_64-linux":
+    nix develop .#deploy --command zsh -c "swarsel-bootstrap -n {{CONFIG}} -d {{DEST}} -a {{ARCH}}"
+
 #+end_src
 ** aspell.conf
 :PROPERTIES:

files/scripts/swarsel-bootstrap.sh

@@ -185,6 +185,7 @@ if [ ! -d "$FLAKE" ]; then
 fi
 
 cd "$FLAKE"
+
 rm install/flake.lock || true
 git_root=$(git rev-parse --show-toplevel)
 # ------------------------

justfile

@@ -10,12 +10,9 @@ check-trace:
 update:
   nix flake update
 
-iso:
+iso CONFIG="live-iso":
   rm -rf result
-  nix build .#nixosConfigurations.iso.config.system.build.isoImage && ln -sf result/iso/*.iso latest.iso
+  nix build --print-out-paths .#live-iso
-
-iso-flake FLAKE SYSTEM="x86_64" FORMAT="iso":
-  nixos-generate --flake .#{{FLAKE}} -f {{FORMAT}} --system {{SYSTEM}}
 
 iso-install DRIVE: iso
   sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
@@ -25,3 +22,6 @@ dd DRIVE ISO:
 
 sync USER HOST:
   rsync -rltv --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:.dotfiles/
+
+bootstrap DEST CONFIG ARCH="x86_64-linux":
+  nix develop .#deploy --command zsh -c "swarsel-bootstrap -n {{CONFIG}} -d {{DEST}} -a {{ARCH}}"

modules/nixos/common/pii.nix

@@ -1,5 +1,5 @@
 # largely based on https://github.com/oddlama/nix-config/blob/main/modules/secrets.nix
-{ config, inputs, lib, minimal, ... }:
+{ config, inputs, lib, ... }:
 let
   # If the given expression is a bare set, it will be wrapped in a function,
   # so that the imported file can always be applied to the inputs, similar to
@@ -65,7 +65,7 @@ in
       let
         local = config.node.secretsDir + "/pii.nix.enc";
       in
-      (lib.optionalAttrs (lib.pathExists local && !minimal) { inherit local; }) // lib.optionalAttrs (!minimal) {
+      (lib.optionalAttrs (lib.pathExists local) { inherit local; }) // lib.optionalAttrs true {
         common = ../../../secrets/repo/pii.nix.enc;
       };
   };

nix/devshell.nix

@@ -46,7 +46,36 @@
         };
       };
 
-      devshells.default =
+      devshells = {
+        deploy =
+          let
+            nix-version = "2_28";
+          in
+          {
+            packages = [
+              (builtins.trace "alarm: pinned nix_${nix-version}" pkgs.stable25_05.nixVersions."nix_${nix-version}")
+              pkgs.git
+              pkgs.just
+              pkgs.age
+              pkgs.ssh-to-age
+              pkgs.sops
+            ];
+
+            env =
+              [
+                {
+                  name = "NIX_CONFIG";
+                  value = ''
+                    plugin-files = ${pkgs.stable25_05.nix-plugins.overrideAttrs (o: {
+                      buildInputs = [pkgs.stable25_05.nixVersions."nix_${nix-version}" pkgs.stable25_05.boost];
+                      patches = (o.patches or []) ++ [./nix-plugins.patch];
+                    })}/lib/nix/plugins
+                    extra-builtins-file = ${self + /nix/extra-builtins.nix}
+                  '';
+                }
+              ];
+          };
+        default =
           let
             nix-version = "2_30";
           in
@@ -145,8 +174,6 @@
               in
               [
                 {
-                # Additionally configure nix-plugins with our extra builtins file.
-                # We need this for our repo secrets.
                   name = "NIX_CONFIG";
                   value = ''
                     plugin-files = ${nix-plugins}/lib/nix/plugins
@@ -156,4 +183,5 @@
               ];
           };
       };
+    };
 }