3 files changed, 25 insertions, 1 deletions

diff --git a/programs/bash.nix b/programs/bash.nix
index f6f8de9..e2b825a 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -87,7 +87,7 @@
           git worktree list | \
           fzf --min-height=15 \
             --preview-window=up,10 \
-            --preview='git log --color=always -n10 --oneline {2}' \
+            --preview='git log --color=always -n10 --decorate --oneline {2}' \
             --cycle -1 \
             -q "$query" | \
           awk '{print $1}'
diff --git a/programs/git.nix b/programs/git.nix
index bc312de..e4b5e0f 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -39,11 +39,34 @@ with theme;
         };
       };
     };
+    # difftastic = {
+    #   enable = true;
+    #   background = "dark";
+    #   display = "inline";
+    # };
+    aliases = {
+      co = "checkout";
+      rb = "rebase";
+    };
     extraConfig = {
       commit.verbose = true;
       core = {
         hooksPath = "/home/np/.hooks";
       };
+      column = {
+        ui = "auto dense";
+        status = "never";
+      };
+      branch.sort = "-committerdate";
+      worktree.guessRemote = true;
+      rebase = {
+        abbreviateCommands = true;
+        stat = true;
+      };
+      rerere = {
+        enabled = true;
+        autoUpdate = true;
+      };
     };
   };
 }
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 0430868..08a1ada 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -14,6 +14,7 @@
     extraPackages = with pkgs; [
       # gcc
       python311Packages.yapf
+      nodePackages.bash-language-server
       # hlint
       # ocamlformat
     ];