Преглед изворни кода

add loc script + fix general stuff + add dmenu to xbindkeys config + disable codelens + add vimspector plugin + add resize.vim plugin + update xinitrc for chadwn bar.sh script

Noah Vogt пре 3 година
родитељ
комит
86e2aa4db2

+ 6 - 5
dot-config/X11/xinitrc

@@ -1,19 +1,23 @@
 #!/bin/sh
 
+# start with a black screen
+feh --bg-scale --no-fehbg "$XDG_DATA_HOME"/norisa/black.jpg
+
 # set keyboard layout to Swiss German
 setxkbmap ch
 
 # start hotkey daemon
 xbindkeys -f "$XDG_CONFIG_HOME"/xbindkeys/config &
 
-feh --bg-scale --no-fehbg "$XDG_DATA_HOME"/norisa/black.jpg
-
 # turn off BIOS beeper
 xset b off
 
 # set WM name (for Java apps)
 wmname LG3D
 
+# load chadwm bar
+~/.config/chadwm/scripts/bar.sh &
+
 # load notification deamon
 dunst &
 
@@ -32,9 +36,6 @@ for f in ${XDG_DATA_HOME:-$HOME/.local/share}/xmodmap/*; do xmodmap $f; done
 # set brightness
 brightnessctl -d $(brightnessctl -l | grep "class 'backlight'" | head -n 1 | awk '{print $2}' | tr -d "'") set $(cat ~/.config/norisa/brightness-state)%
 
-# load dwmblocks
-dwmblocks &
-
 # don't display mouse if not used recently
 unclutter &
 

+ 2 - 0
dot-config/aliasrc

@@ -100,6 +100,8 @@ alias rmexif="exiftool -overwrite_original -all="
 
 alias lf='lfub'
 
+alias loc='find -type f | xargs wc -l | sort -h'
+
 # fast dir switching
 s() {
     cd "$(ls -d ~/.local/src/* | fzf)"

+ 1 - 1
dot-config/norisa.local.default

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# this is a the default configuration file which needs to be copied to 
+# this is a the default configuration file which needs to be copied to
 # $XDG_CONFIG_HOME/norisa.local to be active on a individual machine. It is
 # intended to provide the possibility of certain machine-specific configuration
 # options, while still enabling the machine-agnostic configuration to be synced

+ 2 - 2
dot-config/nvim/coc-settings.json

@@ -31,8 +31,8 @@
       }
     }
   },
-  "codeLens.enable": true,
-  "java.referencesCodeLens.enabled": true,
+  //"codeLens.enable": true,
+  //"java.referencesCodeLens.enabled": true,
   "java.jdt.ls.vmargs": "-javaagent:/usr/local/share/lombok/lombok.jar",
   "snippets.userSnippetsDirectory": "~/.config/nvim/snips"
 }

+ 1 - 0
dot-config/nvim/init.vim

@@ -15,6 +15,7 @@ source $XDG_CONFIG_HOME/nvim/plug-conf/editorconfig.vim
 source $XDG_CONFIG_HOME/nvim/plug-conf/wilder.vim
 source $XDG_CONFIG_HOME/nvim/plug-conf/vcoolor.vim
 source $XDG_CONFIG_HOME/nvim/plug-conf/better-whitespace.vim
+source $XDG_CONFIG_HOME/nvim/plug-conf/vimspector.vim
 lua require 'treesitter'
 lua require 'indent-blankline'
 lua require 'telescope'

+ 20 - 2
dot-config/nvim/keys/bindings.vim

@@ -13,8 +13,8 @@ nnoremap <Leader>e :q<CR>
 " windows commands
 nnoremap <leader>pv :wincmd v<bar> :Ex <bar> :vertical resize 30<CR>
 nnoremap <leader>ps :Rg<CR>
-nnoremap <silent> <leader>+ :vertical resize +5<CR>
-nnoremap <silent> <leader>- :vertical resize -5<CR>
+nnoremap <leader>rh :vertical resize +5<CR>
+nnoremap <leader>rl :vertical resize -5<CR>
 
 " general custom commands
 command D filetype detect
@@ -207,3 +207,21 @@ let g:coc_snippet_prev = '<c-b>'
 
 " for both expand and jump (make expand higher priority.)
 imap <C-j> <Plug>(coc-snippets-expand-jump)
+
+nnoremap <leader>da :call vimspector#Launch()<CR>
+nnoremap <leader>dc :call GotoWindow(g:vimspector_session_windows.code)<CR>
+nnoremap <leader>dv :call GotoWindow(g:vimspector_session_windows.variables)<CR>
+nnoremap <leader>dw :call GotoWindow(g:vimspector_session_windows.watches)<CR>
+nnoremap <leader>ds :call GotoWindow(g:vimspector_session_windows.stack_trace)<CR>
+nnoremap <leader>do :call GotoWindow(g:vimspector_session_windows.output)<CR>
+nnoremap <leader>di :call AddToWatch()<CR>
+nnoremap <leader>dx :call vimspector#Reset()<CR>
+nnoremap <leader>dX :call vimspector#ClearBreakpoints()<CR>
+nnoremap <S-k> :call vimspector#StepOut()<CR>
+nnoremap <S-l> :call vimspector#StepInto()<CR>
+nnoremap <S-j> :call vimspector#StepOver()<CR>
+nnoremap <leader>d_ :call vimspector#Restart()<CR>
+nnoremap <leader>dn :call vimspector#Continue()<CR>
+nnoremap <leader>drc :call vimspector#RunToCursor()<CR>
+nnoremap <leader>dh :call vimspector#ToggleBreakpoint()<CR>
+nnoremap <leader>de :call vimspector#ToggleConditionalBreakpoint()<CR>

+ 29 - 0
dot-config/nvim/plug-conf/vimspector.vim

@@ -0,0 +1,29 @@
+fun! GotoWindow(id)
+    :call win_gotoid(a:id)
+endfun
+
+func! AddToWatch()
+    let word = expand("<cexpr>")
+    call vimspector#AddWatch(word)
+endfunction
+
+let g:vimspector_base_dir = expand('$HOME/.config/vimspector-config')
+let g:vimspector_sidebar_width = 60
+
+nnoremap <leader>da :call vimspector#Launch()<CR>
+nnoremap <leader>dc :call GotoWindow(g:vimspector_session_windows.code)<CR>
+nnoremap <leader>dv :call GotoWindow(g:vimspector_session_windows.variables)<CR>
+nnoremap <leader>dw :call GotoWindow(g:vimspector_session_windows.watches)<CR>
+nnoremap <leader>ds :call GotoWindow(g:vimspector_session_windows.stack_trace)<CR>
+nnoremap <leader>do :call GotoWindow(g:vimspector_session_windows.output)<CR>
+nnoremap <leader>di :call AddToWatch()<CR>
+nnoremap <leader>dx :call vimspector#Reset()<CR>
+nnoremap <leader>dX :call vimspector#ClearBreakpoints()<CR>
+nnoremap <S-k> :call vimspector#StepOut()<CR>
+nnoremap <S-l> :call vimspector#StepInto()<CR>
+nnoremap <S-j> :call vimspector#StepOver()<CR>
+nnoremap <leader>d_ :call vimspector#Restart()<CR>
+nnoremap <leader>dn :call vimspector#Continue()<CR>
+nnoremap <leader>drc :call vimspector#RunToCursor()<CR>
+nnoremap <leader>dh :call vimspector#ToggleBreakpoint()<CR>
+nnoremap <leader>de :call vimspector#ToggleConditionalBreakpoint()<CR>

+ 3 - 0
dot-config/nvim/vim-plug/plugins.vim

@@ -119,4 +119,7 @@ Plug 'KabbAmine/vCoolor.vim'
 " repo for some code snippets
 Plug 'honza/vim-snippets'
 
+" easier buffer resizing
+Plug 'ahonn/resize.vim'
+
 call plug#end()

+ 2 - 0
dot-config/xbindkeys/config

@@ -108,6 +108,8 @@
 "st -e ncmpcpp"
    Mod4 + section
 
+"dmenu_run"
+   Mod4 + P
 
 ### MPD CPMMANDS