From d1b9f3defee162c810d8bc5881270cff18860c71 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak.erling@gmail.com>
Date: Fri, 17 Nov 2023 14:38:32 -0800
Subject: [PATCH] Staship for shell consistency; move git aliases into git
 program

---
 nix/home/commandline.nix          | 43 +++++++++++++++++++++++++++++++
 nix/home/programs/git/default.nix | 18 +++++++++++++
 nix/home/programs/zsh/default.nix |  2 --
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/nix/home/commandline.nix b/nix/home/commandline.nix
index 7b47ab2..b005991 100644
--- a/nix/home/commandline.nix
+++ b/nix/home/commandline.nix
@@ -14,4 +14,47 @@ in
   home.packages = defaultPkgs;
 
   xdg.enable = true;
+
+  # Auto-completion helper
+  programs.carapace = {
+    enable = true;
+    enableNushellIntegration = true;
+  };
+
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = true;
+      character = {
+        success_symbol = "[➜](bold green)";
+        error_symbol = "[➜](bold red)";
+      };
+
+      directory = {
+        truncation_length = 100;
+        truncate_to_repo = false;
+      };
+
+      battery = {
+        disabled = true;
+        full_symbol = "• ";
+        charging_symbol = "⇡ ";
+        discharging_symbol = "⇣ ";
+        unknown_symbol = "❓ ";
+        empty_symbol = "❗ ";
+      };
+
+      erlang = {
+        symbol = "ⓔ ";
+      };
+
+      nodejs = {
+        symbol = "[⬢](bold green) ";
+      };
+
+      pulumi = {
+        symbol = "🧊 ";
+      };
+    };
+  };
 }
diff --git a/nix/home/programs/git/default.nix b/nix/home/programs/git/default.nix
index 14b543e..c8220bd 100644
--- a/nix/home/programs/git/default.nix
+++ b/nix/home/programs/git/default.nix
@@ -32,4 +32,22 @@ in
       ".DS_Store"
     ];
   };
+
+  programs.nushell.shellAliases = {
+    gst = "git status";
+    gco = "git checkout";
+    gf = "git fetch";
+    gl = "git pull";
+  };
+  programs.nushell.extraConfig = ''
+    def glog [] { ^git log --pretty=%h»¦«%s»¦«%aN»¦«%aE»¦«%aD -n 25 | lines | split column "»¦«" commit subject name email date | upsert date {|d| $d.date | into datetime} | sort-by date | reverse | explore }
+  '';
+
+  programs.zsh.shellAliases = {
+    gst = "git status";
+    glog = "git log --oneline --graph --decorate";
+    gco = "git checkout";
+    gf = "git fetch";
+    gl = "git pull";
+  };
 }
diff --git a/nix/home/programs/zsh/default.nix b/nix/home/programs/zsh/default.nix
index 86ad835..355cde6 100644
--- a/nix/home/programs/zsh/default.nix
+++ b/nix/home/programs/zsh/default.nix
@@ -20,8 +20,6 @@ with builtins; {
       custom = "$HOME/.oh-my-zsh/custom";
       plugins = [
         "vi-mode"
-        "git"
-        "z"
       ];
     };
   };