From a31696ea2a3943e45bbcf1fbb9d0e8e95bcbd7ac Mon Sep 17 00:00:00 2001
From: fj0r <82698591+fj0r@users.noreply.github.com>
Date: Thu, 29 Feb 2024 20:32:19 +0800
Subject: [PATCH] Rename edit to nve to avoid potential conflicts (#768)

- rename `edit` to `nve` to avoid potential conflicts
- `e`, `c`, `v`, `x` export as alias
- nested nvim creates new buffer when no filename as args
- `cwdhist` use Alt+o as default

Co-authored-by: nash <nash@iffy.me>
---
 modules/cwdhist/cwdhist.nu | 14 +-----
 modules/nvim/nvim.nu       | 92 ++++++++++++++------------------------
 2 files changed, 35 insertions(+), 71 deletions(-)

diff --git a/modules/cwdhist/cwdhist.nu b/modules/cwdhist/cwdhist.nu
index 5a49c00f..e56af992 100644
--- a/modules/cwdhist/cwdhist.nu
+++ b/modules/cwdhist/cwdhist.nu
@@ -40,7 +40,7 @@ def __cwdhist_menu [] {
 def __cwdhist_keybinding [] {
     {
         name: cwdhist_menu
-        modifier: control
+        modifier: alt
         keycode: char_o
         mode: [emacs, vi_normal, vi_insert]
         event: [
@@ -49,16 +49,6 @@ def __cwdhist_keybinding [] {
     }
 }
 
-def __cwdhist_editing [] {
-    {
-        name: open_command_editor
-        modifier: alt
-        keycode: char_o
-        mode: [emacs, vi_normal, vi_insert]
-        event: { send: openeditor }
-    }
-}
-
 def __cwdhist_switching [] {
     {
         name: cwdhist_switching
@@ -118,6 +108,6 @@ export-env {
 
     $env.config = ($env.config
                   | upsert menus ($env.config.menus | append (__cwdhist_menu))
-                  | upsert keybindings ($env.config.keybindings | append [(__cwdhist_keybinding) (__cwdhist_editing) (__cwdhist_switching)])
+                  | upsert keybindings ($env.config.keybindings | append [(__cwdhist_keybinding) (__cwdhist_switching)])
                   )
 }
diff --git a/modules/nvim/nvim.nu b/modules/nvim/nvim.nu
index 5d0cd445..aa7234cf 100644
--- a/modules/nvim/nvim.nu
+++ b/modules/nvim/nvim.nu
@@ -39,35 +39,6 @@ def nvim_tcd [] {
     ]
 }
 
-export-env {
-    $env.config = ( $env.config | upsert hooks.env_change.PWD { |config|
-        let o = ($config | get -i hooks.env_change.PWD)
-        let val = (nvim_tcd)
-        if $o == null {
-            $val
-        } else {
-            $o | append $val
-        }
-    })
-}
-
-def edit [action ...file] {
-    if ($env.NVIM? | is-empty) {
-        nvim ...$file
-    } else {
-        let af = $file
-        | each {|f|
-            if ($f|str substring ..1) in ['/', '~'] {
-                $f
-            } else {
-                $"($env.PWD)/($f)"
-            }
-        }
-        let cmd = $"<cmd>($action) ($af|str join ' ')<cr>"
-        nvim --headless --noplugin --server $env.NVIM --remote-send $cmd
-    }
-}
-
 # nvim tcd
 export def tcd [path?: string] {
     let after = if ($path | is-empty) {
@@ -78,36 +49,16 @@ export def tcd [path?: string] {
     nvim --headless --noplugin --server $env.NVIM --remote-send $"<cmd>lua HookPwdChanged\('($after)', '($env.PWD)')<cr>"
 }
 
-export def e [...file: string] {
-    if ($file|is-empty) {
-        nvim
-    } else {
-        edit vsplit ...$file
-    }
-}
-
-export def c [...file: string] {
-    if ($file|is-empty) {
-        nvim
-    } else {
-        edit split ...$file
-    }
-}
-
-export def v [...file: string] {
-    if ($file|is-empty) {
-        nvim
-    } else {
-        edit vsplit ...$file
-    }
-}
-
-export def x [...file: string] {
-    if ($file|is-empty) {
-        nvim
-    } else {
-        edit tabnew ...$file
-    }
+export-env {
+    $env.config = ( $env.config | upsert hooks.env_change.PWD { |config|
+        let o = ($config | get -i hooks.env_change.PWD)
+        let val = (nvim_tcd)
+        if $o == null {
+            $val
+        } else {
+            $o | append $val
+        }
+    })
 }
 
 # drop stdout to nvim buf
@@ -135,6 +86,29 @@ export def opwd [] {
     nvim-lua 'OppositePwd()'
 }
 
+export def nve [action ...file] {
+    if ($env.NVIM? | is-empty) {
+        nvim ...$file
+    } else {
+        let af = $file
+        | each {|f|
+            if ($f|str substring ..1) in ['/', '~'] {
+                $f
+            } else {
+                $"($env.PWD)/($f)"
+            }
+        }
+        let action = if ($file | is-empty) { $action | str replace -r 'sp.*$' 'new' } else { $action }
+        let cmd = $"<cmd>($action) ($af|str join ' ')<cr>"
+        nvim --headless --noplugin --server $env.NVIM --remote-send $cmd
+    }
+}
+
+export alias e = nve vsplit
+export alias v = nve vsplit
+export alias c = nve split
+export alias x = nve tabnew
+
 export def nvs [port: int=9999] {
     nvim --headless --listen $"0.0.0.0:($port)"
 }