diff options
| -rw-r--r-- | i3/.config/i3/config | 61 | ||||
| -rw-r--r-- | mutt/.mutt/muttrc | 2 | ||||
| -rw-r--r-- | qutebrowser/.config/qutebrowser/config.py | 2 | ||||
| -rw-r--r-- | vifm/.vifm/vifmrc | 2 | ||||
| -rw-r--r-- | vim/.vim/spell/en.utf-8.add | 1 | ||||
| -rw-r--r-- | vim/.vim/spell/en.utf-8.add.spl | bin | 334 -> 349 bytes | |||
| -rw-r--r-- | vim/.vimrc | 81 |
7 files changed, 67 insertions, 82 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 28d5133..aa4f18c 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -89,56 +89,45 @@ bindsym $mod+Shift+minus move scratchpad bindsym $mod+minus scratchpad show # switch to workspace -bindsym $mod+ampersand workspace number 1 -bindsym $mod+bracketleft workspace number 2 -bindsym $mod+braceleft workspace number 3 -bindsym $mod+braceright workspace number 4 -bindsym $mod+parenleft workspace number 5 -bindsym $mod+equal workspace number 6 -bindsym $mod+asterisk workspace number 7 -bindsym $mod+parenright workspace number 8 -bindsym $mod+plus workspace number 9 +bindsym $mod+ampersand workspace number 1 +bindsym $mod+bracketleft workspace number 2 +bindsym $mod+braceleft workspace number 3 +bindsym $mod+braceright workspace number 4 +bindsym $mod+parenleft workspace number 5 +bindsym $mod+equal workspace number 6 +bindsym $mod+asterisk workspace number 7 +bindsym $mod+parenright workspace number 8 +bindsym $mod+plus workspace number 9 bindsym $mod+bracketright workspace number 10 # move focused container to workspace -bindsym $mod+Shift+ampersand move container to workspace number 1 -bindsym $mod+Shift+bracketleft move container to workspace number 2 -bindsym $mod+Shift+braceleft move container to workspace number 3 -bindsym $mod+Shift+braceright move container to workspace number 4 -bindsym $mod+Shift+1 move container to workspace number 5 -bindsym $mod+Shift+equal move container to workspace number 6 -bindsym $mod+Shift+asterisk move container to workspace number 7 -bindsym $mod+Shift+2 move container to workspace number 8 -bindsym $mod+Shift+plus move container to workspace number 9 +bindsym $mod+Shift+ampersand move container to workspace number 1 +bindsym $mod+Shift+bracketleft move container to workspace number 2 +bindsym $mod+Shift+braceleft move container to workspace number 3 +bindsym $mod+Shift+braceright move container to workspace number 4 +bindsym $mod+Shift+parenleft move container to workspace number 5 +bindsym $mod+Shift+equal move container to workspace number 6 +bindsym $mod+Shift+asterisk move container to workspace number 7 +bindsym $mod+Shift+parenright move container to workspace number 8 +bindsym $mod+Shift+plus move container to workspace number 9 bindsym $mod+Shift+bracketright move container to workspace number 10 # reload the configuration file bindsym $mod+Shift+c reload - -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+r restart - -# exit i3 (logs you out of your X session) bindsym $mod+Shift+e exit -# resize window (you can also use the mouse for that) mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym h resize shrink width 10 px or 10 ppt - bindsym j resize grow height 10 px or 10 ppt + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt bindsym k resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt # back to normal: Enter or Escape bindsym Return mode "default" diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 2348835..bb1c122 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -90,7 +90,7 @@ folder-hook 'Personal*' 'source ~/.mutt/id_personal' macro index,pager gr "<change-folder> +Misc/rss<enter>" macro index,pager gl "<change-folder> +Misc/lists<enter>" -folder-hook 'Misc/rss' 'unset trash; unset from' +folder-hook 'Misc/rss|Misc/lists' 'unset trash; unset from' # Source mutt solarized `[[ "$COLORSCHEME" = "solarized" && "$BACKGROUND" = "light" ]] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set` diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index 2ad65f9..20cbb0c 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -19,7 +19,7 @@ config.bind(",h", 'spawn --userscript explorer -h') config.bind(",p", 'spawn --userscript explorer') config.bind(",t", 'spawn --userscript explorer -t') config.bind(",v", 'spawn mpv {url}') -config.bind(",V", 'hint links spawn mpv {hint-url}') +config.bind(";v", 'hint links spawn mpv {hint-url}') config.bind("]d", 'set downloads.location.prompt True') config.bind("[d", 'set downloads.location.prompt False') config.unbind("d") diff --git a/vifm/.vifm/vifmrc b/vifm/.vifm/vifmrc index 0969b78..3a39b52 100644 --- a/vifm/.vifm/vifmrc +++ b/vifm/.vifm/vifmrc @@ -1,5 +1,3 @@ -colorscheme default.vifm - set fastrun set fusehome=/tmp/vifm_FUSE set history=100 diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 0a470c6..223ccf4 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -16,3 +16,4 @@ interfacial inkjet microfluidic spinodal +Sobolev diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl Binary files differindex 8d3eaa2..dafacb7 100644 --- a/vim/.vim/spell/en.utf-8.add.spl +++ b/vim/.vim/spell/en.utf-8.add.spl @@ -1,14 +1,18 @@ -"" Download vim-plug if necessary +"" Download vim-plug if necessary {{{ if empty(glob('~/.vim/autoload/plug.vim')) silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif +" }}} +"" Leader and Localleader {{{ let mapleader = " " -let maplocalleader = "\\" - -"" Plugins +let maplocalleader = "," +" }}} +"" Plugins {{{ call plug#begin('~/.vim/plugged') +" Plug 'kopischke/vim-stay' + Plug 'LnL7/vim-nix' Plug 'PotatoesMaster/i3-vim-syntax' Plug 'SirVer/ultisnips' @@ -76,8 +80,8 @@ Plug 'junegunn/seoul256.vim' Plug 'romainl/Apprentice' Plug 'josuegaleas/jay' call plug#end() - -"" Plugin mappings +" }}} +"" Plugin mappings {{{ " Toggles nnoremap cpg :GitGutterToggle<cr> @@ -103,8 +107,6 @@ nnoremap <c-p>l :BLines<cr> nnoremap <c-p>m :Marks<cr> nnoremap <c-p>t :Tags<cr> -imap <c-x><c-f> <plug>(fzf-complete-file) - " LLDB nnoremap <c-d>n :LLsession new<cr> nnoremap <c-d>b <Plug>LLBreakSwitch @@ -145,26 +147,18 @@ nnoremap gm :Neomake!<cr> if &runtimepath =~ 'neomake' call neomake#configure#automake('w') endif - -"" Plugin configurations +" }}} +"" Plugin configurations {{{ " Airline let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing', 'mixed-indent-file' ] +let g:airline#extensions#tabline#show_splits = 0 let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#tab_nr_type = 1 let g:airline#extensions#tabline#formatter = 'unique_tail' let g:airline#extensions#tabline#tab_min_count = 2 let g:airline#extensions#tabline#show_buffers = 0 - -if !exists('g:airline_symbols') - let g:airline_symbols = {} -endif - -let g:airline_symbols.crypt = '' -let g:airline_symbols.linenr = '' -let g:airline_symbols.maxlinenr = '' -let g:airline_symbols.branch = '' -let g:airline_symbols.whitespace = '' +let g:airline_symbols_ascii = 1 " Deoplete / neocomplete let g:deoplete#enable_at_startup = 1 @@ -246,12 +240,13 @@ function! Multiple_cursors_after() endif endfunction -"" Vim variables +" }}} +"" Vim variables {{{ let g:netrw_bufsettings='relativenumber' let g:tex_conceal= '' let g:tex_flavor='latex' - -"" Vim options +" }}} +"" Vim options {{{ set complete+=k set conceallevel=2 set cursorline @@ -286,8 +281,8 @@ endif if has("nvim") set inccommand=split endif - -"" Mappings +" }}} +"" Mappings {{{ nmap n nzz nmap N Nzz @@ -343,35 +338,36 @@ if has("nvim") nnoremap <c-_> :b # \| norm A<cr> tnoremap <c-_> <c-\><c-n><c-^> endif - - -"" Colorscheme +" }}} +"" Colorscheme {{{ let g:airline_theme='deus' colo seoul256 - - -"" Autocommands +" }}} +"" Autocommands {{{ augroup vimrc autocmd! au BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 - au BufNewFile,BufRead *.geo,*.msh setf gmsh - au BufNewFile,BufRead *.pde setf freefem - au BufNewFile,BufRead *.plt setf gnuplot - au FileType gmsh setlocal makeprg=gmsh\ % - au FileType gnuplot setlocal makeprg=gnuplot\ % - au FileType gnuplot setlocal commentstring=#%s - au FileType freefem comp freefem - au FileType dirvish setlocal relativenumber - au FileType tex set spell au BufWritePost *vimrc :source % au BufWritePre * \ if !isdirectory(expand('<afile>:p:h')) | \ call mkdir(expand('<afile>:p:h'), 'p') | \ endif -augroup END + " Detect filetypes (! 'setf freefem' does not override...) + au BufNewFile,BufRead *.geo,*.msh set filetype=gmsh + au BufNewFile,BufRead *.pde set filetype=freefem + au BufNewFile,BufRead *.plt set filetype=gnuplot -"" My search + " Filetype specific + au FileType gmsh setlocal makeprg=gmsh\ % + au FileType gnuplot setlocal makeprg=gnuplot\ % + au FileType gnuplot setlocal commentstring=#%s + au FileType freefem comp freefem + au FileType dirvish setlocal relativenumber + au FileType tex set spell +augroup END +" }}} +"" My search {{{ if executable("ag") set grepprg=ag\ --vimgrep set grepformat=%f:%l:%c:%m @@ -406,3 +402,4 @@ endfunction nmap <silent> co/ :call Cycle_searchprg()<cr> nmap <silent> g/ :set opfunc=My_search<cr>g@ xmap <silent> g/ :call Search(visualmode())<cr> +"}}} |