11 files changed, 56 insertions, 19 deletions

diff --git a/gvimrc b/gvimrc
new file mode 100644
index 0000000..eda4fc7
--- /dev/null
+++ b/gvimrc
@@ -0,0 +1,30 @@
+" ======================================================================================================================
+" GUI_DEFAULTS:
+" We want to have a minimal UI
+" ======================================================================================================================
+
+if has("gui_running")
+  set guicursor=a:block-blinkon100
+  set browsedir=buffer
+  set toolbar+=text
+  set guiheadroom=0
+  set guioptions+=eig
+  set guioptions-=T   | " toolbar
+  set guioptions+=c   | " use console dialogues instead of popups
+  set guioptions+=a   | " auto select: copy&paste using middle click
+  set guioptions+=m   | " remove menu
+  set guioptions-=e   | " do not display tabs
+  set guioptions-=L   | " do not show left scrollbar
+  set guioptions-=r   | " do not show right scrollbar
+  set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
+  " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
+  " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
+
+  set background=light
+  " its possible to define alternative fonts (order matters), but we will
+  " use the systems default font and cofigure that if necessary
+  set guifont=Monospace\ 10
+
+  " like in the terminal: use Ctrl-shift-v for paste in vim's command editor
+  cnoremap <c-s-v> <c-r>*
+endif
diff --git a/init.lua b/init.lua
index e69b081..c710f99 100644
--- a/init.lua
+++ b/init.lua
@@ -2,9 +2,13 @@ vim.cmd('source ~/.vim/vimrc')
 
 vim.o.termguicolors = true
 vim.o.exrc = true
-vim.o.shell = 'cmd.exe'
+
+if vim.fn.has("win32") then
+  vim.o.shell = 'cmd.exe'
+  vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims"))
+end
+
 -- vim.o.shadafile = "/tmp/shada"
-vim.opt.rtp:append("C:\\Users\\max\\scoop\\shims")
 
 -- only on Linux...
 -- vim.o.shadafile = (os.getenv("XDG_CACHE_HOME") or
diff --git a/pack/all/start/vim-fancy-line b/pack/all/start/vim-fancy-line
-Subproject bf4fadce4d57396ccbadd0493cac294fe6c69b9
+Subproject 6bef9966d5f15203c1567516a5da49b72121423
diff --git a/pack/nvim/start/nvim-git-blame b/pack/nvim/start/nvim-git-blame
deleted file mode 160000
-Subproject 8fcf0077ab0c020a68e9d26d347df7da717ddf1
diff --git a/pack/nvim/start/nvim-lspconfig b/pack/nvim/start/nvim-lspconfig
-Subproject e49b1e90c1781ce372013de3fa93a91ea29fc34
+Subproject 38da5bbe1eaab2394056109e48c7e195bdb8fdf
diff --git a/pack/nvim/start/nvim-treesitter b/pack/nvim/start/nvim-treesitter
-Subproject eb3faef3a44641e5875581e901b0a8df8da2bde
+Subproject 4a68f0778c05083cc458a3a144205cfc4147443
diff --git a/plugin/lsp.nvim b/plugin/lsp.nvim
new file mode 100644
index 0000000..979b35f
--- /dev/null
+++ b/plugin/lsp.nvim
@@ -0,0 +1 @@
+command! LspFix lua vim.lsp.buf.code_action()
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index 9f55fdf..9d0c034 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -58,5 +58,5 @@ let g:PaperColor_Theme_Options = {
                         \   }
                         \ }
 
-
+set background=dark
 colorscheme PaperColor
diff --git a/utils/applications/vim.desktop b/utils/applications/vim.desktop
index f8efe76..8169f57 100644..100755
--- a/utils/applications/vim.desktop
+++ b/utils/applications/vim.desktop
@@ -1,13 +1,15 @@
 [Desktop Entry]
-X-Desktop-File-Install-Version=0.23
+Version=1.0
 Type=Application
-Name=Vi IMproved->buffer2
-Icon=gvim
+Name=Vi IMproved
 Comment=Open file in an existing instance of vi and in a new tab
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-X-XClassHintResName=VIM
+Icon=gvim
+MimeType=text/*
 Categories=Application;Utility;TextEditor;
-# Exec=vim --servername VIM --remote-silent %F
-Exec=xfce4-terminal -e "bash -c '~/.bashrc ; vim --servername VIM --remote-silent %F'"
+Exec=vim %F
 Terminal=true
-StartupNotify=true
+Actions=Server;
+
+[Desktop Action Server]
+Exec=vim --servername VIM --remote-silent %F
+Name=Browse in Server
diff --git a/vimrc b/vimrc
index ea8ee2b..4a81724 100644
--- a/vimrc
+++ b/vimrc
@@ -8,11 +8,11 @@ set signcolumn=yes
 set foldcolumn=1
 
 
-if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
-  autocmd TextYankPost  *  call system("wl-copy", get(v:event, 'regcontents'))
-  nnoremap p   :silent  put    =system('wl-paste')<CR>
-  nnoremap P   :silent  put!   =system('wl-paste')<CR>
-endif
+" if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
+"   autocmd TextYankPost  *  call system("wl-copy", get(v:event, 'regcontents'))
+"   nnoremap p   :silent  put    =system('wl-paste')<CR>
+"   nnoremap P   :silent  put!   =system('wl-paste')<CR>
+" endif
 
 
 if has("nvim")
diff --git a/vimrc-common b/vimrc-common
index c7d450d..6c06c66 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -221,9 +221,9 @@ if has("autocmd")
   " Workaround: Allows Vim to yank text within wayland
   " XDG_SESSION_TYPE is only set if a login manager was used
   " WAYLAND_DISPLAY should always work
-  if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
-    autocmd TextYankPost       * call system("wl-copy", getreg('+'))
-  endif 
+  " if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
+  "  autocmd TextYankPost       * call system("wl-copy", getreg('+'))
+  " endif 
 
   autocmd TextYankPost       *  echo '> text yanked to '.
         \ (get(v:event,'regname') == ''