From e9d6b42be25ac756a7cc9c44e1a34b78919dfec2 Mon Sep 17 00:00:00 2001 From: Julian T Date: Mon, 6 Feb 2023 20:49:39 +0100 Subject: script and nvim changes --- bspwm/.config/sxhkd/sxhkdrc | 5 +++-- scripts/Scripts/lc | 48 +++++----------------------------------- vim-extra/.config/nvim/extra.vim | 16 ++++++++++++++ 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc index 2388af4..1eee945 100644 --- a/bspwm/.config/sxhkd/sxhkdrc +++ b/bspwm/.config/sxhkd/sxhkdrc @@ -38,7 +38,7 @@ XF86AudioNext Scripts/volume forward # quit/restart bspwm -super + shift + {e,r} +super + ctrl + {e,r} bspc {quit,wm -r} # close and kill @@ -110,7 +110,8 @@ super + ctrl + shift + {1-9} super + {_,shift +} bracket{left,right} bspc {monitor -f, node -m} {prev,next} - +super + shift + b + bspc node --balance # # preselect diff --git a/scripts/Scripts/lc b/scripts/Scripts/lc index e84d856..8b9fbcd 100755 --- a/scripts/Scripts/lc +++ b/scripts/Scripts/lc @@ -3,7 +3,7 @@ LOGFILE=.lc.log DMENU="rofi -dmenu" -Commands="s suspend screen goto common bwpass remember forever set-keyboard sa-keyboard rotate poweroff lock scrot region overleaf-render caps-lock win wall cups pass sync random" +Commands="s docpdf suspend screen common remember forever set-keyboard rotate poweroff lock scrot region caps-lock wall pass" handle_stuff() { if [ "$1" = "--dmenu" ]; then @@ -16,13 +16,6 @@ handle_stuff() { #xcape -e "Control_R=Escape" # xmodmap .Xmodmap fi - - if [ "$1" = "sa" ] || [ "$1" = "sa-keyboard" ]; then - setxkbmap -layout us -variant colemak_dh_iso - #xcape -e "Control_R=Escape" - # xmodmap .Xmodmap - fi - # POWER COMMANDS if [ "$1" = "suspend" ]; then systemctl suspend @@ -44,27 +37,14 @@ handle_stuff() { xclip -selection clipboard -t image/png -i $imagename fi - if [ "$1" = "overleaf-render" ]; then - st sh ~/Documents/overleafRenderer/compile.sh - fi - if [ "$1" = "caps-lock" ]; then xdotool key Caps_Lock fi - if [ "$1" = "win" ]; then - vboxmanage startvm "Windows xp" - fi - if [ "$1" = "wall" ]; then $HOME/Scripts/setwall -A fi - if [ "$1" = "random" ]; then - stuff=$(python -c "print('\n'.join((str(i) for i in $(rofi -dmenu))))") - echo $stuff | tr " " "\n" | rofi -dmenu - fi - if [ "$1" = "remember" ]; then import $imagename feh $imagename @@ -81,39 +61,21 @@ handle_stuff() { fi # Launch - if [ "$1" = "s" ]; then - $HOME/Scripts/guiworkspace.sh - fi - - if [ "$1" = "cups" ] || [ "$1" = "cups-website" ]; then - firefox "http://localhost:631/" - fi - if [ "$1" = "pass" ]; then bash $HOME/Scripts/passmenu --type fi - if [ "$1" = "bwpass" ]; then - bash $HOME/Scripts/bwmenu --type - fi - if [ "$1" = "common" ]; then python3 Scripts/commondocs.py ~/commondocs.json $(python3 Scripts/commondocs.py ~/commondocs.json | $DMENU) fi - - if [ "$1" = "sync" ]; then - ./Scripts/sync.sh - dunstify "Sync complete" "Sync completed at $(date)" - fi - - if [ "$1" = "goto" ]; then - caja $(./Scripts/goto -d $(cat .bookmarks | awk -F ' ' '{print $1}' | $DMENU)) - fi - if [ "$1" = "screen" ]; then ~/Scripts/screentool fi + if [ "$!" = "docpdf" ]; then + find ~/Documents -iname "*.pdf" -type f | fzf | xargs zathura + fi + # Calc if [ "$(echo $1 | head -c 1)" = "=" ]; then calc="$(echo $1 | cut -c 2-)" diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim index fee2a0b..104b041 100644 --- a/vim-extra/.config/nvim/extra.vim +++ b/vim-extra/.config/nvim/extra.vim @@ -30,6 +30,22 @@ autocmd CompleteDone * pclose colorscheme PaperColor + + lua << EOF + local on_attach = function(client, bufnr) + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + end + + require('lspconfig')['rust_analyzer'].setup{ + on_attach = on_attach, + settings = { + ["rust-analyzer"] = {} + } + } + +EOF "}}} " Latex {{{ -- cgit v1.2.3