diff --git a/aliases/key_aliases b/aliases/key_aliases index 3e72f1b..8fe70bb 100644 --- a/aliases/key_aliases +++ b/aliases/key_aliases @@ -8,7 +8,7 @@ fi "fish" # reload urxvt ru "xrdb ~/.Xresources" # list file sizes in megabytes with depth 1 -dum "sudo du -d 1 -B M" +duh "sudo du -d 1 -h" tl "tldr" nvt "nvidia-settings --assign CurrentMetaMode='DVI-I-1: nvidia-auto-select +0+0 {ForceCompositionPipeline=On}, HDMI-0: nvidia-auto-select +3840+0 {ForceCompositionPipeline=On}'" @@ -16,6 +16,8 @@ nvt "nvidia-settings --assign CurrentMetaMode='DVI-I-1: nvidia-auto-select +0+0 vgb "sni /etc/default/grub" mkgb "sudo grub-mkconfig -o /boot/grub/grub.cfg" +bt "bat" +bta "bat *" grep "grep --color=auto -n" grr "grep -r" # pk "pkill -f" @@ -32,6 +34,7 @@ ctld "sudo systemctl disable" ctla "sudo systemctl start" ctls "sudo systemctl stop" ctlt "sudo systemctl status" +ctltd "sudo systemctl status dhcpcd" ctlr "sudo systemctl restart" # }}} systemctl # @@ -77,8 +80,8 @@ s "systemctl suspend" sd "sudo shutdown 0" reb "sudo shutdown -r 0" lo "i3-msg exit" -x "xmodmap ~/.Xmodmap && xset r rate 200 70" -X "xmodmap ~/.Xmodmap && xset r rate 200 70" +x "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE" +X "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE" # }}} power options # @@ -94,11 +97,11 @@ vlh "alsamixer -c 2" # pacman {{{ # pc "sudo pacman -S" -pcr "sudo pacman -Rs" +pcr "sudo pacman -Rns" pcud "sudo pacman -Sy" pcug "sudo pacman -Syu" pcv "sudo pacman -Q" -xpc "pacman -Qqe > ~/linux-config/txt/nzxt-pkgs.txt" +xpc "pacman -Qqne > ~/linux-config/txt/nzxt-pkgs.txt && pacman -Qqme > ~/linux-config/txt/nzxt-aur.txt " # tri "trizen -S --noconfirm" tri "trizen -S --noedit" @@ -199,6 +202,7 @@ g "git" # branch {{{ # gb "git branch" +gbd "git branch -D" gba "git branch --no-merged && echo '' && git branch --merged" gbu "git branch --no-merged" gbm "git branch --merged" @@ -225,8 +229,10 @@ grmfc "git rm -f --cached" # diff/log {{{ # gd "git diff -w" gdc "git diff --cached -w" +gdh "git diff --cached -w HEAD~1" gds "git diff --stat" -gdt "git difftool --tool=vimdiff" +gdv "git difftool -w --tool=vimdiff" +gdvc "git difftool -w --cached --tool=vimdiff" gl "git log" gsl "git shortlog" # }}} diff/log # @@ -261,6 +267,7 @@ gpsf "git push --force" gclear "git stash clear" gpl "git pull --rebase" +grba "git rebase --abort" grbc "git rebase --continue" # }}} push # @@ -371,6 +378,7 @@ hl "valgrind --tool=helgrind ./carsim light 10 20" # 309 0ht "cd ~/school/309-proj && python3 -m http.server" -v0c "cd /home/kevin/school/309-proj/css && nvim main.scss" +wl0 "watson log --all --project=309 --tag=project" +wr0 "watson report --all --project=309 --tag=project" # }}} school # diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index dd8b8c2..61c2698 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -33,6 +33,11 @@ source $spv_dir/src/api-keys.sh # (ruby -e 'print Gem.user_dir')/bin set -x PATH $PATH /home/kevin/linux-config/scripts /home/kevin/go/bin set -x PASSWORD_STORE_CLIP_TIME 120 +set -xU XSET_RATE 90 +set -xU XSET_DELAY 200 +# causes xmodmap to have issues when opening terminal sometimes +# xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE +# xset r rate $XSET_DELAY $XSET_RATE # fxn abbr's abbr ag "grep-aliases" @@ -43,10 +48,12 @@ abbr ev "evince-silent" abbr gcamp "git-amend-push" abbr gdf "git-diff-files" abbr gpsmt "git-push-multiple" +abbr gremotes "git-mult-remotes" abbr grmb "git-delete-branch" # }}} git # abbr hs "scan-history" +abbr hst "$EDITOR ~/.local/share/fish/fish_history" abbr ut "unix-timestamp" abbr z "zathura-silent" diff --git a/fish/.config/fish/functions/git-mult-remotes.fish b/fish/.config/fish/functions/git-mult-remotes.fish new file mode 100644 index 0000000..f8dce29 --- /dev/null +++ b/fish/.config/fish/functions/git-mult-remotes.fish @@ -0,0 +1,5 @@ +function git-mult-remotes + git remote set-url --add --push origin $argv[1] + and git remote set-url --add --push origin $argv[2] + and git remote -v +end diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 7f97e04..7cce7fe 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -10,7 +10,7 @@ exec compton exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing") exec imwheel exec xmodmap ~/.Xmodmap -exec xset r rate 200 70 +exec xset r rate $XSET_DELAY $XSET_RATE exec xrdb ~/.Xresources exec --no-startup-id dunst exec --no-startup-id start-pulseaudio-x11 @@ -55,7 +55,7 @@ bindsym Mod4+w exec notify-send "watson status" "$(watson status)" bindsym Mod4+$mod+w exec notify-send "watson stop" "$(watson status && watson stop)" bindsym control+$mod+w exec urxvt -e nvim /home/kevin/.config/watson/state.tmp # bindsym Mod4+x exec $swex -bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate 200 70 +bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE bindsym Mod4+z exec cliqz # bindsym Print exec gscreenshot bindsym Print --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" diff --git a/scripts/sync-shortcuts b/scripts/sync-shortcuts index 5290e56..ea8eae5 100755 --- a/scripts/sync-shortcuts +++ b/scripts/sync-shortcuts @@ -45,8 +45,8 @@ sed "s/\s*#.*$//;/^\s*$/d" "$key_dirs" | tee \ >(awk '{print "abbr", $1, "\"cd " $2 "\""}' >> "$fish_abbr") \ | awk '{print "map f"$1, "cd", $2; print "map t"$1, "tab_new", $2; - print "map m"$1, "shell mv -v", $2; - print "map Y"$1, "shell cp -rv", $2; + print "map m"$1, "shell mv -v %f", $2; + print "map Y"$1, "shell cp -rv %f", $2; }' >> "$ranger_mappings" sed "s/\s*#.*$//;/^\s*$/d" "$key_files" | tee \ diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt index 0a13c77..c0b50b8 100644 --- a/txt/key_dirs.txt +++ b/txt/key_dirs.txt @@ -41,13 +41,17 @@ wo /home/kevin/Documents/workout-logs/11 # sch {{{ * +# 309 sc /home/kevin/school 0c /home/kevin/school/309-proj/css 0d /home/kevin/school/309 0p /home/kevin/school/309-proj e2 /home/kevin/school/309/e2 + +# 369 6 /home/kevin/school/369 -a2 /home/kevin/school/369/a2/a2 +a3 /home/kevin/school/369/a3/a3 + hp /home/kevin/school/hps lt /home/kevin/school/latex-notes diff --git a/txt/key_files.txt b/txt/key_files.txt index df6080c..ea2f644 100644 --- a/txt/key_files.txt +++ b/txt/key_files.txt @@ -39,10 +39,11 @@ wt /home/kevin/.config/watson/state.tmp # sch {{{ * +0c /home/kevin/school/309-proj/sass/main.scss 0h /home/kevin/school/309-proj/index.html 0m /home/kevin/school/309-proj/js/main.js 0f /home/kevin/school/309-proj/js/food.js 0s /home/kevin/school/309-proj/js/stores.js -0k /home/kevin/school/309-proj/txt/kevin.md +0k /home/kevin/school/309-proj/json/kevin.md # }}} sch * diff --git a/txt/manual-latex-pkgs.txt b/txt/manual-latex-pkgs.txt deleted file mode 100644 index e9df618..0000000 --- a/txt/manual-latex-pkgs.txt +++ /dev/null @@ -1,11 +0,0 @@ -algorithm -algorithmicx -enumitem -hyperref -numprint -pgfplots -tkz-base -tkz-euclide - -# manual -gensymb diff --git a/txt/nzxt-aur.txt b/txt/nzxt-aur.txt new file mode 100644 index 0000000..4e76342 --- /dev/null +++ b/txt/nzxt-aur.txt @@ -0,0 +1,45 @@ +bear +browserpass +chromium-widevine +cliqz +discord +dragon-drag-and-drop-git +ffcast +htop-vim-git +i3blocks-git +linux-kevin +linux-kevin-headers +lua-cjson +nx3-all +peaclock +pipes.sh +pycp +qdirstat +riot-desktop-git +rxvt-unicode-pixbuf +sc-im +spotify +spotify-now-git +st +steamos-xpad-dkms +systemd-numlockontty +texlive-local-algorithmicx +texlive-local-algorithms +texlive-local-enumitem +texlive-local-hyperref +texlive-local-ifmtarg +texlive-local-multirow +texlive-local-numprint +texlive-local-pgfplots +texlive-local-tkz-base +texlive-local-tkz-euclide +texlive-local-xifthen +texlive-localmanager-git +tor-browser +trizen +ttf-emojione +watson +weechat-vimode-git +wego +xboxdrv +yad diff --git a/txt/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt index 2b9c432..b1a9192 100644 --- a/txt/nzxt-pkgs.txt +++ b/txt/nzxt-pkgs.txt @@ -1,19 +1,18 @@ alsa-utils +apache arch-install-scripts asp autoconf automake bash +bat bc bison bookworm broadcom-wl -browserpass bzip2 certbot chromium -chromium-widevine -cliqz cloc cmake cmatrix @@ -25,15 +24,16 @@ device-mapper dhcpcd dialog diffutils -discord dmenu +dunst e2fsprogs electrum +encfs evince evolution fakeroot +fd feh -ffcast file filesystem findutils @@ -52,9 +52,8 @@ glibc grep grub gzip -htop-vim-git +hugo i3-gaps -i3blocks-git i3status imv imwheel @@ -69,12 +68,10 @@ licenses linux linux-firmware linux-headers -linux-kevin -linux-kevin-headers logrotate lolcat +lsd lsof -lua-cjson lutris lvm2 lxappearance @@ -82,108 +79,93 @@ make man-db man-pages mdadm +meld mpv nano neofetch neomutt neovim netctl +nnn noto-fonts ntfs-3g ntp numlockx nvidia-dkms +nvidia-settings openssh os-prober pacman pacman-contrib +pandoc pass patch pciutils pcmanfm pdfgrep -peaclock peek perl +perl-image-exiftool pgadmin4 -pipes.sh pkgconf postgresql procps-ng psensor psmisc pulseaudio -pycp python-dbus python-pip python-pywal python-setuptools -qdirstat qrencode ranger redshift reiserfsprogs +ripgrep rsync -rxvt-unicode-pixbuf s-nail scrot sed shadow shellcheck -spotify -spotify-now-git sqlitebrowser -st +sshpass steam steam-native-runtime -steamos-xpad-dkms stow sudo surf sxiv sysfsutils sysstat -systemd-numlockontty systemd-sysvcompat tar texinfo texlive-core -texlive-local-algorithmicx -texlive-local-algorithms -texlive-local-enumitem -texlive-local-hyperref -texlive-local-multirow -texlive-local-numprint -texlive-local-pgfplots -texlive-local-tkz-base -texlive-local-tkz-euclide -texlive-localmanager-git the_silver_searcher +tidy tmux tor -tor-browser transmission-gtk -trizen ttf-dejavu -ttf-emojione +ttf-font-awesome ttf-ubuntu-font-family udisks2 unzip usbutils util-linux +valgrind vi +vim virtualbox vlc w3m -watson -weechat-vimode-git -wego which wine wireless_tools +wkhtmltopdf wpa_actiond wpa_supplicant -xboxdrv xclip xf86-input-evdev xf86-input-keyboard @@ -236,7 +218,7 @@ xorg-xvinfo xorg-xwd xorg-xwininfo xorg-xwud -yad +youtube-dl youtube-viewer zathura zathura-pdf-mupdf diff --git a/vim/.vimrc b/vim/.vimrc index 37f627a..ba223b3 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -25,6 +25,7 @@ set linespace=5 " set cursorline " }}} cursor indicator " +set diffopt=filler,context:3 " set timeoutlen=500 set timeoutlen=350 @@ -64,11 +65,6 @@ autocmd BufNewFile,BufRead watson*.fish set tabstop=2 shiftwidth=2 expandtab autocmd BufRead commit-msg.txt set filetype=gitcommit tw=72 autocmd BufWritePost key_* !sync-shortcuts -autocmd BufNewFile,BufRead main.scss map :silent !sass %:p %:p:h/main.css -" map :autocmd BufWritePost main.scss silent !sass main.scss main.css -autocmd BufNewFile,BufRead main.scss map :autocmd BufWritePost main.scss silent !sass %:p %:p:h/main.css -autocmd BufNewFile,BufRead main.scss map :autocmd! BufWritePost main.scss - " }}} commands for specific files " " vim-plug {{{ " @@ -190,7 +186,7 @@ Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'terryma/vim-multiple-cursors' " let g:multi_cursor_select_all_word_key='' Plug 'dag/vim-fish' -Plug 'shime/vim-livedown' +Plug 'tpope/vim-fugitive' call plug#end() @@ -202,21 +198,18 @@ colorscheme wal " Mappings {{{ " " function keys {{{ " -" map silent !sass main.scss main.css -" " map :autocmd BufWritePost main.scss silent !sass main.scss main.css -" map :autocmd BufWritePost main.scss silent !sass main.scss main.css -" map :autocmd! BufWritePost main.scss " map :silent !scp %:p k@192.168.0.17:/home/k/a1 " map :silent !scp -P 2222 e1.html e1_style.css kevin@127.0.0.1:/home/kevin/Downloads/e1 map :xa map :q! +map :qa! " map :make -C ~/Documents/resume cv " map :AutoSaveToggle map :!clear && shellcheck % map :VimtexCompile:VimtexView " map :VimtexCompile nnoremap :set paste"+p:set nopaste -map :LivedownPreview +map :LivedownToggle " }}} function keys " map O @@ -257,6 +250,8 @@ nnoremap ff :set foldmethod=marker zM " find copied text nnoremap ft /TODO nnoremap g :YcmCompleter GoTo +" vimdiff split +nnoremap gd :Gvdiff " toggle search highlighting nnoremap h :set hlsearch! hlsearch? " help diff --git a/zathura/.config/zathura/zathurarc-o b/zathura/.config/zathura/zathurarc similarity index 100% rename from zathura/.config/zathura/zathurarc-o rename to zathura/.config/zathura/zathurarc