From ba2a175788f01fe217d27cada00d1cad64e3408c Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Fri, 29 Aug 2025 13:19:24 -0600
Subject: [PATCH] Updates and tweaks

---
 README.md     |  1 +
 home-cli.nix  | 26 +++++++++++++++++---------
 home-gui.nix  | 13 ++++++-------
 home-nvim.nix |  1 +
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 0b9f15c..e4f1375 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,4 @@ I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.co
 - **home-mail**: email, contacts & calendar
 - **home-mac**: Mac-only
 - **home-linux**: Linux-only
+- **home-nvim**: NixVim
diff --git a/home-cli.nix b/home-cli.nix
index a536c3e..b763000 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -18,7 +18,7 @@ in
 
   imports = [
     <catppuccin/modules/home-manager>
-    nixvim.homeManagerModules.nixvim
+    nixvim.homeModules.nixvim
     ./home-nvim.nix
   ];
 
@@ -33,9 +33,10 @@ in
     bitwarden-cli
     awscli2
     claude-code
-    aider-chat
-    pandoc
+    opencode
     fd
+    poppler-utils
+    xan # e.g. xan slice 3,2 file.csv | xan behead | xan view -An
     ngrok
     ddev
     mkcert
@@ -44,8 +45,12 @@ in
     nodejs
     typescript
     pnpm
+    rustc
+    cargo
     uv
     blade-formatter
+    nil
+    nixd
     nodePackages.typescript-language-server
     nodePackages.stylelint
     nodePackages.js-beautify
@@ -65,6 +70,8 @@ in
     EDITOR = "vim";
     BROWSER = "open";
     inherit (secrets.openai) OPENAI_API_KEY;
+    inherit (secrets.gemini) GEMINI_API_KEY;
+    inherit (secrets.gemini) GOOGLE_CLOUD_PROJECT;
   };
 
   home.sessionPath = [
@@ -79,7 +86,7 @@ in
   catppuccin = {
     enable = true;
     flavor = "mocha";
-    zed.flavor = "latte"; # TODO waiting for auto
+    zed.enable = false;
   };
 
   programs.home-manager.enable = true;
@@ -95,7 +102,7 @@ in
     terminal = "tmux-256color";
     plugins = with pkgs.tmuxPlugins; [
       sensible
-      # resurrect # prefix ctrl-s to save sessions; prefix ctrl-r to restore
+      resurrect # prefix ctrl-s to save sessions; prefix ctrl-r to restore
       continuum # automatically save the session every 15 minutes
       sessionist # prefix g to switch sessions; prefix C to create; prefix X to kill; prefix S to switch back; prefix @ to promote; prefix t f to join marked pane
       pain-control # prefix |, -, \, _ to split; prefix h, j, k, l to switch; prefix H, J, K, L to resize; prefix <, > to move windows
@@ -103,7 +110,7 @@ in
       yank # prefix y -> copy command line to clipboard; prefix Y -> copy pwd to clipboard; search + y -> copy to clipboard
       # open # highlight: o -> open; ctrl-o -> $EDITOR; S -> web search
       vim-tmux-navigator # ctrl-h, -j, -k, -l -> move between tmux and vim splits
-      extrakto # prefix tab -> fuzzy find text on screen; enter to copy; tab to paste
+      # extrakto # prefix tab -> fuzzy find text on screen; enter to copy; tab to paste
       fingers # prefix F -> copy/open/edit items on screen by letter
     ];
     # Remove that SHELL thing when fixed upstream
@@ -143,10 +150,12 @@ in
 
   programs.direnv.enable = true;
   programs.starship.enable = true;
-  programs.television.enable = true;
+  # programs.television.enable = true; # WAIT config currently broken
+  programs.fzf.enable = true; # used by other apps, tmux, etc.
   programs.zoxide.enable = true;
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
+  programs.yazi.enable = true;
 
   programs.eza = {
     enable = true;
@@ -160,6 +169,7 @@ in
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false; # TODO: remove when defaults change
     matchBlocks = {
       dustinswan = {
         inherit (secrets.dustinswan) user;
@@ -223,8 +233,6 @@ in
 
   programs.keychain = {
     enable = true;
-    inheritType = "any";
-    agents = [ "gpg" "ssh" ];
     keys = [ "id_rsa" "id_rsa_mr" "2B3A6377" ];
   };
 }
diff --git a/home-gui.nix b/home-gui.nix
index 240679f..47678e3 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-# TODO: Ghostty not building on my mac at the moment
+# Ghostty not building on my mac at the moment
 let
   ghostty-mock = pkgs.writeShellScriptBin "gostty-mock" ''
     true
@@ -11,7 +11,7 @@ in {
   programs.halloy = {
     enable = true;
     settings = {
-      theme = "catppuccin-mocha";
+      # theme = "catppuccin-mocha";
 
       servers.liberachat = {
         nickname = "sw4n";
@@ -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;
@@ -41,7 +41,6 @@ in {
       macos-titlebar-style = "tabs";
       macos-option-as-alt = "left";
       copy-on-select = "clipboard";
-      # keybind = "global:cmd+grave_accent=toggle_quick_terminal";
     };
   };
 
@@ -51,8 +50,8 @@ in {
       vim_mode = true;
       theme = {
         mode = "system";
-        # light = "Catppuccin Latte";
-        # dark = "Catppuccin Frappé";
+        light = "Catppuccin Latte";
+        dark = "Catppuccin Frappé";
       };
       buffer_font_size = 16;
       buffer_font_family = "Iosevka Nerd Font Mono";
diff --git a/home-nvim.nix b/home-nvim.nix
index 74296ed..ad4929c 100644
--- a/home-nvim.nix
+++ b/home-nvim.nix
@@ -57,6 +57,7 @@
       cmp-buffer.enable = true;
       cmp-path.enable = true;
       commentary.enable = true;
+      csvview.enable = true;
       # conform-nvim.enable = true;
       dashboard.enable = true;
       emmet.enable = true;