From 4e912a08139e818024cded4c53bb1657f309e54d Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Wed, 1 Oct 2025 11:29:29 -0500
Subject: [PATCH 1/6] config (ghostty): Use cmd on Mac and ctrl on Linux

---
 programs/ghostty.nix | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/programs/ghostty.nix b/programs/ghostty.nix
index ea54cde..bd91415 100644
--- a/programs/ghostty.nix
+++ b/programs/ghostty.nix
@@ -1,17 +1,19 @@
-{ ... }: {
-  programs.ghostty = {
-    enable = true;
-    package = null;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    settings = {
-      quick-terminal-position = "top";
-      quick-terminal-screen = "main";
-      quick-terminal-autohide = true;
-      quick-terminal-size = "50%,50%";
-      keybind = "global:cmd+backquote=toggle_quick_terminal";
-      macos-hidden = "always";
-      linux-cgroup = "always";
+{ pkgs, ... }: {
+  programs.ghostty =
+    let modifierKey = if pkgs.stdenv.isDarwin then "cmd" else "ctrl";
+    in {
+      enable = true;
+      package = null;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+      settings = {
+        quick-terminal-position = "top";
+        quick-terminal-screen = "main";
+        quick-terminal-autohide = true;
+        quick-terminal-size = "50%,50%";
+        keybind = "global:${modifierKey}+backquote=toggle_quick_terminal";
+        macos-hidden = "always";
+        linux-cgroup = "always";
+      };
     };
-  };
 }

From 137a250f75d5e566bad9167342b9601b33382863 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 4 Oct 2025 22:20:33 -0500
Subject: [PATCH 2/6] config (zed): Replace deprecated theme

The MacOS Classic theme merged the two styles into one. Rename the theme
to accomodate.
---
 programs/zed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/zed.nix b/programs/zed.nix
index 4ebd7c5..37e3886 100644
--- a/programs/zed.nix
+++ b/programs/zed.nix
@@ -61,7 +61,7 @@
         font_family = "MesloLGS NF";
         font_size = 10;
       };
-      theme = "macOS Classic Dark2";
+      theme = "macOS Classic Dark";
       ui_font_size = 16;
       wrap_guides = [ 80 92 120 ];
     };

From 4c83491556e4347d8cdd3f9da188b59fc175a92d Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 4 Oct 2025 22:28:30 -0500
Subject: [PATCH 3/6] config (Zed): install and use alternate icon theme

---
 programs/zed.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/programs/zed.nix b/programs/zed.nix
index 37e3886..2a3c9c5 100644
--- a/programs/zed.nix
+++ b/programs/zed.nix
@@ -3,6 +3,7 @@
     enable = true;
     extensions = [
       "basher"
+      "clean-vscode-icons"
       "clojure"
       "dockerfile"
       "earthfile"
@@ -62,6 +63,7 @@
         font_size = 10;
       };
       theme = "macOS Classic Dark";
+      icon_theme = "Clean VSCode Icon Theme";
       ui_font_size = 16;
       wrap_guides = [ 80 92 120 ];
     };

From 283a51f6dede8fe6ce428bd9f0c2c9db81341639 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Wed, 8 Oct 2025 07:47:27 -0500
Subject: [PATCH 4/6] cleanup (home-manager): alphabetize shell aliases

---
 homes/common.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/homes/common.nix b/homes/common.nix
index a94198c..0c34808 100644
--- a/homes/common.nix
+++ b/homes/common.nix
@@ -63,25 +63,25 @@ in {
       JULIA_PKG_USE_CLI_GIT = "true";
     };
     shellAliases = {
+      anc =
+        "ansible-playbook -vvv -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password --check ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
+      anp =
+        "ansible-playbook -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
       cat = "bat";
-      please = "sudo $(fc -ln -1)";
-      grim = "git rebase -i --autosquash $(git_main_branch)";
-      grid = "git rebase -i --autosquash $(git_develop_branch)";
       gpub =
         "git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
+      grid = "git rebase -i --autosquash $(git_develop_branch)";
+      grim = "git rebase -i --autosquash $(git_main_branch)";
+      hmb =
+        "home-manager build --flake ~/.config/home-manager#$USER@$(hostname -s)";
+      hms =
+        "home-manager switch --flake ~/.config/home-manager#$USER@$(hostname -s)";
+      please = "sudo $(fc -ln -1)";
       # tsec - TailScale Exit node Connect
       tsec =
         "tailscale set --exit-node=$(tailscale exit-node suggest | awk '{print $4}' | head -n1)";
       # tsed - TailScale Exit node Disconnect
       tsed = "tailscale set --exit-node=";
-      hms =
-        "home-manager switch --flake ~/.config/home-manager#$USER@$(hostname -s)";
-      hmb =
-        "home-manager build --flake ~/.config/home-manager#$USER@$(hostname -s)";
-      anp =
-        "ansible-playbook -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
-      anc =
-        "ansible-playbook -vvv -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password --check ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
     };
     sessionPath = [ "$HOME/.local/bin" ];
     activation = {

From d31cf3787cdcec94d1d69e587b83355507fe7a9c Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Wed, 8 Oct 2025 07:51:21 -0500
Subject: [PATCH 5/6] config (home-manager shell): add alias to always use
 pdfgrep cache

---
 homes/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homes/common.nix b/homes/common.nix
index 0c34808..2fadee3 100644
--- a/homes/common.nix
+++ b/homes/common.nix
@@ -76,6 +76,7 @@ in {
         "home-manager build --flake ~/.config/home-manager#$USER@$(hostname -s)";
       hms =
         "home-manager switch --flake ~/.config/home-manager#$USER@$(hostname -s)";
+      pdfgrep = "pdfgrep --cache";
       please = "sudo $(fc -ln -1)";
       # tsec - TailScale Exit node Connect
       tsec =

From 79f65ca694dc8ff9e4de6fb48578091bc5c0f48c Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Wed, 8 Oct 2025 07:52:31 -0500
Subject: [PATCH 6/6] config (home-manager shell): remove redundant cat alias

The `cat` alias is already managed by `programs.bat`, so remove the
manual alias.
---
 homes/common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/homes/common.nix b/homes/common.nix
index 2fadee3..b68983f 100644
--- a/homes/common.nix
+++ b/homes/common.nix
@@ -67,7 +67,6 @@ in {
         "ansible-playbook -vvv -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password --check ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
       anp =
         "ansible-playbook -i ~/.config/home-manager/inventory.yaml -e @~/.config/home-manager/secrets_$(hostname -s).enc -e @~/.config/home-manager/secrets_file.enc --vault-password-file $HM_AGENIX_SECRETS_DIR/ansible-vault-password ~/.config/home-manager/playbook.yaml --limit $(hostname -s) --ask-become-pass";
-      cat = "bat";
       gpub =
         "git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
       grid = "git rebase -i --autosquash $(git_develop_branch)";