diff --git a/aliases/key_aliases b/aliases/key_aliases index 35c028f..2f8a46d 100644 --- a/aliases/key_aliases +++ b/aliases/key_aliases @@ -117,8 +117,8 @@ pipes "pipes.sh -t 3" # silent="> /dev/null 2>&1& " chr "google-chrome" -h "htop -s PERCENT_MEM" -hc "htop -s PERCENT_CPU" +# h "htop -s PERCENT_MEM" +# hc "htop -s PERCENT_CPU" r "ranger" mr "man ranger" clc "cloc ." @@ -208,7 +208,7 @@ gcu "git commit" gcam "git add -A . && git commit --amend --no-edit -S" # gcamp "git add -A . && git commit --amend --no-edit -S && gpsf" -psgi "git add . && git commit -m '.' -S && git push" +psgi "git add . && git commit -m 'Update' -S && git push" gps "git push" gpsn "git push --set-upstream origin master" gpsf "git push --force" @@ -293,8 +293,10 @@ tcl "tex-clean" # mfs mfs "nvim /home/kevin/coding/best-mf-site-personal/index.html" hps "python3 -m http.server" -j "jekyll" -js "jekyll serve" +# j "jekyll" +# js "jekyll serve" +h "hugo" +he "hugo serve --disableFastRender" ss "ssh kevin@192.168.0.100" @@ -306,7 +308,7 @@ ss "ssh kevin@192.168.0.100" # sa "ssh k@192.168.0.17" # cpi "scp interceptor.c kevin@192.168.0.17:/home/kevin/a1" # cpti "gcc -m32 -o test_intercept test_intercept.c && scp test_intercept k@192.168.0.17:/home/k/a1" -ma "make" +m "printf '\033c' && make" mc "make clean" # }}} school # diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index f673c85..07ef03f 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -10,7 +10,7 @@ set -x GPG_TTY (tty) # }}} login to X # # input -xset r rate 200 60 +xset r rate 200 70 fish_vi_key_bindings set -x EDITOR nvim set -x VISUAL nvim @@ -28,12 +28,16 @@ set -U spv_dir "/home/kevin/coding/spotify-lib-vis" source $spv_dir/src/api-keys.sh # set -U PATH /usr/local/sbin /usr/local/bin /usr/bin /usr/bin/site_perl /usr/bin/vendor_perl /usr/bin/core_perl /home/kevin/linux-config/scripts -set -x PATH $PATH /home/kevin/linux-config/scripts (ruby -e 'print Gem.user_dir')/bin +# (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 # fxn abbr's abbr ag "grep-aliases" +abbr ev "evince-silent" abbr gcamp "git-amend-push" +abbr gdf "git-diff-files" +abbr gpsmt "git-push-multiple" abbr hs "scan-history" abbr ut "unix-timestamp" abbr z "zathura-silent" diff --git a/fish/.config/fish/functions/evince-silent.fish b/fish/.config/fish/functions/evince-silent.fish new file mode 100644 index 0000000..b37a6fc --- /dev/null +++ b/fish/.config/fish/functions/evince-silent.fish @@ -0,0 +1,3 @@ +function evince-silent + evince $argv[1] > /dev/null 2>&1& +end diff --git a/fish/.config/fish/functions/git-diff-files.fish b/fish/.config/fish/functions/git-diff-files.fish new file mode 100644 index 0000000..d9036e0 --- /dev/null +++ b/fish/.config/fish/functions/git-diff-files.fish @@ -0,0 +1,3 @@ +function git-diff-files + git diff --name-only $argv[1] $argv[2] +end diff --git a/fish/.config/fish/functions/git-push-multiple.fish b/fish/.config/fish/functions/git-push-multiple.fish new file mode 100644 index 0000000..cf8ad8a --- /dev/null +++ b/fish/.config/fish/functions/git-push-multiple.fish @@ -0,0 +1,5 @@ +function git-push-multiple + 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 50f90bd..451897a 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -140,10 +140,11 @@ bindsym control+Shift+x kill # container display {{{ # # backgrounds # set $colors_sh "~/.cache/wal/colors.sh" -bindsym $mod+q exec wal -i "$HOME/Pictures/Backgrounds/bright/editing"; exec ~/.cache/wal/colors.sh -# bindsym $mod+w exec wal -i "$HOME/Pictures/Backgrounds/dim"; exec ~/.cache/wal/colors.sh -bindsym $mod+w exec ~/linux-config/scripts/bg-chooser -bindsym $mod+r exec wal -i "$HOME/Pictures/Backgrounds/dim/editing"; exec ~/.cache/wal/colors.sh +bindsym $mod+q exec wal -i "$HOME/Pictures/Backgrounds/bright/editing" +bindsym $mod+w exec wal -i "$HOME/Pictures/Backgrounds/dim/non-editing" +# bindsym $mod+w exec ~/linux-config/scripts/bg-chooser +bindsym $mod+r exec wal -i "$HOME/Pictures/Backgrounds/dim/editing" +bindsym $mod+y exec wal -i "$HOME/Pictures/Backgrounds/bright/non-editing" # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle diff --git a/ranger/.config/ranger/rc.conf b/ranger/.config/ranger/rc.conf index f407ca4..5c1aa91 100644 --- a/ranger/.config/ranger/rc.conf +++ b/ranger/.config/ranger/rc.conf @@ -274,14 +274,14 @@ map ? help map W display_log # map w taskview_open # map S shell $SHELL -map S shell fish -C "cd %d" +map s shell fish -C "cd %d" map : console map ; console map ! console shell%space map @ console -p6 shell %%s map # console shell -p%space -map s console shell%space +map S console shell%space map r chain draw_possible_programs; console open_with%%space map f console find%space map cd console cd%space diff --git a/ranger/.config/ranger/scope.sh b/ranger/.config/ranger/scope.sh index c1cdcc0..ce8ac5e 100755 --- a/ranger/.config/ranger/scope.sh +++ b/ranger/.config/ranger/scope.sh @@ -77,12 +77,12 @@ handle_extension() { exit 1;; # HTML - htm|html|xhtml) - # Preview as text conversion - w3m -dump "${FILE_PATH}" && exit 5 - lynx -dump -- "${FILE_PATH}" && exit 5 - elinks -dump "${FILE_PATH}" && exit 5 - ;; # Continue with next handler on failure + # htm|html|xhtml) + # # Preview as text conversion + # w3m -dump "${FILE_PATH}" && exit 5 + # lynx -dump -- "${FILE_PATH}" && exit 5 + # elinks -dump "${FILE_PATH}" && exit 5 + # ;; # Continue with next handler on failure # htm|html|xhtml) # # Preview as text conversion diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt index 06507e6..ea6bb9a 100644 --- a/txt/key_dirs.txt +++ b/txt/key_dirs.txt @@ -19,10 +19,12 @@ P /home/kevin/Pictures # cdn {{{ * +b1 /home/kevin/coding/mf-site/themes/base16 cn /home/kevin/coding ib /home/kevin/linux-config/configs/i3blocks-scripts j /home/kevin/Documents/journal lh /home/kevin/Documents/listening-history +mh /home/kevin/coding/mf-site ms /home/kevin/coding/best-mf-site-personal ra /home/kevin/.config/ranger sr /home/kevin/linux-config/scripts @@ -41,7 +43,7 @@ sc /home/kevin/school 0 /home/kevin/school/309 e1 /home/kevin/school/309/e1 6 /home/kevin/school/369 -a1 /home/kevin/school/369/a1/ +a2 /home/kevin/school/369/a2/a2 hp /home/kevin/school/hps lt /home/kevin/school/latex-notes diff --git a/vim/.vimrc b/vim/.vimrc index afbe5bb..73935ef 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -42,6 +42,7 @@ autocmd BufNewFile,BufRead *.txt set tabstop=2 shiftwidth=2 expandtab autocmd BufRead commit-msg.txt set filetype=gitcommit tw=72 autocmd BufNewFile,BufRead *.md set filetype=markdown autocmd Filetype markdown set textwidth=0 +" autocmd Filetype html set foldmarker=0 autocmd BufWritePost key_* !sync-shortcuts autocmd VimLeave *.tex !tex-clean % @@ -212,6 +213,8 @@ nnoremap dg ggdG nnoremap D "+dd " delete entire buffer into system clipboard nnoremap DA "+ggdG +" find alias +nnoremap fa /^ " find merge conflicts nnoremap fc /[<>=\|]\{7\} " reload folds @@ -317,5 +320,6 @@ autocmd Filetype tex inoremap tx $t(x)$ autocmd Filetype md inoremap x 0f[lRX autocmd Filetype fish inoremap 1 $argv[1] +autocmd Filetype fish inoremap 2 $argv[2] " }}} Local Mappings "