From e3e474da6cba297d26081dd8689f0948c2cf066d Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Tue, 6 Oct 2026 12:08:46 -0400
Subject: [PATCH] chore(config): switch editor aliases to nvim and update
 related settings

---
 dot_bashrc                             | 3 +++
 dot_config/fish/conf.d/10-env.fish     | 3 +++
 dot_config/fish/conf.d/20-aliases.fish | 1 +
 dot_config/fish/conf.d/40-tools.fish   | 1 +
 dot_config/hypr/bindings.lua           | 2 +-
 dot_config/mimeapps.list               | 2 +-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dot_bashrc b/dot_bashrc
index 4745761..1843f5f 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -2,6 +2,9 @@
 # ~/.bashrc — managed by chezmoi
 #
 
+alias vim="nvim"
+alias vi="nvim"
+
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
diff --git a/dot_config/fish/conf.d/10-env.fish b/dot_config/fish/conf.d/10-env.fish
index f072a7c..080e920 100644
--- a/dot_config/fish/conf.d/10-env.fish
+++ b/dot_config/fish/conf.d/10-env.fish
@@ -17,6 +17,9 @@ set -gx EGET_BIN $HOME/.local/bin
 set -gx GHQ_ROOT $HOME/Code
 set -gx CODE_ROOT $HOME/Code
 
+set -gx EDITOR nvim
+set -gx VISUAL nvim
+
 # Go env (GOPATH/GOBIN) is pinned in ~/.config/mise/config.toml [env] because
 # mise's fish hook re-applies env each prompt and would clobber a shell-set
 # GOBIN. GOROOT is provided by mise (toolchain under ~/.local/share/mise).
diff --git a/dot_config/fish/conf.d/20-aliases.fish b/dot_config/fish/conf.d/20-aliases.fish
index 46eb578..daff14e 100644
--- a/dot_config/fish/conf.d/20-aliases.fish
+++ b/dot_config/fish/conf.d/20-aliases.fish
@@ -4,6 +4,7 @@
 
 # Editors / file managers
 alias e nvim
+alias vim nvim
 alias e.f 'cd ~/.local/share/chezmoi/dot_config/fish && yazi'
 alias e.h 'cd ~/.local/share/chezmoi/dot_config/hypr && yazi'
 alias e.k 'yazi ~/.local/share/chezmoi/dot_config/kitty'
diff --git a/dot_config/fish/conf.d/40-tools.fish b/dot_config/fish/conf.d/40-tools.fish
index 6e854dd..75f869d 100644
--- a/dot_config/fish/conf.d/40-tools.fish
+++ b/dot_config/fish/conf.d/40-tools.fish
@@ -25,3 +25,4 @@ test -f ~/.hishtory/config.fish; and source ~/.hishtory/config.fish
 # unsloth studio python venv
 test -f ~/.unsloth/studio/unsloth_studio/bin/activate.fish
     and source ~/.unsloth/studio/unsloth_studio/bin/activate.fish
+
diff --git a/dot_config/hypr/bindings.lua b/dot_config/hypr/bindings.lua
index 87bd45c..0384960 100644
--- a/dot_config/hypr/bindings.lua
+++ b/dot_config/hypr/bindings.lua
@@ -139,7 +139,7 @@ o.bind("SUPER + CTRL + K", "Previous workspace", hl.dsp.focus({ workspace = "e-1
 hl.unbind("SUPER + CTRL + S") -- was: share menu
 hl.unbind("SUPER + SHIFT + A") -- was: ChatGPT web app
 
-o.bind("SUPER + CTRL + S", "Toggle scratch workspace", "omarchy-toggle-scratch scratchpad")
+o.bind("SUPER + A", "Toggle scratch workspace", "omarchy-toggle-scratch scratchpad")
 o.bind("SUPER + CTRL + ALT + H", "Toggle Tern scratch workspace", "omarchy-toggle-scratch scratchpad")
 o.bind("SUPER + CTRL + ALT + L", "Toggle Claude scratch workspace", "omarchy-toggle-scratch claude")
 
diff --git a/dot_config/mimeapps.list b/dot_config/mimeapps.list
index 63644d3..14fd1dc 100644
--- a/dot_config/mimeapps.list
+++ b/dot_config/mimeapps.list
@@ -35,7 +35,7 @@ x-scheme-handler/follow=folo.desktop
 x-scheme-handler/folo=folo.desktop
 x-scheme-handler/tldraw-offline=tldraw-offline.desktop
 x-scheme-handler/notion=notion.desktop
-inode/directory=com.thisisgm.flea.desktop
+inode/directory=io.github.lgse.Strata.desktop
 x-scheme-handler/fastmail=com.fastmail.Fastmail.desktop
 
 [Added Associations]