From 087ef9044ec9f648992ab261329d2ad3ff4ebae3 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Sat, 3 Jan 2026 19:10:19 -0700
Subject: [PATCH] Updating. lots of stuff. and gpg git signing key

---
 home-cli.nix  | 50 ++++++++++++++++++++++++++++++++------------------
 home-gui.nix  |  4 ++--
 home-mac.nix  |  2 ++
 home-mail.nix | 34 +++++-----------------------------
 4 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/home-cli.nix b/home-cli.nix
index b763000..d2dc77d 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -8,7 +8,6 @@ in
   home.stateVersion = "24.11";
 
   home.username = "dustinswan";
-  home.homeDirectory = "/Users/dustinswan";
   home.shell.enableShellIntegration = true;
 
   nix = {
@@ -22,24 +21,29 @@ in
     ./home-nvim.nix
   ];
 
-  # Remove when bitwarden-cli is fixed upstream
-  # https://github.com/NixOS/nixpkgs/issues/339576#issuecomment-2574076670
-  nixpkgs.overlays = [
-    (final: prev: { bitwarden-cli = prev.bitwarden-cli.overrideAttrs (oldAttrs: { nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ prev.llvmPackages_18.stdenv.cc ]; stdenv = prev.llvmPackages_18.stdenv; }); })
-  ];
-
   home.packages = with pkgs; [
     supabase-cli
     bitwarden-cli
     awscli2
     claude-code
-    opencode
+    opencode # see also: aider; toad;
     fd
-    poppler-utils
-    xan # e.g. xan slice 3,2 file.csv | xan behead | xan view -An
-    ngrok
+    poppler-utils # pdftotext
+    xan # e.g. xan slice 3,2 file.csv | xan behead | xan view -An; see also: csvi
+    doxx # read docx files
+    sqlit-tui # see also: harlequin; lazysql; gobang; dblab
+    # snitch # see also: bandwhich
+    epy # ebook reader. see also: erp; bookokrat; lue
+    # mimic # tts engine, used by epy
+    posting # see also: httpie, yapi, sled, Yaak (GUI), Bruno (GUI)
+    croc magic-wormhole # transfer files
+    # calcure # calendar cli app, can point to ics files or URL
+    dust duf dua # disk usage
+    doggo # dig
     ddev
+    ngrok
     mkcert
+    ffmpeg
     gnupg
     cacert
     nodejs
@@ -49,12 +53,12 @@ in
     cargo
     uv
     blade-formatter
-    nil
-    nixd
+    nixd # Nix language server
     nodePackages.typescript-language-server
     nodePackages.stylelint
     nodePackages.js-beautify
     nodePackages.intelephense
+    dict
     ispell
     aspell
     aspellDicts.en
@@ -148,13 +152,16 @@ in
     '';
   };
 
+  programs.nix-your-shell.enable = true;
   programs.direnv.enable = true;
   programs.starship.enable = true;
   # programs.television.enable = true; # WAIT config currently broken
+  # programs.nix-search-tv.enable = true;
   programs.fzf.enable = true; # used by other apps, tmux, etc.
   programs.zoxide.enable = true;
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
+  programs.ripgrep-all.enable = true;
   programs.yazi.enable = true;
 
   programs.eza = {
@@ -167,6 +174,8 @@ in
     settings.updates.auto_update = true;
   };
 
+  # programs.intelli-shell.enable = true;
+
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false; # TODO: remove when defaults change
@@ -215,17 +224,22 @@ in
 
   programs.git = {
     enable = true;
-    userName = "Dustin Swan";
-    userEmail = "dustin@dustinswan.com";
     signing = {
       signByDefault = true;
-      key = "AD11750151C10881970BD943AB49BD6B2B3A6377";
+      key = "30D46587E2100467";
     };
-    delta.enable = true;
-    extraConfig = {
+    settings = {
       push.autoSetupRemote = true;
+      user.email = "dustin@dustinswan.com";
+      user.name = "Dustin Swan";
     };
   };
+  programs.gh.enable = true;
+
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
 
   programs.gitui.enable = true;
 
diff --git a/home-gui.nix b/home-gui.nix
index 47678e3..aa09408 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -31,8 +31,8 @@ in {
       font-family = "Iosevka NFM";
       font-size = 16;
       font-thicken = true;
-      theme = "dark:catppuccin-mocha,light:catppuccin-latte"; # TODO: waiting on all cli apps to handle auto switching too
-      # theme = "catppuccin-mocha";
+      # theme = "dark:catppuccin-mocha,light:catppuccin-latte"; # TODO: waiting on all cli apps to handle auto switching too
+      theme = "catppuccin-mocha";
       background-opacity = 0.95;
       background-blur-radius = 15;
       window-padding-x = 12;
diff --git a/home-mac.nix b/home-mac.nix
index f11c445..14afd47 100644
--- a/home-mac.nix
+++ b/home-mac.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }:
 
 {
+  home.homeDirectory = "/Users/dustinswan";
+
   home.packages = with pkgs; [
     pinentry_mac
     terminal-notifier
diff --git a/home-mail.nix b/home-mail.nix
index 768e478..24ce671 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -5,6 +5,10 @@
   programs.msmtp.enable = true;
   programs.himalaya.enable = true;
   programs.vdirsyncer.enable = true;
+  programs.aerc = {
+    enable = true;
+    extraConfig.general.unsafe-accounts-conf = true;
+  };
 
   accounts.email = {
     maildirBasePath = "Mail";
@@ -35,6 +39,7 @@
           expunge = "maildir";
         };
         msmtp.enable = true;
+        aerc.enable = true;
         himalaya = {
           enable = true;
           settings = {
@@ -50,35 +55,6 @@
           showSignature = "append";
         };
       };
-
-      MajorRocket = {
-        flavor = "gmail.com";
-        address = "dustin@majorrocket.com";
-        realName = "Dustin Swan";
-        primary = false;
-        folders = {
-          inbox = "Inbox";
-          drafts = "[Gmail]/Drafts";
-          sent = "[Gmail]/Sent Mail";
-          trash = "[Gmail]/Trash";
-        };
-        userName = "dustin@majorrocket.com";
-        passwordCommand = "gpg -dq ${builtins.getEnv "HOME"}/.dustin@majorrocket.com-password.gpg";
-        mbsync = {
-          enable = true;
-          create = "maildir";
-          expunge = "maildir";
-        };
-        msmtp.enable = true;
-        aerc.enable = true;
-        # himalaya = {
-        #   enable = true;
-        # };
-        signature = {
-          text = ''Dustin Swan | Major Rocket'';
-          showSignature = "append";
-        };
-      };
     };
   };