diff --git a/README.md b/README.md index a24814a..cf4e3ad 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ ## Programs ++ Bluetooth-Manager: blueman + Editor: emacs + File-Browser: thunar + tumbler + Image-Viewer: sxiv @@ -37,17 +38,6 @@ + hunspell{-de, en}: spellchecking for emacs + acpid: power management - /etc/acpi/handler.sh - [ArchWiki Thread](https://bbs.archlinux.org/viewtopic.php?id=240023) -### emacs LSP - -Emacs should throw a warning, when it can't start the language server. -Following the help should be enough guidance. - -### Nvim LSP (unused) - -+ [Python](https://github.com/palantir/python-language-server) -+ [Rust](https://github.com/rust-analyzer/rust-analyzer) -+ [TeX](https://github.com/latex-lsp/texlab) - ## Fonts | Usage | Font | | -------- | --------------------- | diff --git a/files/.config/nvim/.netrwhist b/files/.config/nvim/.netrwhist deleted file mode 100644 index 44d1163..0000000 --- a/files/.config/nvim/.netrwhist +++ /dev/null @@ -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' diff --git a/files/.config/nvim/init.vim b/files/.config/nvim/init.vim deleted file mode 100644 index b42c8d9..0000000 --- a/files/.config/nvim/init.vim +++ /dev/null @@ -1,3 +0,0 @@ -set runtimepath^=~/.vim runtimepath+=~/.vim/after -let &packpath=&runtimepath -source ~/.vimrc diff --git a/files/.config/nvim/lua/marc/completion.lua b/files/.config/nvim/lua/marc/completion.lua deleted file mode 100644 index 644f823..0000000 --- a/files/.config/nvim/lua/marc/completion.lua +++ /dev/null @@ -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 and to navigate through popup menu -vim.api.nvim_set_keymap("i", "", "pumvisible() ? \"\\\" : \"\\\"", { noremap = true }) -vim.api.nvim_set_keymap("i", "", "pumvisible() ? \"\\\" : \"\\\"", { 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", "", "(neosnippet_expand_or_jump)", {}) -vim.api.nvim_set_keymap("s", "", "(neosnippet_expand_or_jump)", {}) -vim.api.nvim_set_keymap("x", "", "(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= ''}, - {mode= ''}}, - } - } -) - --- Limit the amount of completion suggestions to 10 -vim.api.nvim_set_option("pumheight", 10) diff --git a/files/.config/nvim/lua/marc/lsp.lua b/files/.config/nvim/lua/marc/lsp.lua deleted file mode 100644 index 1b94b70..0000000 --- a/files/.config/nvim/lua/marc/lsp.lua +++ /dev/null @@ -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", "ZathuraShow", { noremap = true, silent = true }) -end - --- g(o) d(efinition) -vim.api.nvim_set_keymap("n", "gd" , "lua vim.lsp.buf.definition()", { noremap = true, silent = true }) --- g(o) r(eference) -vim.api.nvim_set_keymap("n", "gr" , "lua vim.lsp.buf.references()", { noremap = true, silent = true }) --- K for hover information -vim.api.nvim_set_keymap("n", "K" , "lua vim.lsp.buf.hover()", { noremap = true, silent = true }) --- s(how) d(iagnostics) -vim.api.nvim_set_keymap("n", "sd", "lua vim.lsp.diagnostic.set_loclist()", { noremap = true}) diff --git a/files/.vimrc b/files/.vimrc index 1b02b1e..5d67157 100644 --- a/files/.vimrc +++ b/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 ft :enew end - -" buffer > tabs -nmap j :bprev -nmap k :bnext -nmap q :bp bd # - -" ============================== Cool NeoVim Shit -if has ("nvim") - " - Startup LSP Servers - " - Set bindings: gr, gd, K, sd - lua require'marc.lsp' - - - " - Configure completion engine - " - Set bindings: , , - lua require'marc.completion' -endif diff --git a/files/linkdots.sh b/files/linkdots.sh index 50e3977..6fcf308 100755 --- a/files/linkdots.sh +++ b/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