From 9a4b75792677c0bd437e9292354f4a43263344ae Mon Sep 17 00:00:00 2001
From: Benjamin VAUDOUR <b.vaudour@luence.fr>
Date: Thu, 1 Sep 2022 12:17:24 +0200
Subject: [PATCH] =?UTF-8?q?Rationnalisation=20des=20diff=C3=A9rents=20?=
 =?UTF-8?q?=C3=A9diteurs=20par=20d=C3=A9faut=20+=20correction=20des=20nom?=
 =?UTF-8?q?=20VPN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aliases/vi.elv  | 39 ++++++++++++++++++++++++---------------
 aliases/vpn.elv | 12 ++++++------
 rc.elv          |  4 ++--
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/aliases/vi.elv b/aliases/vi.elv
index f3bbc21..574844a 100644
--- a/aliases/vi.elv
+++ b/aliases/vi.elv
@@ -1,16 +1,25 @@
-#var cmd = $e:nvim~
-#var cmd = $e:helix~
-var cmd = $e:kak~
-#var cmd = $e:emacs~
+# ÉDITEURS DISPOS
+#fn ce {|@argv| $e:emacs~ $@argv }
+#fn ce {|@argv| $e:helix~ $@argv }
+fn ce {|@argv| $e:kak~ $@argv }
+#fn ce {|@argv| $e:nvim~ $@argv }
+#fn ce {|@argv| $e:vim~ $@argv }
 
-edit:add-var vi~ {|@argv| $cmd $@argv }
-edit:add-var vb~ {|@argv| $cmd $@argv ~/.bashrc }
-edit:add-var vc~ {|@argv| $cmd $@argv ~/.vimrc }
-edit:add-var ve~ {|@argv| $cmd $@argv ~/.config/elvish/rc.elv }
-edit:add-var vf~ {|@argv| $cmd $@argv ~/.config/fish/config.fish }
-edit:add-var vp~ {|@argv| $cmd $@argv PKGBUILD }
-#edit:add-var vv~ {|@argv| $cmd -R $@argv } # vim/nvim
-edit:add-var vv~ {|@argv| $cmd -ro $@argv } # kak
-#edit:add-var vv~ {|@argv| $cmd $@argv } # helix - pas de mode lecture seule pour le moment
-#edit:add-var vv~ {|@argv| $cmd $@argv --eval '(setq buffer-read-only t)' } # emacs
-edit:add-var vz~ {|@argv| $cmd $@argv ~/.zshrc }
+# LECTURE SEULE
+## emacs
+#fn cv {|@argv| ce $@argv --eval '(setq buffer-read-only)' }
+## helix (pas le lecture seule pour le moment)
+#fn cv {|@argv| ce $@argv }
+# kak
+fn cv {|@argv| ce -ro $@argv }
+## nvim/vim
+#fn cv {|@argv| ce -R $@argv }
+
+edit:add-var vi~ $ce~
+edit:add-var vb~ {|@argv| ce $@argv ~/.bashrc }
+edit:add-var vc~ {|@argv| ce $@argv ~/.vimrc }
+edit:add-var ve~ {|@argv| ce $@argv ~/.config/elvish/rc.elv }
+edit:add-var vf~ {|@argv| ce $@argv ~/.config/fish/config.fish }
+edit:add-var vp~ {|@argv| ce $@argv PKGBUILD }
+edit:add-var vv~ $cv~
+edit:add-var vz~ {|@argv| ce $@argv ~/.zshrc }
diff --git a/aliases/vpn.elv b/aliases/vpn.elv
index 1b1ee11..1b89963 100644
--- a/aliases/vpn.elv
+++ b/aliases/vpn.elv
@@ -12,9 +12,9 @@ var shortcut = [
   &lu=luence-wg
   &lu2=luence-ovpn
   &cli=lunce-client
-  &nl=proton-nl5
-  &jp=proton-jp2
-  &us=proton-us3
+  &nl=proton_nl5
+  &jp=proton_jp2
+  &us=proton_us3
 ]
 
 var next = [
@@ -22,9 +22,9 @@ var next = [
   &fr.kaosx.cf=luence-wg
   &luence-wg=luence-client
   &luence-ovpn=luence-client
-  &luence-client=proton-nl5
-  &proton-nl5=proton-us3
-  &proton-us3=proton-jp2
+  &luence-client=proton_nl5
+  &proton_nl5=proton_us3
+  &proton_us3=proton_jp2
 ]
 
 fn -list {|&active=$false|
diff --git a/rc.elv b/rc.elv
index 9943056..3f567fe 100644
--- a/rc.elv
+++ b/rc.elv
@@ -2,8 +2,8 @@
 set-env BAT_PAGER 'less -RF'
 #set-env EDITOR vim
 set-env EDITOR kak
-#set-env VIEW 'vim -R'
-set-env VIEW 'kak -ro'
+#set-env VISUAL 'vim -R'
+set-env VISUAL 'kak -ro'
 set-env CURRENT_SHELL 'elvish'
 set-env STARSHIP_CONFIG ~/.config/starship/starship.toml
 set-env PERL5LIB /home/benjamin/perl5/lib/perl5