Merge branch 'master' of github.com:CramMK/dots

files/.config/nvim/.netrwhist

@@ -1,8 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =6
-let g:netrw_dirhist_6='/home/marc/.config/dunst'
-let g:netrw_dirhist_5='/home/marc/.mutt/user'
-let g:netrw_dirhist_4='/home/marc/dots/laptop/.config/rofi'
-let g:netrw_dirhist_3='/home/marc/.config/rofi'
-let g:netrw_dirhist_2='/home/marc/.config/dunst'
-let g:netrw_dirhist_1='/home/marc/dots/laptop/.config/rofi/launchers-git'

files/.config/nvim/init.vim

@@ -1,3 +0,0 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath=&runtimepath
-source ~/.vimrc

files/.config/nvim/lua/marc/completion.lua

@@ -1,44 +0,0 @@
--- TODO: Migrate this to https://github.com/neovim/neovim/pull/12378 once merged
-vim.cmd("autocmd BufEnter * lua require'completion'.on_attach()")
-
--- Use <Tab> and <S-Tab> to navigate through popup menu
-vim.api.nvim_set_keymap("i", "<expr><Tab>", "pumvisible() ? \"\\<C-n>\" : \"\\<Tab>\"", { noremap = true })
-vim.api.nvim_set_keymap("i", "<expr><S-Tab>", "pumvisible() ? \"\\<C-p>\" : \"\\<S-Tab>\"", { noremap = true })
-
-vim.api.nvim_set_option("completeopt", "menuone,noinsert,noselect")
-
--- Default + c to avoid showing extra messages when using completion
-vim.api.nvim_set_option("shortmess", "filnxtToOFc")
-
--- Trigger instantly
-vim.api.nvim_set_var("completion_trigger_keyword_length", 1)
-
--- Ignore case for matching
-vim.api.nvim_set_var("completion_matching_ignore_case", 1)
-
--- Also trigger completion on delete
-vim.api.nvim_set_var("completion_trigger_on_delete", 1)
-
--- Use Neosnippet as snippet provider
-vim.api.nvim_set_var("completion_enable_snippet", 'Neosnippet')
-
--- Neosnippet expansion bindings
-vim.api.nvim_set_keymap("i", "<C-k>", "<Plug>(neosnippet_expand_or_jump)", {})
-vim.api.nvim_set_keymap("s", "<C-k>", "<Plug>(neosnippet_expand_or_jump)", {})
-vim.api.nvim_set_keymap("x", "<C-k>", "<Plug>(neosnippet_expand_target)", {})
-
--- Always do smart case matching
-vim.api.nvim_set_var("g:completion_matching_smart_case", 1)
-
-vim.api.nvim_set_var("completion_chain_complete_list", {
-    default = {
-        default = {
-            {complete_items= {'lsp','snippet'}},
-            {mode= '<c-p>'},
-            {mode= '<c-n>'}},
-        }
-    }
-)
-
--- Limit the amount of completion suggestions to 10
-vim.api.nvim_set_option("pumheight", 10)

files/.config/nvim/lua/marc/lsp.lua

@@ -1,46 +0,0 @@
-if vim.api.nvim_eval("executable('pyls')") then
-	require'lspconfig'.pyls.setup{}
-end
-
-if vim.api.nvim_eval("executable('rust-analyzer')") then
-	require'lspconfig'.rust_analyzer.setup{}
-end
-
-if vim.api.nvim_eval("executable('texlab')") then
-	require'lspconfig'.texlab.setup{
-		settings = {
-			latex = {
-				build = {
-					onSave = true;
-				};
-				forwardSearch = {
-					executable = "zathura";
-					args = {"--synctex-forward", "%l:1:%f", "%p"};
-				}
-			};
-		};
-		commands = {
-			ZathuraShow = {
-				function()
-					vim.lsp.buf_request(0, "textDocument/forwardSearch", vim.lsp.util.make_position_params(),
-						function(err, _, _, _)
-							if err then error(tostring(err)) end
-						end
-						)
-				end;
-				description = "Show the current position in zathura";
-			}
-		}
-
-	}
-	vim.api.nvim_set_keymap("n", "gz", "<cmd>ZathuraShow<CR>", { noremap = true, silent = true })
-end
-
--- g(o) d(efinition)
-vim.api.nvim_set_keymap("n", "gd" , "<cmd>lua vim.lsp.buf.definition()<CR>", { noremap = true, silent = true })
--- g(o) r(eference)
-vim.api.nvim_set_keymap("n", "gr" , "<cmd>lua vim.lsp.buf.references()<CR>", { noremap = true, silent = true })
--- K for hover information
-vim.api.nvim_set_keymap("n", "K" , "<cmd>lua vim.lsp.buf.hover()<CR>", { noremap = true, silent = true })
--- s(how) d(iagnostics)
-vim.api.nvim_set_keymap("n", "<leader>sd", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", { noremap = true})

files/.vimrc

@@ -28,13 +28,6 @@ if executable("fzf") " fzf support and bindings
     Plug 'junegunn/fzf.vim'
 endif
 
-if has ("nvim")
-    Plug 'neovim/nvim-lspconfig' " lsp
-    Plug 'Shougo/neosnippet.vim' " snippet support
-    Plug 'Shougo/neosnippet-snippets' " actual snippets
-    Plug 'nvim-lua/completion-nvim' " autocomplete
-endif
-
 call plug#end()
 
 " ============================== Colors
@@ -128,20 +121,3 @@ if has ("nvim")
 else
   nmap <leader>ft :enew<CR>
 end
-
-" buffer > tabs
-nmap <leader>j :bprev<CR>
-nmap <leader>k :bnext<CR>
-nmap <leader>q :bp <BAR> bd #<CR>
-
-" ============================== Cool NeoVim Shit
-if has ("nvim")
-  " - Startup LSP Servers
-  " - Set bindings: gr, gd, K, sd
-  lua require'marc.lsp'
-
-
-  " - Configure completion engine
-  " - Set bindings: <C-k>, <C-n>, <C-p>
-  lua require'marc.completion'
-endif

files/linkdots.sh

@@ -22,7 +22,7 @@ chmod +x $HOME/.xinitrc
 ln -sf $HOME/.xinitrc $HOME/.xsession
 
 # --- .config --- #
-conf_files="alacritty dunst nvim zathura"
+conf_files="alacritty dunst zathura"
 
 for file in $conf_files
 do