From 9c960a866a1c8edc66bca2400e76e69cc579ae11 Mon Sep 17 00:00:00 2001
From: Xe Iaso <me@xeiaso.net>
Date: Sat, 4 Feb 2023 13:12:58 -0500
Subject: [PATCH] common/home-manager: make fish and emacs play nicer

Signed-off-by: Xe Iaso <me@xeiaso.net>
---
 common/home-manager/emacs/default.nix | 3 ---
 common/home-manager/emacs/xe-tools.el | 2 +-
 common/home-manager/fish/default.nix  | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/home-manager/emacs/default.nix b/common/home-manager/emacs/default.nix
index 1dc72f5..16ed93b 100644
--- a/common/home-manager/emacs/default.nix
+++ b/common/home-manager/emacs/default.nix
@@ -545,11 +545,8 @@ in {
             });
 
             bindStar = {
-              "C-s c" = "xe/tabnew-shell";
               "C-a c" = "xe/tabnew-shell";
-              "C-s h" = "split-window-vertically";
               "C-a h" = "split-window-vertically";
-              "C-s v" = "split-window-horizontally";
               "C-a v" = "split-window-horizontally";
             };
           };
diff --git a/common/home-manager/emacs/xe-tools.el b/common/home-manager/emacs/xe-tools.el
index d6cc16d..7758a2f 100644
--- a/common/home-manager/emacs/xe-tools.el
+++ b/common/home-manager/emacs/xe-tools.el
@@ -24,9 +24,9 @@ cell (regexp . minor-mode)."
 
 (defun xe/tabnew-shell ()
   "Opens a shell in a new tab (tmux Control-b c)."
+  (interactive)
   (tab-bar-new-tab 1)
   (vterm)
-  (evil-set-initial-state 'vterm-mode 'emacs)
   (rename-uniquely))
 
 (provide 'xe-tools)
diff --git a/common/home-manager/fish/default.nix b/common/home-manager/fish/default.nix
index 2e60d9e..6c524f0 100644
--- a/common/home-manager/fish/default.nix
+++ b/common/home-manager/fish/default.nix
@@ -82,7 +82,7 @@ in {
             end
 
             function e
-                vterm_printf "51;Efind-file";
+                vterm_printf "51;Efind-file" $argv;
             end
 
             function vterm_prompt_end;