From 361b6cd44adf12a9f2f36e4ac00bb373a7a5aae7 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 11 Feb 2020 14:09:38 +0000 Subject: Use master branch for iron --- bin/.local/bin/keyboard | 8 +++--- vim/.vimrc | 66 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 11 deletions(-) diff --git a/bin/.local/bin/keyboard b/bin/.local/bin/keyboard index b7f5e90..ee1cc61 100755 --- a/bin/.local/bin/keyboard +++ b/bin/.local/bin/keyboard @@ -46,10 +46,10 @@ xmodmap -e "keycode any = space" xcape -e 'Super_L=space' # Make return (Control_R, Return) -xmodmap -e "keysym Return = Control_R" -xmodmap -e "add Control = Control_R" -xmodmap -e "keycode any = Return" -xcape -e 'Control_R=Return' +# xmodmap -e "keysym Return = Control_R" +# xmodmap -e "add Control = Control_R" +# xmodmap -e "keycode any = Return" +# xcape -e 'Control_R=Return' # Make eject an Insert xmodmap -e "keysym XF86Eject = Insert" diff --git a/vim/.vimrc b/vim/.vimrc index b4e5cea..a8bce6a 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -66,9 +66,12 @@ Plug 'vim-scripts/gmsh.vim' Plug 'wellle/targets.vim' " Plug 'zchee/deoplete-clang' +Plug 'liuchengxu/vim-which-key' + if isdirectory($HOME."/dotfiles/plugins") Plug '~/dotfiles/plugins/vim-remembrall' Plug '~/dotfiles/plugins/vim-tmux-pilot' + Plug '~/dotfiles/plugins/darjeeling' endif if has("nvim") @@ -76,7 +79,9 @@ if has("nvim") " Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' } " Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' } " Plug 'zchee/deoplete-jedi' - Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } + " Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } + Plug 'hkupty/iron.nvim' + Plug 'neovim/nvim-lsp' else Plug 'Shougo/neocomplete.vim' endif @@ -139,11 +144,29 @@ nnoremap gh :set opfunc=Call_heytmuxg@ xnoremap gh :Heytmux! " Iron +if has("nvim") + let g:iron_map_defaults=0 + let g:iron_map_extended=0 + nmap yr (iron-send-motion) + xmap R (iron-send-motion) + nmap yrr VR + +lua << EOF +local iron = require("iron") + +local open_repl = function(buffer) + vim.api.nvim_command('vnew') +end + +iron.core.set_config{ + preferred = { + python = "ipython" + }, + repl_open_cmd = open_repl +} +EOF " let g:iron_repl_open_cmd = 'vsplit' -let g:iron_map_defaults=0 -nmap yr (iron-send-motion) -xmap R (iron-send-motion) -nmap yrr VR +endif " Easy align xmap ga (EasyAlign) @@ -168,6 +191,7 @@ if &runtimepath =~ 'remembrall' autocmd FileType tex nnoremap ,l Remembrall(',l') augroup END endif +let g:remembrall_suffixes = [""] " LanguageClient if executable('pyls') @@ -196,6 +220,8 @@ let g:neomake_gcc_args=[ \ '-I.', '-I..', '-I../..' \ ] +let g:neomake_python_enabled_makers = ['python', 'pylint'] + " Deoplete let g:deoplete#enable_at_startup = 1 let g:deoplete#sources#jedi#show_docstring = 1 @@ -303,6 +329,7 @@ set foldmethod=marker set hidden set ignorecase set lazyredraw +set laststatus=2 set mouse=a set nojoinspaces set nowrap @@ -576,10 +603,21 @@ function! FloatingFZF() \ } call nvim_open_win(buf, v:true, opts) + call setbufvar(buf, '&laststatus', '2') endfunction -" hi Pmenu ctermfg=3 ctermbg=239 -" let g:remembrall_window = 'call FloatingFZF()' +" highlight default link LspDiagnosticsError Delimiter +" highlight default link LspDiagnosticsWarning Delimiter +" lua << EOF +" require'nvim_lsp'.pyls.setup{} +" EOF + +" Default Values: +" cmd = { "pyls" } +" filetypes = { "python" } +" log_level = 2 +" root_dir = vim's starting directory +" settings = {} " if !exists('g:lsp_config_sourced') " call lsp#add_filetype_config({ @@ -592,6 +630,20 @@ endfunction " let g:lsp_config_sourced = 1 " endif +" lua < Remembrall('') +nnoremap h lua vim.lsp.buf.hover() +nnoremap a lua vim.lsp.buf.declaration() +nnoremap d lua vim.lsp.buf.definition() +nnoremap i lua vim.lsp.buf.implementation() +nnoremap s lua vim.lsp.buf.signature_help() +nnoremap t lua vim.lsp.buf.type_definition() " inoremap :call remembrall#remind('i', '') " nnoremap Remembrall('') -- cgit v1.2.3 From 40cedc32101e1d33eca846ffd9add6aeb7745bbd Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 20 Feb 2020 12:51:25 +0000 Subject: Update things --- vim/.vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim/.vimrc b/vim/.vimrc index a8bce6a..f58f6ee 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -104,7 +104,6 @@ call plug#end() " Toggles nnoremap cpg :GitGutterToggle -nnoremap cpr :IronRepl nnoremap cpn :NERDTreeToggle nnoremap cpt :TagbarToggle nnoremap cpu :GundoToggle @@ -147,6 +146,7 @@ xnoremap gh :Heytmux! if has("nvim") let g:iron_map_defaults=0 let g:iron_map_extended=0 + nnoremap cpr :IronRepl nmap yr (iron-send-motion) xmap R (iron-send-motion) nmap yrr VR @@ -273,6 +273,7 @@ let g:vimtex_syntax_enabled=1 " Pilot let g:pilot_boundary='ignore' let g:pilot_mode='wintab' +" let g:pilot_split_or_new='new' " let g:pilot_key_h='' " let g:pilot_key_j='' " let g:pilot_key_k='' -- cgit v1.2.3 From cc688055484c2e17d776c5e7254b33e3f4d7816d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 25 Feb 2020 10:32:10 +0000 Subject: Update iron configuration --- vim/.vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/.vimrc b/vim/.vimrc index f58f6ee..4a3d951 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -149,6 +149,7 @@ if has("nvim") nnoremap cpr :IronRepl nmap yr (iron-send-motion) xmap R (iron-send-motion) + nmap yp (iron-repeat-cmd) nmap yrr VR lua << EOF @@ -437,6 +438,7 @@ nnoremap ,cl :set background=light:colorscheme solarized nnoremap ,cl :set background=dark:colorscheme solarized nnoremap ,cs :colorscheme seoul256 nnoremap ,cn :colorscheme nord +set notermguicolors colo seoul256 "" Autocommands {{{1 -- cgit v1.2.3