From c6153739558371399ebd28139c54a6d0713cda57 Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Sun, 10 Aug 2025 23:00:09 -0500
Subject: [PATCH] Add current git revision to i3bar and powerline-go prompt

---
 flake.nix                              | 4 ++--
 home-manager/programs/bash.nix         | 6 +++++-
 home-manager/programs/polybar.nix      | 6 ++++--
 home-manager/programs/powerline-go.nix | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index d50da4f..06ebd05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,13 +115,13 @@
       "lauren_lagarde" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
         modules = self.homeManagerModules."lauren_lagarde";
-        extraSpecialArgs = { inherit inputs pkgs-unstable; };
+        extraSpecialArgs = { inherit self inputs pkgs-unstable; };
       };
 
       "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
         modules = self.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
-        extraSpecialArgs = { inherit inputs pkgs-unstable; };
+        extraSpecialArgs = { inherit self inputs pkgs-unstable; };
       };
     };
 
diff --git a/home-manager/programs/bash.nix b/home-manager/programs/bash.nix
index 89f39ad..19b0c0f 100644
--- a/home-manager/programs/bash.nix
+++ b/home-manager/programs/bash.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{ self, ... }: let 
+  rev = builtins.replaceStrings ["-dirty"] ["*"] (toString (self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"));
+in {
   programs.bash = {
     enable = true;
     shellAliases = {
@@ -6,6 +8,8 @@
     };
     bashrcExtra = ''
       ssh_with_yubikey () { AGENT_SOCKET=$(ssh $@ gpgconf --list-dirs agent-socket) && ssh -A -R "$AGENT_SOCKET:$(gpgconf --list-dirs agent-socket)" -o "StreamLocalBindUnlink=yes" $@; }
+
+      export SYSTEM_GIT_REV=${rev}
     '';
   };
 }
diff --git a/home-manager/programs/polybar.nix b/home-manager/programs/polybar.nix
index 112c4d4..83b1f8a 100644
--- a/home-manager/programs/polybar.nix
+++ b/home-manager/programs/polybar.nix
@@ -1,4 +1,6 @@
-{ pkgs, home-manager, ... }: {
+{ self, pkgs, home-manager, ... }: let
+  rev = builtins.replaceStrings ["-dirty"] ["*"] (toString (self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"));
+in {
   home.packages = with pkgs; [
     # TODO: Why no work?
     #nerdfonts
@@ -217,7 +219,7 @@
 
       "module/hostname" = {
         type = "custom/script";
-        exec = "echo $(uname -n)";
+        exec = "echo $(uname -n)#${rev}";
         interval = 256;
 
         format = "<label>";
diff --git a/home-manager/programs/powerline-go.nix b/home-manager/programs/powerline-go.nix
index 4c1a8f7..4832ee1 100644
--- a/home-manager/programs/powerline-go.nix
+++ b/home-manager/programs/powerline-go.nix
@@ -6,6 +6,7 @@
       "venv"
       "user"
       "host"
+      "shell-var"
       "ssh"
       "cwd"
       "perms"
@@ -24,6 +25,7 @@
       cwd-mode = "plain";
       git-mode = "fancy";
       colorize-hostname = true;
+      shell-var = "SYSTEM_GIT_REV";
     };
   };
 }