feat: add devshell aliases and vars

arichtman · Nov 16, 2024 · 2c7dbfc · 2c7dbfc
1 parent 5b7d334
commit 2c7dbfc
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 32 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1,2 @@
 use flake .
+watch_file shells/myshell/*
diff --git a/modules/home/default-home/default.nix b/modules/home/default-home/default.nix
@@ -25,6 +25,8 @@
       ls = "exa";
       ll = "exa -las new";
       cls = "clear";
+      dea = "direnv allow";
+      der = "diren reload";
       vi = "hx";
       vim = "hx";
       nano = "hx";
@@ -39,8 +41,13 @@
       gb = "git branch";
       gd = "git diff";
       gf = "git fetch";
+      grc = "git rebase --continue";
+      gra = "git rebase --abort";
       grpo = "git remote prune origin";
       gau = "git add --update";
+      gCnv = "git commit --no-verify";
+      gCam = "git commit --amend";
+      gCC = "git commit --amend --no-verify";
       gbl = "git blame -wCCC";
       nfu = "nix flake update --commit-lock-file";
       sci = "step certificate inspect";

diff --git a/shells/myshell/default.nix b/shells/myshell/default.nix
@@ -2,36 +2,50 @@
   pkgs,
   mkShell,
   ...
-}:
-mkShell {
-  meta.platforms = ["aarch64-darwin" "x86_64-linux" "x86_64-darwin"];
-  packages = with pkgs; [
-    # Minimal development stuff
-    git
-    ripgrep
-    jq
-    yq
-    helix
-    pre-commit
-    deploy-rs
-    statix
-    deadnix
-    # Kubernetes stuff
-    kubectl
-    kubectx
-    kubernetes-helm
-    # Cilium
-    cilium-cli
-    hubble
-    # Certificates and secrets
-    xkcdpass
-    step-cli
-    openssl
-    # Flake tooling
-    snowfallorg.thaw
+}: let
+  # Ref: https://github.com/direnv/direnv/issues/73#issuecomment-2478178424
+  mkScript = name: text: pkgs.writeShellScriptBin name text;
+  scripts = [
+    (mkScript "k" ''kubectl "$@"'')
   ];
-  shellHook = ''
-    pre-commit install --install-hooks
-    echo "Entering the nix  Z O N E"
-  '';
-}
+  devEnvVars = {
+    myvar = "myval";
+  };
+in
+  mkShell (
+    devEnvVars
+    // {
+      meta.platforms = ["aarch64-darwin" "x86_64-linux" "x86_64-darwin"];
+      packages = with pkgs;
+        [
+          # Minimal development stuff
+          git
+          ripgrep
+          jq
+          yq
+          helix
+          pre-commit
+          deploy-rs
+          statix
+          deadnix
+          # Kubernetes stuff
+          kubectl
+          kubectx
+          kubernetes-helm
+          # Cilium
+          cilium-cli
+          hubble
+          # Certificates and secrets
+          xkcdpass
+          step-cli
+          openssl
+          # Flake tooling
+          snowfallorg.thaw
+        ]
+        ++ scripts;
+      shellHook = ''
+        pre-commit install --install-hooks
+        echo "Entering the nix  Z O N E"
+      '';
+    }
+  )