diff options
| -rw-r--r-- | .config/beets/config.yaml | 8 | ||||
| -rw-r--r-- | .config/mpv/config | 1 | ||||
| -rw-r--r-- | .config/pms/rc | 2 | ||||
| -rw-r--r-- | .vim/colors/shmibs.vim | 5 | ||||
| -rw-r--r-- | .vimrc | 55 | ||||
| -rw-r--r-- | .xinitrc | 3 |
6 files changed, 60 insertions, 14 deletions
diff --git a/.config/beets/config.yaml b/.config/beets/config.yaml index 94ceaeb..9ed313a 100644 --- a/.config/beets/config.yaml +++ b/.config/beets/config.yaml @@ -21,7 +21,13 @@ match: # PLUGINS # ############# -plugins: discogs fetchart fuzzy info mpdupdate scrub +plugins: convert discogs fetchart fuzzy info mpdupdate scrub + +convert: + auto: no + copy_album_art: no + embed: no + never_convert_lossy_files: yes fetchart: auto: yes diff --git a/.config/mpv/config b/.config/mpv/config index 40c0288..31122a5 100644 --- a/.config/mpv/config +++ b/.config/mpv/config @@ -4,6 +4,7 @@ fs=yes ass-hinting=native vo=opengl-hq slang=en,eng +framedrop=no # audio alang=jp,jpn,jap,en,eng diff --git a/.config/pms/rc b/.config/pms/rc index e46c409..07cec86 100644 --- a/.config/pms/rc +++ b/.config/pms/rc @@ -2,10 +2,12 @@ set startuplist=library set playmode=random set scroll=centered +set sort=track disc album set ignorecase set noregexsearch + unmap F1 unmap h diff --git a/.vim/colors/shmibs.vim b/.vim/colors/shmibs.vim index 869e6c1..d4d5bfb 100644 --- a/.vim/colors/shmibs.vim +++ b/.vim/colors/shmibs.vim @@ -10,6 +10,10 @@ hi! Constant ctermfg=red hi! CursorLine ctermfg=NONE ctermbg=236 cterm=NONE hi! CursorLineNr ctermfg=white ctermbg=236 cterm=bold hi! Directory ctermfg=cyan +hi! DiffAdd ctermfg=green ctermbg=NONE cterm=bold +hi! DiffDelete ctermfg=red ctermbg=NONE cterm=bold +hi! DiffChange ctermfg=NONE ctermbg=NONE +hi! DiffText ctermfg=magenta ctermbg=NONE cterm=bold hi! Folded ctermfg=240 ctermbg=NONE hi! Identifier cterm=bold ctermfg=cyan hi! NonText ctermfg=yellow ctermbg=234 cterm=bold @@ -22,6 +26,7 @@ hi! SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi! Special ctermfg=magenta hi! SpecialKey ctermfg=green hi! SpellBad ctermfg=NONE ctermbg=NONE cterm=underline +hi! SpellRare ctermfg=NONE ctermbg=NONE hi! Title ctermfg=magenta hi! Todo ctermfg=black ctermbg=yellow hi! Type ctermfg=green @@ -25,7 +25,6 @@ set spelllang=en_gb set guifont=Tamsyn\ 11 set guioptions=aegimt - "visual marker for overflowing the 80th column highlight Column80 ctermbg=black call matchadd('Column80', '\%81v', 100) @@ -78,12 +77,17 @@ nnoremap fc zC nnoremap fm zM nnoremap fr zR +"buffer-handling +nnoremap <C-j> :bn<CR> +nnoremap <C-k> :bp<CR> +nnoremap <C-g> :buffers<CR>:b<Space> + "copy words from above and below the cursor inoremap <expr> <C-y> pumvisible() ? "\<C-y>" : matchstr(getline(line('.')-1), '\%' . virtcol('.') . 'v\%(\k\+\\|.\)') inoremap <expr> <C-e> pumvisible() ? "\<C-e>" : matchstr(getline(line('.')+1), '\%' . virtcol('.') . 'v\%(\k\+\\|.\)') "use the X clipboard for things when running in a virtual terminal, because yes -if &term != "linux" +if &term != "linux" && has('clipboard') nnoremap <expr> y (v:register ==# '"' ? '"+' : '') . 'y' nnoremap <expr> Y (v:register ==# '"' ? '"+' : '') . 'Y' xnoremap <expr> y (v:register ==# '"' ? '"+' : '') . 'y' @@ -108,6 +112,9 @@ end "always use rust instead of hercules au BufNewFile,BufRead *.rs set filetype=rust +"always use LaTeX +au BufNewFile,BufRead *.tex set filetype=tex + "annoying syntax-related values that need to be set before files are "opened let g:c_no_comment_fold = 1 @@ -123,10 +130,11 @@ autocmd FileType tex call Settings_tex() autocmd FileType haskell call Settings_haskell() autocmd FileType make call Settings_script() autocmd FileType matlab call Settings_matlab() +autocmd FileType nim call Settings_nim() autocmd FileType perl call Settings_script() autocmd FileType python call Settings_script() autocmd FileType ruby call Settings_script() -autocmd FileType rust call Settings_c() +autocmd FileType rust call Settings_rust() autocmd FileType sh call Settings_script() autocmd FileType vim call Settings_vim() autocmd FileType zsh call Settings_script() @@ -135,7 +143,7 @@ function! Settings_asm() "settings setlocal foldmethod=syntax "mappings - nnoremap -- A<Tab>;<Space> + nnoremap <buffer> -- A<Tab>;<Space> endfunction function! Settings_c() @@ -144,20 +152,34 @@ function! Settings_c() setlocal shiftwidth=4 setlocal tabstop=4 "mappings - nnoremap <Leader>c :!make<CR> - nnoremap -- O<Space>*/<Esc>hhi/*<Space> + nnoremap <buffer> - O<Space>*/<Esc>hhi/*<Space> endfunction function! Settings_haskell() "settings "mappings - nnoremap -- O--<Space> + nnoremap <buffer> -- O--<Space> endfunction function! Settings_matlab() "settings "mappings - nnoremap -- O%<Space> + nnoremap <buffer> -- O%<Space> +endfunction + +function! Settings_nim() + call Settings_script() + function! JumpToDef() + if exists("*GotoDefinition_" . &filetype) + call GotoDefinition_{&filetype}() + else + execute "norm! <C-]>" + endif + endfunction + "mappings + nnoremap <buffer> <M-g> :call JumpToDef()<cr> + inoremap <buffer> <M-g> <esc>:call JumpToDef()<cr>i + nnoremap <buffer> -_ O##<Space> endfunction function! Settings_script() @@ -165,7 +187,12 @@ function! Settings_script() setlocal shiftwidth=4 setlocal tabstop=4 "mappings - nnoremap -- O#<Space> + nnoremap <buffer> -- O#<Space> +endfunction + +function! Settings_rust() + call Settings_c() + nnoremap <buffer> -_ O///<Space> endfunction function! Settings_tex() @@ -178,13 +205,15 @@ function! Settings_tex() setlocal spell let g:tex_comment_nospell=1 "mappings - nnoremap -- O%<Space> - nnoremap <Leader>c :!latex -output-format=pdf "%"<CR><CR> - nnoremap <Leader>C :!latex -output-format=pdf "%"<CR> + nnoremap <buffer> -- O%<Space> + nnoremap <buffer> <Leader>c :!latex -output-format=pdf "%"<CR><CR> + nnoremap <buffer> <Leader>C :!latex -output-format=pdf "%"<CR> endfunction function! Settings_vim() "settings + setlocal shiftwidth=4 + setlocal tabstop=4 "mappings - nnoremap -- O" + nnoremap <buffer> -- O" endfunction @@ -22,6 +22,9 @@ fcitx & sxiv -c export XDG_CACHE_HOME=/home/shmibs/.cache +#clear vimtags +rm ~/.vimtags + #load local fonts xset +fp /usr/share/fonts/local xset fp rehash |