step-bootstrap

modules/features/shell-tools.nix

@@ -29,8 +29,10 @@
   perSystem = { system, pkgs, self', ... }: {
     packages.shell-tools = inputs.wrappers.lib.wrapPackage { 
       inherit pkgs;
+      # binName = "show-tools";
       package = (pkgs.symlinkJoin {
-        name = "shell-tools";
+        name = "show-tools";
+        meta.mainProgram = "show-tools";
         paths = with pkgs; [
           nh
           ripgrep
@@ -44,6 +46,19 @@
           hostname
           iproute2
           direnv
+          (writeShellApplication {
+            name = "show-tools";
+            text = ''
+              IFS=':' read -r -a path_dirs <<< "''${PATH:-}"
+
+              for dir in "''${path_dirs[@]}"; do
+                [[ "$dir" == */bin ]] || continue
+                [[ -d "$dir" ]] || continue
+
+                printf '%s\n' "$dir"/*
+              done
+            '';
+          })
         ];
       });
     };

modules/features/step-client.nix

@@ -0,0 +1,51 @@
+{ self, inputs, ... }:
+let
+  bootstrapWrapper = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      caURL = lib.mkOption {
+        type = lib.types.str;
+      };
+      fingerprint = lib.mkOption {
+        type = lib.types.str;
+      };
+      install = lib.mkEnableOption "Install the cert to the system trust store";
+    };
+
+    config = {
+      package = config.pkgs.step-cli; # (1)!
+      binName = "bootstrap";
+      args = [
+        "ca" "bootstrap"
+        "--ca-url" config.caURL
+        "--fingerprint" config.fingerprint
+      ];
+    };
+  });
+in
+{
+  perSystem = { system, self', pkgs, lib, ... }: {
+    packages.step-client = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = (pkgs.symlinkJoin {
+        name = "step";
+        meta.mainProgram = "step";
+        paths = with pkgs; [
+          self'.packages.step-bootstrap
+        ];
+      });
+    };
+
+    packages.step-bootstrap = (bootstrapWrapper.apply {
+      inherit pkgs;
+      caURL = "https://janus.john-stream.com";
+      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+      install = true;
+    }).wrapper;
+  };
+
+  flake.modules.homeManager.myStepClient = { config, pkgs, lib, ... }: {
+    home.packages = [
+      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.step-bootstrap
+    ];
+  };
+}

modules/hosts/janus/default.nix

@@ -94,16 +94,4 @@ in
       }
     ];
   };
-
-  perSystem = { system, pkgs, lib, ... }: {
-    packages.janus-ca = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.step-cli;
-      binName = "janus-cert";
-      args = [
-        "ca" "certificate"
-        "--ca-url=${ca-url}"
-      ];
-    };
-  };
 }

modules/hosts/john-pc/default.nix

@@ -32,6 +32,8 @@ in
       restic
       docker
       desktop
+      # sshCerts
+      # myStepClient
     ];
     # TODO: make this more restrictive, rather than allowing all unfree packages
     nixpkgs.config.allowUnfree = true;
@@ -44,10 +46,11 @@ in
     home.packages = with pkgs; [
       nixos-rebuild
       test-push
-      selfPkgs.neovim-min
-      # ${selfPkgs}.my-neovim
-      # selfPkgs.richPrinter
-      selfPkgs.janus-ca
+      selfPkgs.jsl-zsh
+      selfPkgs.my-neovim
+      selfPkgs.step-client
+      # selfPkgs.wg-platform
+      # self'.packages.myWrappedPackage
     ];
 
     shell.program = "zsh";

modules/programs/zsh.nix

@@ -11,6 +11,7 @@ let
     bindkey "^[[8~" end-of-line
     bindkey "^[OH" beginning-of-line
     bindkey "^[OF" end-of-line
+    bindkey "^[[3~" delete-char
 
     # Normalize common Ctrl+Arrow sequences for word-wise movement.
     bindkey "^[[1;5D" backward-word
@@ -125,9 +126,7 @@ in
         extraRC = ''
           ${homeEndKeyBindings}
 
-          eval "$(direnv hook zsh)"
-
-          HISTFILE=$HOME/.zsh_history
+          HISTFILE=$HOME/.config/zsh/.zsh_history
           HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" ignorePatterns})"}
 
           HOSTNAME=$(hostname -s)