From 09eeb75f472e2df43be76c0cc5c7df20ea107993 Mon Sep 17 00:00:00 2001
From: "RingOfStorms (Joshua Bell)" <ringofstorms@gmail.com>
Date: Wed, 3 Sep 2025 00:24:47 -0500
Subject: [PATCH] try to fix tmux key issues

---
 common/_home_manager/mods/git.nix              | 4 +++-
 common/_home_manager/mods/tmux/tmux-reset.conf | 5 ++---
 common/_home_manager/mods/tmux/tmux.nix        | 2 +-
 common/_home_manager/mods/zsh.nix              | 3 ++-
 hosts/lio/flake.lock                           | 3 ---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/_home_manager/mods/git.nix b/common/_home_manager/mods/git.nix
index d98abc3..c36e784 100644
--- a/common/_home_manager/mods/git.nix
+++ b/common/_home_manager/mods/git.nix
@@ -13,6 +13,8 @@
       pull.rebase = false;
 
       init.defaultBranch = "main";
+
+      rerere.enabled = true;
     };
 
     difftastic = {
@@ -52,7 +54,7 @@
       ".apdisk"
 
       # direnv things
-      "/.direnv"
+      ".direnv"
 
       # local only files
       "*.local"
diff --git a/common/_home_manager/mods/tmux/tmux-reset.conf b/common/_home_manager/mods/tmux/tmux-reset.conf
index ff03836..fd5dd3d 100644
--- a/common/_home_manager/mods/tmux/tmux-reset.conf
+++ b/common/_home_manager/mods/tmux/tmux-reset.conf
@@ -54,9 +54,8 @@ bind C-d detach
 
 # ==========
 # My options
-set -g default-terminal "xterm-256color"
-set-option -g terminal-overrides ',xterm-256color:RGB'
-set-option -sa terminal-features ',xterm:LRGB'
+set -g default-terminal "tmux-256color"
+set-option -g terminal-overrides ',tmux-256color:RGB'
 set -g detach-on-destroy off
 set -g renumber-windows on
 set -g status-position top
diff --git a/common/_home_manager/mods/tmux/tmux.nix b/common/_home_manager/mods/tmux/tmux.nix
index 62890a9..7e3038b 100644
--- a/common/_home_manager/mods/tmux/tmux.nix
+++ b/common/_home_manager/mods/tmux/tmux.nix
@@ -16,7 +16,7 @@
     mouse = true;
     keyMode = "vi";
     shell = "${pkgs.zsh}/bin/zsh";
-    terminal = "screen-256color";
+    terminal = "tmux-256color";
     aggressiveResize = true;
     sensibleOnTop = false;
 
diff --git a/common/_home_manager/mods/zsh.nix b/common/_home_manager/mods/zsh.nix
index 41a32a9..052dc19 100644
--- a/common/_home_manager/mods/zsh.nix
+++ b/common/_home_manager/mods/zsh.nix
@@ -16,6 +16,8 @@
       # Enable editing command in external editor
       autoload -Uz edit-command-line
       zle -N edit-command-line
+      # fix delete key
+      bindkey "^[[3~" delete-char
       # Try multiple bindings for edit-command-line
       bindkey '^X^E' edit-command-line    # Traditional Ctrl+X,Ctrl+E binding
       bindkey '^[^M' edit-command-line    # Alt+Enter
@@ -38,4 +40,3 @@
     '';
   };
 }
-
diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock
index c264cea..c8870ef 100644
--- a/hosts/lio/flake.lock
+++ b/hosts/lio/flake.lock
@@ -67,9 +67,6 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs-unstable": [
-          "nixpkgs-unstable"
-        ],
         "ragenix": "ragenix"
       },
       "locked": {