From fcb458e4fa9e9702df1837dc244498539e3e83f6 Mon Sep 17 00:00:00 2001 From: kageru Date: Mon, 30 Nov 2020 11:38:53 +0100 Subject: [PATCH] Lots of updates --- .config/alacritty/alacritty.yml | 19 +-- .config/htop/htoprc | 5 +- .config/i3/config | 21 ++- .config/mpv/input.conf | 5 +- .config/mpv/mpv.conf | 27 +++- .config/polybar/config | 22 +-- .config/zathura/zathurarc | 2 +- .config/zsh/aliases.sh | 12 +- .vimrc | 230 ++++++++++++++++++++++++++++---- .zshrc | 65 +++------ bin/autostart | 16 ++- 11 files changed, 299 insertions(+), 125 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 643398a..9e7d104 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -54,24 +54,24 @@ draw_bold_text_with_bright_colors: true font: # The normal (roman) font face to use. normal: - family: Hack # should be "Menlo" or something on macOS. + family: Hack Nerd Font Mono # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. - # style: Regular + style: Regular # The bold font face bold: - family: Hack # should be "Menlo" or something on macOS. + family: Hack Nerd Font Mono # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. - style: Regular + style: Bold # The italic font face italic: - family: Hack # should be "Menlo" or something on macOS. + family: Hack Nerd Font Mono # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. - style: Regular + style: Italic # Point size of the font - size: 15.0 + size: 13.0 # Offset is the extra space around each character. offset.y can be thought of # as modifying the linespacing, and offset.x as modifying the letter spacing. @@ -97,7 +97,8 @@ cursor: colors: # Default colors primary: - background: '0x403e41' + #background: '0x403e41' + background: '0x303031' foreground: '0xfcfcfa' # Colors the cursor will use if `custom_cursor_colors` is true @@ -159,7 +160,7 @@ colors: # # To completely disable the visual bell, set its duration to 0. # -visual_bell: +bell: animation: EaseOutExpo duration: 0 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 99b909a..3ba46b4 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -15,10 +15,13 @@ highlight_threads=1 tree_view=0 header_margin=1 detailed_cpu_time=0 -cpu_count_from_zero=1 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=1 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=5 +enable_mouse=1 delay=15 left_meters=AllCPUs2 Memory CPU Tasks left_meter_modes=1 1 2 2 diff --git a/.config/i3/config b/.config/i3/config index 7c3bc0a..2047d1f 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -73,10 +73,10 @@ floating_modifier $mod bindsym $mod+Return exec alacritty # kill focused window -bindsym $mod+Shift+q kill +bindsym $mod+q kill # start program launcher -bindsym $mod+d exec --no-startup-id rofi -show run +bindsym $mod+d exec --no-startup-id dmenu_run ################################################################################################ ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ## @@ -137,7 +137,7 @@ bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_ # split orientation bindsym $mod+g split h bindsym $mod+v split v -bindsym $mod+q split toggle +# bindsym $mod+q split toggle # toggle fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -196,15 +196,10 @@ set $ws19 十九 # default screens #workspace $ws1 output DP-0 -workspace $ws1 output DVI-D-0 -workspace $ws11 output DVI-D-0 -workspace $ws2 output DP-0 -workspace $ws12 output DP-0 -workspace $ws3 output DVI-D-0 -workspace $ws13 output DVI-D-0 -workspace $ws4 output DVI-D-0 -workspace $ws18 output HDMI-0 -workspace $ws19 output HDMI-0 +#workspace $ws1 output HDMI-1 +workspace $ws2 output DP-2 +workspace $ws3 output HDMI-1 +workspace $ws4 output DP-2 # switch to workspace bindsym $mod+1 workspace $ws1 @@ -344,7 +339,7 @@ mode "resize" { # Lock screen -bindsym $mod+9 exec --no-startup-id i3lock -i ~/Pictures/bg.png -ut +bindsym $mod+9 exec --no-startup-id i3lock -i ~/Pictures/bg.png -t # Autostart applications exec ~/bin/autostart diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index 6f70616..229eb65 100755 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -13,8 +13,7 @@ RIGHT osd-bar seek 5 relative+exact # This displays statistics of the currently played file i show_text "${osd-ass-cc/0}{\\fs11}{\\fnSource Sans Pro}{\\bord1}{\\3c&H262626&}{\\alpha&H11}\\N{\\b1}File:{\\b0}\\h\\h${osd-ass-cc/1}${filename}${osd-ass-cc/0}\\N\\h\\h\\h\\h\\h{\\b1}${?media-title:Title:\\h\\h}{\\b0}${osd-ass-cc/1}${?media-title:${media-title}}${osd-ass-cc/0}${?chapter:\\N\\h\\h\\h\\h\\h}{\\b1}${?chapter:Chapter:\\h\\h}{\\b0}${osd-ass-cc/1}${?chapter:${chapter}}${osd-ass-cc/0}${?cache-used:\\N\\h\\h\\h\\h\\h}{\\b1}${?cache-used:Cache:\\h\\h}{\\b0}${?cache-used:${cache-used}\\h\\h+${demuxer-cache-duration} sec}\\N\\N{\\b1}Video:{\\b0}\\h\\h${video-codec}\\N\\h\\h\\h\\h\\h{\\b1}A-V:{\\b0}\\h\\h${avsync}\\N\\h\\h\\h\\h\\h{\\b1}Dropped:{\\b0}\\h\\h${drop-frame-count}\\h\\h\\h\\h\\h{\\b1}VO:{\\b0}\\h\\h${vo-drop-frame-count}\\N\\h\\h\\h\\h\\h{\\b1}FPS:{\\b0}\\h\\h${fps} (specified)\\h\\h${estimated-vf-fps} (estimated)\\N\\h\\h\\h\\h\\h{\\b1}Native Resolution:{\\b0}\\h\\h${video-params/w} x ${video-params/h}\\N\\h\\h\\h\\h\\h{\\b1}Window Scale:{\\b0}\\h\\h${window-scale}\\N\\h\\h\\h\\h\\h{\\b1}Aspect Ratio:{\\b0}\\h\\h${video-params/aspect}\\N\\h\\h\\h\\h\\h{\\b1}Pixel format:{\\b0}\\h\\h${video-params/pixelformat}\\N\\h\\h\\h\\h\\h{\\b1}Colormatrix:{\\b0}\\h\\h${video-params/colormatrix}\\N\\h\\h\\h\\h\\h{\\b1}Primaries:{\\b0}\\h\\h${video-params/primaries}\\N\\h\\h\\h\\h\\h{\\b1}Levels:{\\b0}\\h\\h${video-params/colorlevels}${?packet-video-bitrate:${!=packet-video-bitrate==0:\\N\\h\\h\\h\\h\\h}}{\\b1}${?packet-video-bitrate:${!=packet-video-bitrate==0:Bitrate:\\h\\h}}{\\b0}${?packet-video-bitrate:${!=packet-video-bitrate==0:${packet-video-bitrate} kbps}}\\N\\N{\\b1}Audio:{\\b0}\\h\\h${audio-codec}\\N\\h\\h\\h\\h\\h{\\b1}Sample Rate:{\\b0}\\h\\h${audio-params/samplerate}\\N\\h\\h\\h\\h\\h{\\b1}Channels:{\\b0}\\h\\h${audio-params/channel-count}${?packet-audio-bitrate:${!=packet-audio-bitrate==0:\\N\\h\\h\\h\\h\\h}}{\\b1}${?packet-audio-bitrate:${!=packet-audio-bitrate==0:Bitrate:\\h\\h}}{\\b0}${?packet-audio-bitrate:${!=packet-audio-bitrate==0:${packet-audio-bitrate} kbps}}" 8000 -#h add sub-delay -0.041708333333 -#l add sub-delay 0.041708333333 +y add sub-delay -0.041708333333 +x add sub-delay 0.041708333333 j add sub-pos 1 k add sub-pos -1 - diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 9bc3d91..741c630 100755 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,10 +1,11 @@ #Allgemein vo=gpu #gpu-context=open-gl -gpu-api=opengl +gpu-api=auto profile=gpu-hq #hwdec=auto-copy spirv-compiler=shaderc +slang=ger,enm,eng #force-window=yes osd-playing-msg=playing: ${media-title} ${!window-scale==1.000:(scale: ${window-scale})} @@ -49,11 +50,11 @@ cscale=haasnsoft #cscale-antiring=0.7 #Interpolation -opengl-waitvsync=yes -interpolation=yes +opengl-waitvsync=no +interpolation=no blend-subtitles=yes #interpolation-threshold=0.01 -video-sync=display-resample +#video-sync=display-resample tscale=box tscale-window=sphinx tscale-radius=1.0 @@ -63,6 +64,22 @@ tscale-clamp=0.0 #vf-defaults=yadif #deinterlace=auto +## subtitles +sub-font=Fontin Sans Rg +sub-bold=yes +sub-font-size=47 +sub-border-size=3.2 +sub-pos=98 +sub-blur=0.2 +sub-gray=yes +sub-fix-timing=yes +sub-ass-force-margins=yes +# cycle with `u` +# sub-ass-override=yes +# this doesn't seem to do anything +# sub-ass-force-style=FontName=Fontin Sans Rg,bold=0,fontsize=172,marginv=80,marginr=300,marginl=300,borderStyle=1,outline=4.0,shadow=0,primarycolour=&H00FFFFFF,outlinecolour=&H00000000,playresx=1920,playresy=1080 +demuxer-mkv-subtitle-preroll=index + [encode] scale=spline36 cscale=spline36 @@ -93,7 +110,7 @@ glsl-shader="~/.config/mpv/shaders/fsrcnnx16.glsl" [db] deband=yes -deband-iterations=2 +deband-iterations=1 deband-threshold=80 deband-range=16 deband-grain=0 diff --git a/.config/polybar/config b/.config/polybar/config index 2ad239c..0bf78a6 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -68,12 +68,12 @@ scroll-down = i3wm-wsprev cursor-click = pointer [bar/left] -monitor = ${env:MONITOR:DVI-D-0} +monitor = ${env:MONITOR:HDMI-1} width = 100% -height = 22 +height = 28 radius = 0.0 fixed-center = true -bottom = true +bottom = false background = ${colors.background} foreground = ${colors.foreground} @@ -90,9 +90,9 @@ padding-right = 2 module-margin-left = 1 module-margin-right = 2 -font-0 = "Noto Sans CJK JP:size=11;1" -font-1 = "Wuncon Siji:size=11;1" -font-2 = "Noto Sans CJK JP:size=11;1" +font-0 = "Noto Sans CJK JP:size=14;1" +font-1 = "Wuncon Siji:size=14;1" +font-2 = "Noto Sans CJK JP:size=14;1" modules-left = i3 mpd modules-center = @@ -109,9 +109,9 @@ scroll-down = i3wm-wsprev cursor-click = pointer [bar/main] -monitor = ${env:MONITOR:DP-0} +monitor = ${env:MONITOR:DP-2} width = 100% -height = 28 +height = 25 offset-x = 0% offset-y = 0% radius = 0.0 @@ -133,9 +133,9 @@ padding-right = 2 module-margin-left = 1 module-margin-right = 2 -font-0 = "Noto Sans CJK JP:size=13;1" -font-1 = "Wuncon Siji:size=13;1" -font-2 = "Noto Sans CJK JP:size=13;1" +font-0 = "Noto Sans CJK JP:size=11;1" +font-1 = "Wuncon Siji:size=11;1" +font-2 = "Noto Sans CJK JP:size=11;1" modules-left = i3 mpd modules-center = diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 24fa471..2eca8ea 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -31,6 +31,6 @@ set completion-highlight-bg "#EBCB8B" set recolor-lightcolor "#313132" set recolor-darkcolor "#c5c8c6" -set recolor "true" +set recolor "false" set recolor-keephue "false" diff --git a/.config/zsh/aliases.sh b/.config/zsh/aliases.sh index 75a5e37..7ddd3ab 100644 --- a/.config/zsh/aliases.sh +++ b/.config/zsh/aliases.sh @@ -5,8 +5,7 @@ alias define='python /home/kageru/programming/mwebster/mwebster.py' alias nanaone-stream='mpv rtmp://live1.brb.re/live/nanaone' alias ls=exa alias du=dua -alias sed=sd -alias fzf=skim +#alias fzf=sk alias up='sudo pacman -Syu' alias in='sudo pacman -S' alias feg=feh # don’t ask @@ -28,7 +27,6 @@ alias grep="grep --colour" alias clip='xsel -b' alias bitrateviewer='wine "/home/kageru/.wine/drive_c/Program Files (x86)/BitrateViewer/BitrateViewer.exe"' alias colorpicker="maim -sot 0 | convert - -resize 1x1\! -format '%[pixel:p{0,0}]' info:-" -alias fixgit='eval "$(ssh-agent -s)"; ssh-add ~/.ssh/git' alias sv='systemctl' alias xo='xdg-open' alias resetgamma='xrandr --output DVI-D-0 --gamma 1:1:1 --output HDMI-1 --gamma 1:1:1 --output HDMI-0 --gamma 1:1:1 --output DP-0 --gamma 1:1:1' @@ -44,6 +42,8 @@ alias gco='git checkout' alias gs='git switch' alias gsc='git switch -c' alias gr='git restore' +alias gcp='git cherry-pick' +alias gl='git log' alias blps='~/.steam/steam/steamapps/common/BorderlandsPreSequel/BorderlandsPreSequel' alias dir2flac='for f in *.wav; do ffmpeg -i "$f" -compression_level 12 "`basename "$f" .wav`.flac" @@ -65,9 +65,11 @@ alias :wq='exit' alias sprunge="curl -F 'sprunge=<-' http://sprunge.us" -# Aliases for SSH connections (raspi, remote server, etc.) +# Aliases for SSH connections (mount sshfs, mac IDs for WoL, etc) [ -f ~/.config/zsh/ssh.sh ] && source ~/.config/zsh/ssh.sh paste() { - curl -F"file=@$1" | xsel -b + curl -F"file=@$1" https://p.kageru.moe | xsel -b } + +alias dark='xset dpms force off' diff --git a/.vimrc b/.vimrc index a857b4b..2a1ec5c 100644 --- a/.vimrc +++ b/.vimrc @@ -8,7 +8,7 @@ call plug#begin('~/.vim/plugged') Plug 'scrooloose/syntastic' Plug 'rust-lang/rust.vim' Plug 'fatih/vim-go' -Plug 'udalov/kotlin-vim' +Plug 'kageru/kotlin-vim' "Plug 'Valloric/YouCompleteMe' Plug 'phanviet/vim-monokai-pro' Plug 'cespare/vim-toml' @@ -16,19 +16,24 @@ Plug 'sirver/UltiSnips' Plug 'honza/vim-snippets' Plug 'lotabout/skim', { 'dir': '~/.skim', 'do': './install' } Plug 'lotabout/skim.vim' -Plug 'ervandew/supertab' +"Plug 'ervandew/supertab' +Plug 'powerline/powerline' +Plug 'elmcast/elm-vim' +Plug 'tpope/vim-fugitive' +Plug 'mileszs/ack.vim' " rp call thing for auto completion with language servers -Plug 'roxma/nvim-yarp' +"Plug 'roxma/nvim-yarp' " language client stuff -Plug 'autozimu/LanguageClient-neovim', { - \ 'branch': 'next', - \ 'do': 'bash install.sh', - \ } -Plug 'ncm2/ncm2' -Plug 'ncm2/ncm2-jedi' -Plug 'ncm2/ncm2-ultisnips' -Plug 'ncm2/ncm2-racer' +"Plug 'autozimu/LanguageClient-neovim', { + "\ 'branch': 'next', + "\ 'do': 'bash install.sh', + "\ } +Plug 'neoclide/coc.nvim', {'branch': 'release'} +"Plug 'ncm2/ncm2' +"Plug 'ncm2/ncm2-jedi' +"Plug 'ncm2/ncm2-ultisnips' +"Plug 'ncm2/ncm2-racer' "Plug 'zxqfl/tabnine-vim' @@ -40,14 +45,18 @@ call plug#end() "set rtp+=~/code/tabnine-vim filetype plugin on autocmd BufNewFile,BufRead *.vpy setfiletype python -autocmd BufNewFile,BufRead *.kt set ft=kotlin +autocmd BufNewFile,BufRead *.kt setfiletype kotlin " for ncm2 completion -autocmd BufEnter * call ncm2#enable_for_buffer() -set completeopt=noinsert,menuone,noselect +"autocmd BufEnter * call ncm2#enable_for_buffer() +"set completeopt=noinsert,menuone,noselect " When the key is pressed while the popup menu is visible, it only " hides the menu. Use this mapping to close the menu and also start a new line. -inoremap (pumvisible() ? "\\" : "\") +"inoremap (pumvisible() ? "\\" : "\") +" Use to select the popup menu: +"imap +"inoremap pumvisible() ? "\" : "\" +"inoremap pumvisible() ? "\" : "\" " Required for operations modifying multiple buffers like rename. set hidden @@ -61,14 +70,14 @@ let g:LanguageClient_serverCommands = { \ 'go': ['gopls'], \ 'kotlin': ['/usr/bin/kotlin-language-server'], \ 'c': ['/usr/bin/ccls'], - \ 'java': ['jdtls'], + \ 'elm': ['/home/kageru/build/node_modules/.bin/elm-language-server'], \ } -nnoremap :call LanguageClient_contextMenu() +"nnoremap :call LanguageClient_contextMenu() " Or map each action separately -nnoremap K :call LanguageClient#textDocument_hover() -nnoremap gd :call LanguageClient#textDocument_definition() -nnoremap :call LanguageClient#textDocument_rename() +"nnoremap K :call LanguageClient#textDocument_hover() +"nnoremap gd :call LanguageClient#textDocument_definition() +"nnoremap :call LanguageClient#textDocument_rename() set number set showmatch @@ -81,10 +90,10 @@ set incsearch set autoindent set cindent set expandtab -set shiftwidth=4 +set shiftwidth=2 set smartindent set smarttab -set softtabstop=4 +set softtabstop=2 set relativenumber " set beam cursor in insert mode @@ -108,14 +117,15 @@ let g:netrw_banner = 0 let g:netrw_browse_split = 4 let g:netrw_winsize = 15 nmap :Vexplore -nmap :RustFmt +autocmd BufNewFile,BufRead *.rs nmap :RustFmt +autocmd BufNewFile,BufRead *.elm nmap :ElmFormat set statusline+=%#warningmsg# set statusline+=%{SyntasticStatuslineFlag()} set statusline+=%* -let g:syntastic_always_populate_loc_list = 0 +let g:syntastic_always_populate_loc_list = 1 let g:syntastic_auto_loc_list = 1 let g:syntastic_check_on_open = 0 let g:syntastic_check_on_wq = 0 @@ -123,6 +133,16 @@ let g:syntastic_check_on_write = 0 let g:syntastic_mode_map = { 'mode': 'passive' } nmap :SyntasticCheck +let g:elm_syntastic_show_warnings = 1 +let g:ycm_semantic_triggers = { + \ 'elm' : ['.'], + \} + +let g:LanguageClient_rootMarkers = { + \ 'elm': ['elm.json'], + \ } + + nnoremap j nnoremap k "nnoremap l @@ -135,3 +155,165 @@ nmap :Files imap :Files nmap :BLines nmap :Lines +nmap :Buffers +imap :Buffers + +let g:powerline_pycmd="py3" + +let g:ackprg = 'rg --vimgrep --smart-case' +let g:ack_autoclose = 1 +let g:ack_use_cword_for_empty_search = 1 +nnoremap / :Ack! + +" COC stuff from here + + +" Some servers have issues with backup files, see #649. +set nobackup +set nowritebackup + +" Give more space for displaying messages. +"set cmdheight=2 + +" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable +" delays and poor user experience. +set updatetime=300 + +" Don't pass messages to |ins-completion-menu|. +set shortmess+=c + +if has("patch-8.1.1564") + " Recently vim can merge signcolumn and number column into one + set signcolumn=number +else + set signcolumn=yes +endif + +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by +" other plugin before putting this into your config. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +if has('nvim') + inoremap coc#refresh() +else + inoremap coc#refresh() +endif + +" Use to confirm completion, `u` means break undo chain at current +" position. Coc only does snippet and additional edit on confirm. +" could be remapped by other vim plugin, try `:verbose imap `. +if exists('*complete_info') + inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" +else + inoremap pumvisible() ? "\" : "\u\" +endif + +" Use `[g` and `]g` to navigate diagnostics +" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" GoTo code navigation. +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window. +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +nmap rn (coc-rename) +nmap F6 (coc-rename) + +" Formatting selected code. +xmap f (coc-format-selected) +nmap f (coc-format-selected) + +augroup mygroup + autocmd! + " Setup formatexpr specified filetype(s). + autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') + " Update signature help on jump placeholder. + autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') +augroup end + +" Applying codeAction to the selected region. +" Example: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap keys for applying codeAction to the current buffer. +nmap ac (coc-codeaction) +" Apply AutoFix to problem on the current line. +nmap qf (coc-fix-current) + +" Map function and class text objects +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +xmap if (coc-funcobj-i) +omap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap af (coc-funcobj-a) +xmap ic (coc-classobj-i) +omap ic (coc-classobj-i) +xmap ac (coc-classobj-a) +omap ac (coc-classobj-a) + +" Use CTRL-S for selections ranges. +" Requires 'textDocument/selectionRange' support of language server. +nmap (coc-range-select) +xmap (coc-range-select) + +" Add `:Format` command to format current buffer. +command! -nargs=0 Format :call CocAction('format') + +" Add `:Fold` command to fold current buffer. +command! -nargs=? Fold :call CocAction('fold', ) + +" Add `:OR` command for organize imports of the current buffer. +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add (Neo)Vim's native statusline support. +" NOTE: Please see `:h coc-status` for integrations with external plugins that +" provide custom statusline: lightline.vim, vim-airline. +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Mappings for CoCList +" Show all diagnostics. +nnoremap a :CocList diagnostics +" Manage extensions. +nnoremap e :CocList extensions +" Show commands. +nnoremap c :CocList commands +" Find symbol of current document. +nnoremap o :CocList outline +" Search workspace symbols. +nnoremap s :CocList -I symbols +" Do default action for next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list. +nnoremap p :CocListResume diff --git a/.zshrc b/.zshrc index 5399298..79dc6fb 100644 --- a/.zshrc +++ b/.zshrc @@ -1,6 +1,10 @@ export GOPATH=~/go export PATH=$PATH:~/bin:~/go/bin +#:/opt/devkitpro/devkitARM/bin:/opt/devkitpro/tools/bin export RUSTFLAGS="-C target-cpu=native" +export DEVKITPRO=/opt/devkitpro +export DEVKITARM=/opt/devkitpro/devkitARM +export DEVKITPPC=/opt/devkitpro/devkitPPC #export PAGER=nvimpager [ -f ~/.config/zsh/aliases.sh ] && source ~/.config/zsh/aliases.sh @@ -11,13 +15,6 @@ HISTSIZE=100000 setopt appendhistory -source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh - -#bindkey '^[[A' history-substring-search-up -#bindkey '^[[B' history-substring-search-down -#bindkey -M vicmd 'k' history-substring-search-up -#bindkey -M vicmd 'j' history-substring-search-down - autoload -Uz vcs_info autoload -U colors && colors zstyle ':vcs_info:*' stagedstr "${fg_blue}?" @@ -26,22 +23,24 @@ zstyle ':vcs_info:*' check-for-changes true zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r' zstyle ':vcs_info:*' enable git -precmd () { - if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] { - zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${at_normal}" - } else { - zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${fg_red}!${at_normal}" - } - vcs_info -} +# no longer needed because starship handles the git stuff +# precmd () { + #if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] { + #zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${at_normal}" + #} else { + #zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${fg_red}!${at_normal}" + #} + #vcs_info +#} -setopt prompt_subst +#setopt prompt_subst # I usually change the hostname color between my systems hostcolor="4" bgcolor="16" -PROMPT="%(!.%F{3}[%F{1}%n%F{3}@%F{$hostcolor}%m %F{3}%c%F{5}\${vcs_info_msg_0_}%F{3}] %(?/%F{2}/%F{1})#.\ -%F{1}[%F{3}%n%F{1}@%F{$hostcolor}%m %F{5}%c%F{4}\${vcs_info_msg_0_}%F{1}] %(?/%F{2}/%F{1}))%f " +eval "$(starship init zsh)" +#PROMPT="%(!.%F{3}[%F{1}%n%F{3}@%F{$hostcolor}%m %F{3}%c%F{5}\${vcs_info_msg_0_}%F{3}] %(?/%F{2}/%F{1})#.\ +#%F{1}[%F{3}%n%F{1}@%F{$hostcolor}%m %F{5}%c%F{4}\${vcs_info_msg_0_}%F{1}] %(?/%F{2}/%F{1}))%f " # the same prompt without git/vcs stuff #PROMPT="%(!.%F{3}[%F{1}%n%F{3}@%F{$hostcolor}%m %F{3}%c%F{5}%F{3}] %(?/%F{2}/%F{1})#.%F{1}[%F{3}%n%F{1}@%F{$hostcolor}%m %F{146}%c%F{111}%F{1}] %(?/%F{2}/%F{1})Δ)%f " @@ -67,8 +66,6 @@ fi export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock ssh-add -l > /dev/null || ssh-add -# disclaimer: I blatantly copied all of this without actually knowing what it does. ¯\_(ツ)_/¯ - ZSHCACHEDIR=/tmp/$USER-zsh-cache zstyle ':completion:*' completer _expand _complete _correct _approximate @@ -76,37 +73,9 @@ zstyle ':completion:*' expand prefix suffix zstyle ':completion:*' list-suffixes true # This line does the non-prefix matching magic zstyle ':completion:*' matcher-list '' '+m:{a-z}={A-Z}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*' -#zstyle ':completion:*' preserve-prefix '//[^/]##/' -#zstyle ':completion:*' use-cache on -#zstyle ':completion:*' cache-path $ZSHCACHEDIR -#zstyle ':completion:*:*:kill:*' menu yes select -#zstyle ':completion:*:kill:*' force-list always -#zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' -#zstyle ':completion:*:kill:*' command pids4kill -#zstyle ':completion:::::' completer _complete _approximate -#zstyle ':completion:*:approximate:*' max-errors 2 -#zstyle ':completion:*' completer _complete _prefix -#zstyle ':completion::prefix-1:*' completer _complete -#zstyle ':completion:incremental:*' completer _complete _correct -#zstyle ':completion:predict:*' completer _complete # Completion caching -#zstyle ':completion::complete:*' use-cache 1 -#zstyle ':completion::complete:*' cache-path $ZSHCACHEDIR/$HOST # Expand partial paths -#zstyle ':completion:*:functions' ignored-patterns '_*' -#zstyle ':completion:*' squeeze-slashes 'yes' # Include non-hidden directories in globbed file completions -#zstyle ':completion:*:complete:-command-::commands' ignored-patterns '*\~' # Separate matches into groups -#zstyle ':completion:*:matches' group 'yes' # Describe each match group. -#zstyle ':completion:*:descriptions' format "%B---- %d%b" # Messages/warnings format -#zstyle ':completion:*:messages' format '%B%U---- %d%u%b' -#zstyle ':completion:*:warnings' format '%B%U---- no match for: %d%u%b' # Describe options in full zstyle ':completion:*:options' description 'yes' zstyle ':completion:*:options' auto-description '%d' setopt nonomatch source /usr/share/fzf/key-bindings.zsh - -#BASE16_SHELL="$HOME/.config/base16-shell/" -#[ -n "$PS1" ] && \ -# [ -s "$BASE16_SHELL/profile_helper.sh" ] && \ -# eval "$("$BASE16_SHELL/profile_helper.sh")" -#~/.config/base16-shell/scripts/base16-onedark.sh diff --git a/bin/autostart b/bin/autostart index 96a566a..7470b30 100755 --- a/bin/autostart +++ b/bin/autostart @@ -6,12 +6,18 @@ cp ~/webpw.kdbx ~/Sync/webpw.kdbx fcitx sshfs -i ~/.ssh/lain lain:/home/kgt/download /mnt/lain -C & syncthing & -# xsetwacom --set 12 Area -14900 0 44400 16000 -xrandr --fb 6400x2520 --dpi 109x109 \ - --output DP-0 --mode 2560x1440 --rate 144 --pos 0x0 \ - --output HDMI-1 --mode 3840x2160 --pos 2560x0 \ - --output DVI-D-0 --mode 1920x1080 --rate 144 --pos 640x1440 +#xrandr --fb 6400x2520 --dpi 109x109 \ + #--output DP-0 --mode 2560x1440 --rate 144 --pos 0x0 \ + #--output HDMI-1 --mode 3840x2160 --right-of DP-0 \ + #--output DVI-D-0 --mode 1920x1080 --rate 144 --below DP-0 +xrandr --fb 5120x1440 --dpi 96 \ + --output HDMI-1 --mode 2560x1440 -r 120 --pos 0x0 \ + --output DP-2 --right-of HDMI-1 -r 240 --mode 2560x1440 #xrandr --fb 6400x2520 --output DP-0 --mode 2560x1440 --rate 144 --pos 0x0 --output DVI-D-0 --mode 1920x1080 --rate 144 --below DP-0 --output HDMI-0 --right-of DP-0 --dpi 109x109 +xsetwacom --set $(xsetwacom --list devices | grep STYLUS | awk '{print $7}') MapToOutput HEAD-1 +xsetwacom --set $(xsetwacom --list devices | grep STYLUS | awk '{print $7}') Area 0 0 11200 6300 +xsetwacom --set $(xsetwacom --list devices | grep STYLUS | awk '{print $7}') Suppress 0 +xsetwacom --set $(xsetwacom --list devices | grep STYLUS | awk '{print $7}') RawSample 1 ~/bin/fixkeyboard ~/.fehbg xrdb ~/.Xresources