From 92449442479797a3a6f688d1d85b597622c4f799 Mon Sep 17 00:00:00 2001
From: DarkWiiPlayer <darkwiiplayer@hotmail.com>
Date: Thu, 30 Jul 2020 16:25:46 +0200
Subject: [PATCH] Improve vim visual-execute logic

---
 profile              |  2 ++
 vim/plugin/shame.vim | 10 ++--------
 vim/plugin/vexe.vim  |  5 +++++
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 vim/plugin/vexe.vim

diff --git a/profile b/profile
index a9f37a1..3aeceba 100644
--- a/profile
+++ b/profile
@@ -10,6 +10,7 @@ export LUA_PATH_5_3="$HOME/.luarocks/share/lua/5.3/?.lua;"\
 "$HOME/.luarocks/share/lua/5.3/?/init.lua;"\
 "lua_modules/share/lua/5.3/?.lua;"\
 "lua_modules/share/lua/5.3/?/init.lua;"\
+"$HOME/darkrc/lua/?.lua"\
 ";"
 export LUA_CPATH_5_3="$HOME/.luarocks/lib/lua/5.3/?.so;"\
 "$HOME/.luarocks/lib/lua/5.3/?/init.so;"\
@@ -21,6 +22,7 @@ export LUA_PATH_5_1="$HOME/.luarocks/share/lua/5.1/?.lua;"\
 "$HOME/.luarocks/share/lua/5.1/?/init.lua;"\
 "lua_modules/share/lua/5.1/?.lua;"\
 "lua_modules/share/lua/5.1/?/init.lua;"\
+"$HOME/darkrc/lua/?.lua"\
 ";"
 export LUA_CPATH_5_1="$HOME/.luarocks/lib/lua/5.1/?.so;"\
 "$HOME/.luarocks/lib/lua/5.1/?/init.so;"\
diff --git a/vim/plugin/shame.vim b/vim/plugin/shame.vim
index 2a1e27b..1d2b5d7 100644
--- a/vim/plugin/shame.vim
+++ b/vim/plugin/shame.vim
@@ -76,7 +76,7 @@ set swapfile
 
 set gdefault
 
-" set wrap
+set nowrap
 set breakat=\ .,{
 au BufEnter,BufRead * set linebreak
 set display+=lastline
@@ -545,16 +545,10 @@ noremap gk k
 " --- CLIPBOARD ---
 nnoremap Y y$
 
-" --- VISUAL EXECUTE ---
-vnoremap <C-CR> ""y<CR>
-				\ :call setreg("\"", substitute(getreg("\""), "\n", "", ""), "v")<CR>
-				\ :<C-r>"<CR>`<
+" --- MOONSCRIPT ---
 
 let g:mooncompile = "!moonc ".expand("<sfile>:p:h")."/lua"
 command! Mooncompile silent exec g:mooncompile
-let g:exe_prg = 'moonc -- | lua -e "package.path=package.path..[[;'.expand('<sfile>:p:h:h').'/lua/?.lua]];vim=require[[vim]]" -'
-vnoremap <CR> :<C-U>exec "'<,'>!".g:exe_prg<CR>
-inoremap <C-Space> <C-[>0v$:<C-U>exec "'<,'>!".g:exe_prg<CR>
 
 " --- OTHER ---
 " Don't exit visual mode when "shifting"
diff --git a/vim/plugin/vexe.vim b/vim/plugin/vexe.vim
new file mode 100644
index 0000000..38295b7
--- /dev/null
+++ b/vim/plugin/vexe.vim
@@ -0,0 +1,5 @@
+" --- VISUAL EXECUTE ---
+let $LUA_PATH=expand('<sfile>:p:h:h')."/lua/?.lua;;"
+let g:exe_prg = 'lua -e "vim=require[[vim]]" -'
+vnoremap <CR> :<C-U>exec "'<,'>!".g:exe_prg<CR>
+inoremap <C-Space> <C-[>0v$:<C-U>exec "'<,'>!".g:exe_prg<CR>