diff options
| -rw-r--r-- | i3/.config/i3/config | 4 | ||||
| -rw-r--r-- | i3/.xinitrc | 5 | ||||
| -rwxr-xr-x | i3/Scripts/lc | 1 | ||||
| -rw-r--r-- | vim/.vimrc | 51 |
4 files changed, 30 insertions, 31 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config index e64b59a..30adf2b 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -118,6 +118,10 @@ bindsym $mod+minus scratchpad show # Mail scratchpad bindsym $mod+m [title="^alot"] scratchpad show +# Multiple monitors +bindsym $mod+period move workspace to output right +bindsym $mod+comma move workspace to output left + # switch to workspace bindsym $mod+1 workspace $ws1 bindsym $mod+2 workspace $ws2 diff --git a/i3/.xinitrc b/i3/.xinitrc index 8c4dd24..5088181 100644 --- a/i3/.xinitrc +++ b/i3/.xinitrc @@ -1,8 +1,8 @@ setxkbmap -layout us -variant altgr-intl export _JAVA_AWT_WM_NONREPARENTING=1 feh --bg-tile /home/julian/Pictures/defaultWall.* -export TERM=st -export TERMINAL=st +export TERM=termite +export TERMINAL=termite dbus-update-activation-environment --systemd DISPLAY @@ -12,6 +12,7 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) xmodmap .Xmodmap xcape -e "Control_R=Escape" +dunst & nm-applet & xscreensaver & diff --git a/i3/Scripts/lc b/i3/Scripts/lc index 26b4c13..dd2acc7 100755 --- a/i3/Scripts/lc +++ b/i3/Scripts/lc @@ -59,6 +59,7 @@ handle_stuff() { fi if [ "$1" = "mail" ]; then Scripts/mailSync + dunstify "Mail" "$(notmuch count tag:unread and tag:inbox) unread mail" fi # Launch @@ -14,14 +14,11 @@ set shellslash Plugin 'VundleVim/Vundle.vim' " Completion - Plugin 'autozimu/LanguageClient-neovim' - if has('nvim') - Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } - else - Plugin 'Shougo/deoplete.nvim' - Plugin 'roxma/nvim-yarp' - Plugin 'roxma/vim-hug-neovim-rpc' - endif + "Plugin 'prabirshrestha/async.vim' + "Plugin 'prabirshrestha/vim-lsp' + Plugin 'fatih/vim-go' + Plugin 'ajh17/VimCompletesMe' + Plugin 'ludovicchabant/vim-gutentags' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-repeat' @@ -51,14 +48,16 @@ set shellslash colorscheme horizon " Completion -let g:LanguageClient_serverCommands = { - \ 'rust': ['/usr/bin/rustup', 'run', 'stable', 'rls' ], - \ 'c': ['/usr/bin/cquery', '--log-file=/tmp/cq.log', '--init={"cacheDirectory":"/tmp/cquery/"}' ] - \ } - -let g:LanguageClient_useVirtualText = 0 -let g:LanguageClient_diagnosticsEnable = 0 -let g:deoplete#enable_at_startup = 1 + " let g:LanguageClient_serverCommands = { + " \ 'rust': ['/usr/bin/rustup', 'run', 'stable', 'rls' ], + " \ 'c': ['/usr/bin/cquery', '--log-file=/tmp/cq.log', '--init={"cacheDirectory":"/tmp/cquery/"}' ] + " \ } + " + " let g:LanguageClient_useVirtualText = 0 + " let g:LanguageClient_diagnosticsEnable = 0 + " let g:deoplete#enable_at_startup = 1 + let g:go_def_mode='gopls' + let g:go_info_mode='gopls' syntax enable set number relativenumber @@ -98,19 +97,16 @@ set hidden set completeopt=menuone,preview " Keymapping - map <C-n> :NERDTreeToggle<CR> map <F4> :TagbarToggle<CR> - inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" - inoremap <expr><C-j> pumvisible() ? "\<C-n>" : "\<C-x>\<C-o>" - inoremap <expr><C-k> pumvisible() ? "\<C-p>" : "\<C-x>\<C-o>" + nnoremap <C-b> :b - nnoremap <F5> :call LanguageClient_contextMenu()<CR> - nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR> - nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR> - nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR> + nnoremap <silent> <Plug>QuickNext :cnext<CR> :call repeat#set("\<Plug>QuickNext")<CR> + nnoremap <silent> <Plug>QuickPrev :cprev<CR> :call repeat#set("\<Plug>QuickPrev")<CR> + nnoremap ,, :copen<CR><c-w><c-p> - nnoremap <C-b> :b + nmap ,n <Plug>QuickNext + nmap ,N <Plug>QuickPrev " When moving more lines make it a jump. If couns i 2 it will run m'2j, " thus storing it on the jumplist and then jumping @@ -120,9 +116,8 @@ set completeopt=menuone,preview " Leader stuff let mapleader=" " - map <leader>z :Goyo<CR> map <leader>mm :make V=1<CR> - map <leader>mf :!make flash V=1<CR> + map <leader>mf :make flash V=1<CR> " Example on filetype specific " autocmd FileType tex map <leader>o :w !detex \| wc -w<CR> @@ -133,5 +128,3 @@ set completeopt=menuone,preview autocmd BufRead,BufNewFile *.asc set filetype=asciidoc autocmd FileType python setlocal completeopt-=preview -" Path settings - let g:ycm_rust_src_path = '~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src' |