Rename edit to nve to avoid potential conflicts (nushell#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 <[email protected]>
sholderbach · Feb 29, 2024 · a31696e · a31696e
1 parent f6bbfe5
commit a31696e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 71 deletions.
diff --git 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
@@ -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)"
 }