a few more additions

home/common/programs/default.nix

@@ -8,6 +8,7 @@
   imports = [
     ../features/mutable-file.nix
     ./zsh.nix
+    ./nix.nix
     ./neovim
     ./rust.nix
     ./elixir.nix

home/common/programs/dev.nix

@@ -52,5 +52,10 @@
 
     kicad
     tea
+
+    just # project command runner
+    lazydocker # docker TUI
+    dust # du replacement
+    duf # df replacement
   ];
 }

home/common/programs/git/default.nix

@@ -31,6 +31,9 @@
         rb = "rebase";
         rbc = "rebase --continue";
         w = "commit -am 'wip'";
+        # Structural (AST-aware) diff on demand; `git d`/`diff` stays delta.
+        # Accepts args, e.g. `git dft HEAD~3`.
+        dft = "!GIT_EXTERNAL_DIFF=difft git diff";
       };
       init = {
         defaultBranch = "main";
@@ -70,6 +73,7 @@
 
   home.packages = with pkgs; [
     delta
+    difftastic
     git-crypt
     mediainfo
     tea

home/common/programs/nix.nix

@@ -0,0 +1,18 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    # Prebuilt, weekly-updated nix-index database (backs `comma`).
+    inputs.nix-index-database.homeModules.nix-index
+  ];
+
+  # `comma` (`,`) — run any nixpkgs program once without installing it.
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+
+  home.packages = with pkgs; [
+    nvd # version diff between generations (used by nh)
+    nix-output-monitor # readable build output (nom; used by nh)
+    statix # nix linter / antipattern finder
+    deadnix # finds unused nix bindings
+  ];
+}

home/common/programs/zsh.nix

@@ -22,6 +22,8 @@
       ls = "eza";
       cat = "bat";
       ps = "procs";
+      j = "just";
+      lzd = "lazydocker";
       open = "xdg-open";
       o = "xdg-open";
       s = "ssh";
@@ -76,6 +78,25 @@
     enableZshIntegration = true;
   };
 
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+    # Replace `cd` with zoxide: `cd` = smart jump, `cdi` = interactive picker.
+    options = [ "--cmd cd" ];
+  };
+
+  programs.atuin = {
+    enable = true;
+    enableZshIntegration = true;
+    # Local-only history (no account/sync). Atuin owns Ctrl-R; leave the
+    # up-arrow as normal zsh prefix history.
+    flags = [ "--disable-up-arrow" ];
+    settings = {
+      auto_sync = false;
+      update_check = false;
+    };
+  };
+
   programs.starship = {
     enable = true;
     settings = {