From 1b9788a00073b0ab60f3b3f264d5ece4e7f1693a Mon Sep 17 00:00:00 2001
From: Daniel Lundin <daniel@arity.se>
Date: Wed, 10 Apr 2024 17:35:43 +0200
Subject: [PATCH] switch back to nvim for now
---
.config/fish/config.fish | 2 +-
bin/tmux-edit-helper | 2 +-
bin/tmux-hx-helper | 2 +-
bin/tmux-nvim-helper | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index a915c48..1a8d08d 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -25,7 +25,7 @@ if status is-interactive
## Utilities
- export EDITOR=helix
+ export EDITOR=nvim
function tree
eza --tree --color=always $argv | bat --wrap=never
diff --git a/bin/tmux-edit-helper b/bin/tmux-edit-helper
index 90b21a9..cdf7994 120000
--- a/bin/tmux-edit-helper
+++ b/bin/tmux-edit-helper
@@ -1 +1 @@
-tmux-hx-helper
\ No newline at end of file
+tmux-nvim-helper
\ No newline at end of file
diff --git a/bin/tmux-hx-helper b/bin/tmux-hx-helper
index de73970..633150e 100755
--- a/bin/tmux-hx-helper
+++ b/bin/tmux-hx-helper
@@ -41,4 +41,4 @@ tmux-shortcut 1 env \
helix "${_file}"
sleep 0.1
tmux send-keys Escape &&
- tmux send-keys ":open ${_file}" Enter
+ tmux send-keys ":open ${_file}" Enter ":reload" Enter
diff --git a/bin/tmux-nvim-helper b/bin/tmux-nvim-helper
index 4b35744..9115fad 100755
--- a/bin/tmux-nvim-helper
+++ b/bin/tmux-nvim-helper
@@ -23,7 +23,7 @@ _nvim_socket="$XDG_RUNTIME_DIR/nvim-persistent.sock"
(tmux select-window -t nvim 2>/dev/null && tmux select-pane -t 0) && exec nvim --server "$_nvim_socket" --remote "$_file"
# nvim is not running/listening on remote socket, so start it.
-tmux new-window -S -t 43 -n nvim \
+tmux new-window -S -t 42 -n nvim \
-e "AR=$AR" \
-e "AS=$AS" \
-e "BUILD_COMMAND=$BUILD_COMMAND" \