From e671275e260722b0a678b1f94b3c940c30253a53 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br.barrettruth@gmail.com>
Date: Fri, 13 Feb 2026 13:19:26 -0500
Subject: [PATCH] misc tweaks

---
 config/hypr/hyprland.conf         |  2 ++
 config/nvim/lua/plugins/git.lua   |  4 ++--
 config/nvim/lua/plugins/guard.lua |  2 +-
 config/tmux/tmux.conf             |  4 ++--
 home/modules/git.nix              |  1 +
 home/modules/packages.nix         | 13 ++++++++-----
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 1926f0e..2548052 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -100,6 +100,7 @@ bind = ALT, U, layoutmsg, swapprev
 bind = ALT CTRL, Z, exec, hypr pull $BROWSER
 bind = ALT CTRL, T, exec, hypr pull $TERMINAL
 bind = ALT CTRL, V, exec, hypr pull vesktop
+bind = ALT CTRL, S, exec, hypr pull signal-desktop
 bind = ALT CTRL, Y, exec, hypr pull sioyek
 
 bind = ALT SHIFT, T, exec, hypr spawnfocus --ws 1 $TERMINAL
@@ -108,6 +109,7 @@ bind = ALT SHIFT, F, togglefloating
 bind = ALT SHIFT, Q, exec, hypr exit
 bind = ALT SHIFT, R, exec, hyprctl reload && notify-send -u low 'hyprland reloaded'
 bind = ALT SHIFT, V, exec, hypr spawnfocus --ws 5 vesktop
+bind = ALT SHIFT, S, exec, hypr spawnfocus --ws 6 signal-desktop
 bind = ALT SHIFT, Y, exec, hypr spawnfocus --ws 3 sioyek
 
 bind = , XF86Tools, submap, scripts
diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua
index 4fae54c..8713bdb 100644
--- a/config/nvim/lua/plugins/git.lua
+++ b/config/nvim/lua/plugins/git.lua
@@ -5,11 +5,11 @@ return {
     },
     {
         dir = '~/dev/diffs.nvim',
-        'barrettruth/diffs.nvim',
         enabled = true,
         init = function()
             vim.g.diffs = {
-                debug = true,
+                -- debug = '/tmp/diffs.log',
+                filetypes = { 'fugitive', 'git', 'gitcommit', 'diff' },
                 hide_prefix = true,
                 highlights = {
                     vim = {
diff --git a/config/nvim/lua/plugins/guard.lua b/config/nvim/lua/plugins/guard.lua
index 78a6c53..301fdba 100644
--- a/config/nvim/lua/plugins/guard.lua
+++ b/config/nvim/lua/plugins/guard.lua
@@ -1,7 +1,7 @@
 return {
     'nvimdev/guard.nvim',
     dependencies = {
-        { 'nvimdev/guard-collection' },
+        { dir = '~/dev/guard-collection', 'nvimdev/guard-collection' },
     },
     init = function()
         vim.g.guard_config = {
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 750b797..4ce871a 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -50,8 +50,8 @@ unbind \'; bind \' splitw -hc '#{pane_current_path}'
 unbind \-; bind \- splitw -vc '#{pane_current_path}'
 
 unbind y; bind y if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode'
-unbind /; bind / if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode ; send -X search-forward'
-unbind ?; bind ? if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode ; send -X search-backward'
+unbind /; bind / if -F '#{pane_in_mode}' { send -X cancel } { copy-mode ; command-prompt -p '/' { send -X search-forward -- '%%' } }
+unbind ?; bind ? if -F '#{pane_in_mode}' { send -X cancel } { copy-mode ; command-prompt -p '?' { send -X search-backward -- '%%' } }
 
 bind -T copy-mode-vi v send -X begin-selection
 bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'test -n "$WAYLAND_DISPLAY" && wl-copy || xclip -in -sel c'
diff --git a/home/modules/git.nix b/home/modules/git.nix
index 38a0b8a..523fef1 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -77,6 +77,7 @@
         sm = "submodule";
         st = "stash";
         sw = "switch";
+        t = "tag";
         wt = "worktree";
       };
       init.defaultBranch = "main";
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 7e4c96e..32fe462 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -13,8 +13,9 @@ let
   neovim = config.programs.neovim.enable;
   zen = true;
   sioyek = true;
-  vesktop = true;
+  # vesktop = true;
   claude = true;
+  # signal = true;
 
   sioyek-wrapped = pkgs.symlinkJoin {
     name = "sioyek";
@@ -41,11 +42,13 @@ in
       bitwarden-desktop
       gemini-cli
       typst
+      libreoffice-fresh
     ]
     ++ lib.optionals zen [ zen-browser.packages.${hostPlatform}.default ]
     ++ lib.optionals sioyek [ sioyek-wrapped ]
-    ++ lib.optionals vesktop [ pkgs.vesktop ]
+    # ++ lib.optionals vesktop [ pkgs.vesktop ]
     ++ lib.optionals claude [ pkgs.claude-code ];
+    ++ lib.optionals signal [ pkgs.signal-desktop ]
 
   xdg.configFile."claude/settings.json" = lib.mkIf claude {
     text = builtins.toJSON {
@@ -151,9 +154,9 @@ in
         "application/pdf" = "sioyek.desktop";
         "application/epub+zip" = "sioyek.desktop";
       })
-      (lib.mkIf vesktop {
-        "x-scheme-handler/discord" = "vesktop.desktop";
-      })
+      # (lib.mkIf vesktop {
+      #   "x-scheme-handler/discord" = "vesktop.desktop";
+      # })
     ];
   };
 }