Fix language client

Add vim-hcl
Fix rust language server
2023-06-15 18:05:08 +02:00 · 2023-06-15 18:04:50 +02:00 · 2023-06-15 18:04:38 +02:00 · 2023-06-15 18:04:19 +02:00 · 2023-06-15 18:03:47 +02:00 · 2023-06-15 18:03:26 +02:00
33 changed files with 50 additions and 39 deletions
--- a/archbootstrap.sh
+++ b/archbootstrap.sh
@ -8,12 +8,11 @@ sudo pacman -Sy \
    autopep8 \
    python-black \
    mypy \
-    python-greenlet
+    python-greenlet \
+    python-pynvim

 echo "Install from AUR: typescript-language-server"

-pip3 install --user pynvim
-
 mkdir .{swp,backup,undo}

 git submodule update --init
--- a/config/after/language-client.vim
+++ b/config/after/language-client.vim
@ -1,9 +1,7 @@
-let g:fzf_action = {
-\ 'ctrl-t': 'tab split',
-\ 'ctrl-x': 'split',
-\ 'ctrl-v': 'vsplit',
-\ }
-let opts = fzf#vim#with_preview().options + [
-\ '--expect='.join(keys(fzf_action), ','),
-\ ]
-let g:LanguageClient_fzfOptions = opts
+let g:lcn_fzf_options = "--delimiter ':' --preview-window '+{2}-20' --expect 'ctrl-t,ctrl-x,ctrl-v'"
+
+function! LcnFzfSelectionUI(source, sink) abort
+    return fzf#run(fzf#wrap(fzf#vim#with_preview({'source': a:source, 'options': g:lcn_fzf_options})))
+endfunction
+
+let g:LanguageClient_selectionUI = function('LcnFzfSelectionUI')
--- a/config/before/ale.vim
+++ b/config/before/ale.vim
@ -15,7 +15,7 @@ let g:ale_linters = {
 \   'typescript': ['tsserver', 'tslint'],
 \   'typescriptreact': ['tsserver', 'tslint'],
 \   'python': ['pyright'],
-\   'rust': ['rls'],
+\   'rust': ['rust-analyzer'],
 \   'elixir': ['elixir-ls'],
 \   'go': ['gopls'],
 \   'json': ['jsonlint'],
--- a/config/before/copilot.vim
+++ b/config/before/copilot.vim
@ -0,0 +1,6 @@
+imap <silent><script><expr> <c-a> copilot#Accept("\<CR>")
+let g:copilot_no_tab_map = v:true
+let g:copilot_filetypes = {
+\    '*': v:false,
+\    'go': v:true,
+\ }
--- a/config/before/language-client.vim
+++ b/config/before/language-client.vim
@ -51,3 +51,6 @@ function LC_maps()
 endfunction

 autocmd FileType * call LC_maps()
+
+let g:LanguageClient_loggingLevel =  'DEBUG'
+let g:LanguageClient_loggingFile = expand('~/.vim/LanguageClient.log')
--- a/pack/github/start/copilot.vim
+++ b/pack/github/start/copilot.vim
@ -0,0 +1 @@
+Subproject commit 1358e8e45ecedc53daf971924a0541ddf6224faf
--- a/pack/vendor/start/LanguageClient-neovim
+++ b/pack/vendor/start/LanguageClient-neovim
@ -1 +1 @@
-Subproject commit 1cb8bb505f9e0e46177874dc76de73858a94ff6b
+Subproject commit cf6dd11baf62fb6ce18308e96c0ab43428b7c686
--- a/pack/vendor/start/ale
+++ b/pack/vendor/start/ale
@ -1 +1 @@
-Subproject commit 560e6340ce10ce90fac587096fb147eea43e624d
+Subproject commit 7021ed0c6859ec8b1bf5012d1276d54a786449c3
--- a/pack/vendor/start/black
+++ b/pack/vendor/start/black
@ -1 +1 @@
-Subproject commit fda2561f79e10826dbdeb900b6124d642766229f
+Subproject commit 3aad6e385bfbd4348b2e13695cb6741806951160
--- a/pack/vendor/start/deoplete-jedi
+++ b/pack/vendor/start/deoplete-jedi
@ -1 +1 @@
-Subproject commit 43058915007d92dc167b84dd5b8ada2d2a057a82
+Subproject commit 4a13930764f3fbda1c06d7312d8ce2ff595d3274
--- a/pack/vendor/start/deoplete.nvim
+++ b/pack/vendor/start/deoplete.nvim
@ -1 +1 @@
-Subproject commit 1c40f648d2b00e70beb4c473b7c0e32b633bd9ae
+Subproject commit 82db30626e411e99b0274b8d6c99bce561cb0394
--- a/pack/vendor/start/docker-compose.vim
+++ b/pack/vendor/start/docker-compose.vim
@ -1 +1 @@
-Subproject commit 8a6dbc869200f11d00f532e6bee8f2e7ce4ef64e
+Subproject commit 43df0bc663402b12b95ad50ba4c081895798d0ea
--- a/pack/vendor/start/fzf
+++ b/pack/vendor/start/fzf
@ -1 +1 @@
-Subproject commit 9cb7a364a31bdb882d873807774bdcf6fad0c9e4
+Subproject commit d0b7780239dd9f9e2bf6c252e03b463990a966bd
--- a/pack/vendor/start/fzf.vim
+++ b/pack/vendor/start/fzf.vim
@ -1 +1 @@
-Subproject commit 91332acb1c48e7080539c5b5cd131816341c738c
+Subproject commit 1dcdb21db618055134cd611f4f5918f6d00a5df0
--- a/pack/vendor/start/goyo.vim.git
+++ b/pack/vendor/start/goyo.vim.git
@ -1 +1 @@
-Subproject commit 7f5d35a65510083ea5c2d0941797244b9963d4a9
+Subproject commit fa0263d456dd43f5926484d1c4c7022dfcb21ba9
--- a/pack/vendor/start/indentLine
+++ b/pack/vendor/start/indentLine
@ -1 +1 @@
-Subproject commit 5617a1cf7d315e6e6f84d825c85e3b669d220bfa
+Subproject commit d15d63bf9c4a74a02470d4bc8ecce53df13e3a75
--- a/pack/vendor/start/melange
+++ b/pack/vendor/start/melange
@ -1 +1 @@
-Subproject commit e3a3a2cd03c73b4fc0670e9ac09dacdb3c6609c1
+Subproject commit f15922543dd70b360335effb61411c05c710b99c
--- a/pack/vendor/start/nerdtree
+++ b/pack/vendor/start/nerdtree
@ -1 +1 @@
-Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424
+Subproject commit fc85a6f07c2cd694be93496ffad75be126240068
--- a/pack/vendor/start/nvim-yarp
+++ b/pack/vendor/start/nvim-yarp
@ -1 +1 @@
-Subproject commit b710bf4daccb603a423754794fb446e5fbb59576
+Subproject commit bb5f5e038bfe119d3b777845a76b0b919b35ebc8
--- a/pack/vendor/start/powerline
+++ b/pack/vendor/start/powerline
@ -1 +1 @@
-Subproject commit 82c1373ba0b424c57e8c12cb5f6f1a7ee3829c27
+Subproject commit 833f30e88efa51246dadc6daf21638ec61b6b912
--- a/pack/vendor/start/rust.vim
+++ b/pack/vendor/start/rust.vim
@ -1 +1 @@
-Subproject commit 4aa69b84c8a58fcec6b6dad6fe244b916b1cf830
+Subproject commit 889b9a7515db477f4cb6808bef1769e53493c578
--- a/pack/vendor/start/undotree
+++ b/pack/vendor/start/undotree
@ -1 +1 @@
-Subproject commit c4984fc6dcc6c4e190f2f8cd5fffb65b0aaa51d2
+Subproject commit 485f01efde4e22cb1ce547b9e8c9238f36566f21
--- a/pack/vendor/start/vim-commentary
+++ b/pack/vendor/start/vim-commentary
@ -1 +1 @@
-Subproject commit 627308e30639be3e2d5402808ce18690557e8292
+Subproject commit e87cd90dc09c2a203e13af9704bd0ef79303d755
--- a/pack/vendor/start/vim-eunuch
+++ b/pack/vendor/start/vim-eunuch
@ -1 +1 @@
-Subproject commit e2c9e01abd2734919e65dd6fe6c84ca2a9b65a7d
+Subproject commit 291ef1f8c8996ca7715df1032a35a27b12d7b5cf
--- a/pack/vendor/start/vim-fetch
+++ b/pack/vendor/start/vim-fetch
@ -1 +1 @@
-Subproject commit 0a6ab17e84c7f4808bf05ec380121bce40b40d21
+Subproject commit bbb75c3172f766d1a62832df0ec7674c69a560ad
--- a/pack/vendor/start/vim-fugitive
+++ b/pack/vendor/start/vim-fugitive
@ -1 +1 @@
-Subproject commit 59529a2c3634dc1cb3956c4faaf824f5c4dd7be1
+Subproject commit 5f0d280b517cacb16f59316659966c7ca5e2bea2
--- a/pack/vendor/start/vim-go
+++ b/pack/vendor/start/vim-go
@ -1 +1 @@
-Subproject commit 430bc227654abc3eb5e27a9052a857344ca08cdc
+Subproject commit 3289077b08b210aa88a890cb65e9538bd52364b6
--- a/pack/vendor/start/vim-hcl
+++ b/pack/vendor/start/vim-hcl
@ -0,0 +1 @@
+Subproject commit 1e1116c17a5774851360ea8077f349e36fc733c1
--- a/pack/vendor/start/vim-indent-guides
+++ b/pack/vendor/start/vim-indent-guides
@ -1 +1 @@
-Subproject commit 765084d38bf102a95ab966fb06472e83fa7deff7
+Subproject commit a1e1390c0136e63e813d051de2003bf0ee18ae30
--- a/pack/vendor/start/vim-mucomplete
+++ b/pack/vendor/start/vim-mucomplete
@ -1 +1 @@
-Subproject commit 7ef91226beeb382a37b4d4d5f0f54e6acf1eaaee
+Subproject commit 03bcd4a7dfe0a2f6d432e8ce936d35273a15209d
--- a/pack/vendor/start/vim-rooter
+++ b/pack/vendor/start/vim-rooter
@ -1 +1 @@
-Subproject commit 0415be8b5989e56f6c9e382a04906b7f719cfb38
+Subproject commit 4f52ca556a0b9e257bf920658714470ea0320b7a
--- a/pack/vendor/start/vim-toml
+++ b/pack/vendor/start/vim-toml
@ -1 +1 @@
-Subproject commit 3c5face8e8944a217af45bc5bb708ff7dfcf1a54
+Subproject commit d36caa6b1cf508a4df1c691f915572fc02143258
--- a/5
+++ b/5
@ -14,10 +14,14 @@ endif
 let g:python3_host_prog = "/usr/bin/python"
 let g:python_host_prog='/usr/bin/python'

+""" leader mapping
+let mapleader = ','
+
 """ source

 " all other includes are in alphabetical order
 source $VIMHOME/config/before/ale.vim
+source $VIMHOME/config/before/copilot.vim
 source $VIMHOME/config/before/fzf.vim
 source $VIMHOME/config/before/indent.vim
 source $VIMHOME/config/before/language-client.vim
@ -141,7 +145,6 @@ autocmd BufNewFile,BufRead Dockerfile* set ft=Dockerfile

 """ keybindings

-let mapleader = ','
 noremap <leader>ad :ALEGoToDefinition<CR>
 nnoremap <leader>af :ALEFix<cr>
 nnoremap <leader>ah :ALEHover<cr>
Author	SHA1	Message	Date
blallo	b220a50fb7	Fix language client	2023-06-15 18:05:08 +02:00
blallo	67b87ba774	Add vim-hcl	2023-06-15 18:04:50 +02:00
blallo	a490cd6df0	Fix rust language server	2023-06-15 18:04:38 +02:00
blallo	977652c7ad	Add copilot plugin	2023-06-15 18:04:19 +02:00
blallo	486e4676a4	Fix leader mapping	2023-06-15 18:03:47 +02:00
blallo	56a65256cd	Update plugins	2023-06-15 18:03:26 +02:00
blallo	c9b54a08f2	Update bootstrap script	2023-06-15 18:01:00 +02:00
				`@ -0,0 +1 @@`
				`Subproject commit 1358e8e45ecedc53daf971924a0541ddf6224faf`
				`@ -0,0 +1 @@`
				`Subproject commit 1e1116c17a5774851360ea8077f349e36fc733c1`