diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl index 93f55dc..540f8aa 100644 --- a/aliases/key_aliases.tmpl +++ b/aliases/key_aliases.tmpl @@ -22,6 +22,7 @@ duh "du -d 1 -h --apparent-size | sort -h" dum "du -d 1 -m --apparent-size | sort -h" # m "man" td "tldr" +whi "whereis" # ]]] basic # @@ -54,8 +55,8 @@ awkp "awk -F',' '{print \$0}'" fde "fd -e" grep "grep --color=auto -n" grpr "grep -r" -rg "rg -S" -rge "rg -St" +rgc "rg -S" +rge "rg -t" # pk "pkill -f" cld "colordiff -wy --suppress-common-lines" @@ -383,6 +384,7 @@ ka "killall" kd "killall Discord && killall Discord" ke "killall electron" kf "killall firefox" +kag "killall gopls" kai "killall imwheel && imwheel" kt "killall thunderbird" lo "libreoffice" @@ -440,8 +442,8 @@ usn "usernames --num 20" vmd "vimdiff" wc "wc -l" wch "weechat" -# wg "wego" -wg "curl -L wthr.ml" +wg "wego" +# wg "curl -L wthr.ml" wgm "curl -L wthr.ml/m" wgt "curl -L wthr.ml/t" yt "youtube-dl" @@ -548,7 +550,7 @@ gmgt "git mergetool" gr "git remote -v" gra "git remote add origin" grao "git remote add orig" -# grag "git remote add gitea git@ataraxy.tk:Kevin-Mok/.git" +grag "git remote add gitea ssh://git@git.kevin-mok.com:399/Kevin-Mok/" grr "git remote remove origin" gru "git branch --set-upstream-to=origin/master master" @@ -584,7 +586,9 @@ grmor "rm (fd -e orig --no-ignore -H)" gd "git diff -w" gdc "git diff --cached -w" gdh "git diff --cached -w HEAD~1" -gds "git diff --stat" +# gds "git diff --stat" +# gdsc "git diff --stat --cached -w" +gds "git diff --stat --cached -w" gdt "git difftool -w --tool=vimdiff" gdtc "git difftool -w --cached --tool=vimdiff" gl "git log -5" @@ -595,6 +599,7 @@ glm "git log master" gqs "git-quick-stats -T" # gsl "git shortlog" gsh "git show" +gshh "git show HEAD" # ]]] diff/log # @@ -613,11 +618,18 @@ gchnw "git checkout -b wip" gchw "git checkout wip" gchh "git checkout HEAD --" -grs "git reset --hard" -grss "git reset --soft HEAD~1" -grso "git reset --hard origin/master" -grsh "git reset --hard HEAD" -grsh1 "git reset --hard HEAD~1" +# grss "git reset --soft HEAD~1" +# grs "git reset --hard" +# grso "git reset --hard origin/master" +# grsh "git reset --hard HEAD" +# grsh1 "git reset --hard HEAD~1" +grs "git reset --soft" +grsh1 "git reset --soft HEAD~1" +grso "git reset --soft orig/master" +grsh "git reset --hard" +grsho "git reset --hard origin/master" +grshh "git reset --hard HEAD" +grshh1 "git reset --hard HEAD~1" # show files in git repo # gls "git ls-tree -r HEAD --name-only" gls "git ls-tree HEAD --name-only" @@ -654,6 +666,7 @@ gcap "git add -A && git commit --amend --no-edit -S && git push --force" psgi "git add -A && git commit -m 'Update' -S && git push" gps "git push" gpso "git push origin" +gpsoh "git push -f origin HEAD:" gpsg "git push gitea" gpsd "git push origin --delete" # gpsi "git config credential.helper store && git push" @@ -860,6 +873,7 @@ gchk "git checkout KOGITO-" gch2 "git checkout KOGITO-2113" loe "libreoffice ~/Documents/expenses/2020.ods &" +loi "libreoffice ~/Documents/expenses/investments.ods &" ssw "mosh $WORK_LAPTOP_IP tmux a" ssi "mosh $WORK_LAPTOP_IP -- tmux a -t weechat" scw "scp $WORK_LAPTOP_IP:" @@ -913,4 +927,8 @@ got "go test" gota "go test *" mbc "make build-cli && scp build/_output/bin/kogito $WORK_LAPTOP_IP:/home/kmok/go/bin" +dk "docker" +dki "docker image" +dkis "docker images" + # ]]] red-hat # diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl index 0d7cccc..6e0854a 100644 --- a/aliases/key_dirs.tmpl +++ b/aliases/key_dirs.tmpl @@ -13,8 +13,8 @@ D ~/Documents kh ~/ lc ~/linux-config lf /mnt/linux-files -Lfp /mnt/linux-files/Pictures -Lfv /mnt/linux-files/Videos +lfp /mnt/linux-files/Pictures +lfv /mnt/linux-files/Videos me /run/media/kevin o / pd ~/.password-store @@ -34,6 +34,7 @@ sv /etc/systemd/system # cdn [[[ # ad ~/.task +bm ~/Documents/bookmarks ccd ~/.calcurse cn ~/coding drk ~/coding/dark-sky @@ -98,6 +99,7 @@ adP ~/Pictures/ada-mario # gaming [[[ # lfo /mnt/linux-files/Videos/obs +pxv /mnt/linux-files/Videos/pixel cm ~/Documents/codm cs ~/Documents/codm/site @@ -117,6 +119,8 @@ tcd /mnt/linux-files/Videos/yt/fortnite/clips/twitch-clip-downloader # ]]] fortnite # +pgv /mnt/linux-files/Videos/pokemon-go + # ]]] gaming # # sch [[[ # @@ -131,6 +135,7 @@ lt ~/school/latex-notes rh ~/Documents/red-hat rhc ~/Documents/red-hat/chat wcl ~/.weechat/logs +ep ~/Documents/expenses # kogito [[[ # @@ -144,19 +149,29 @@ ki ~/coding/kogito/kogito-images kj ~/coding/kogito/jenkins-test kjb ~/coding/kogito/jenkins-test-bot kl ~/coding/kogito/shared-libraries +# operator [[[ # + ko ~/go/src/github.com/kiegroup/kogito-cloud-operator koc ~/go/src/github.com/kiegroup/kogito-cloud-operator/cmd/kogito/command kod ~/go/src/github.com/kiegroup/kogito-cloud-operator/cmd/kogito/command/deploy kof ~/go/src/github.com/kiegroup/kogito-cloud-operator/cmd/kogito/command/flag +kor ~/go/src/github.com/kiegroup/kogito-cloud-operator/pkg/controller/kogitoruntime kou ~/go/src/github.com/kiegroup/kogito-cloud-operator/cmd/kogito/command/util +ko2 ~/coding/kogito/kogito-cloud-operator-2 + +# ]]] operator # kp ~/coding/kogito/kogito-pipelines kpr ~/coding/pull-requests/red-hat kr ~/coding/kogito/kogito-runtimes krj ~/coding/kogito/kogito-runtimes/jenkins-spock-tests +gos ~/go/src + # ]]] kogito # vb ~/coding/VileBot/vilebot vbs ~/coding/VileBot/vilebot/src/main/java/com/oldterns/vilebot +nxo ~/coding/kogito/nexus-operator + # ]]] pey # diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 214dc5a..f9a583a 100755 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -76,8 +76,8 @@ set -xU FZF_DEFAULT_COMMAND "find ." # set -xU PHONE_IP "192.168.0.10" # set -xU WORK_LAPTOP_IP "kmok@192.168.0.12" -set -x PHONE_IP "192.168.0.11" -set -x WORK_LAPTOP_IP "kmok@192.168.0.12" +set -x PHONE_IP "192.168.0.12" +set -x WORK_LAPTOP_IP "kmok@192.168.0.13" {{ if eq .chezmoi.fullHostname "nzxt" }} set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1) @@ -209,6 +209,7 @@ abbr shrm "shred-rm" abbr shs "scan-history" abbr svp "server-pages" abbr ta "tmux-attach" +abbr tao "tmux-attach obs" abbr thes "thesaurus" abbr usc "us-to-cad" abbr ut "unix-timestamp" diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index a18781b..aa6d1fc 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -53,7 +53,8 @@ bindsym Mod4+c exec $browser # bindsym Mod4+e exec emacs bindsym Mod4+e exec ~/scripts/twem # bindsym Mod4+f exec firefox -bindsym Mod4+f exec firefox --private-window +# bindsym Mod4+f exec firefox --private-window +bindsym Mod4+f exec firefox --private-window google.ca # bindsym Mod4+$mod+f exec printf 'Kevin@fosstodon.org' | xclip -selection clipboard # bindsym Mod4+h exec sleep .2 && xdotool type '.hint' # bindsym Mod4+$mod+h exec $type_delay_cmd && xdotool type 'kevin.mok@live.ca' @@ -324,19 +325,22 @@ bindsym $mod+F1 workspace $ws1; exec $term bindsym Control+Shift+F1 workspace $ws1; exec $term -e fish -c 'tmux-attach red-hat' set $ws2 "2 " -set $wl_ip_nast_num "2" +set $wl_ip_nast_num "3" workspace $ws2 output $secondary bindsym $mod+F2 workspace $ws2; exec $term # bindsym Control+Shift+F2 workspace $ws2; exec $term -e mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t nzxt # bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach fortnite' bindsym Control+Shift+F2 workspace $ws2; exec $term -e fish -c 'tmux-attach red-hat-2' +bindsym $mod+Shift+F2 workspace $ws2; exec $term -e mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t nzxt-2 # ws3 [[[ # set $ws3 "3 " # set $ws3 "3 " # workspace $ws3 output $main -bindsym $mod+F3 workspace $ws3; exec $browser +# bindsym $mod+F3 workspace $ws3; exec $browser +# bindsym $mod+F3 exec $browser; move container to workspace $ws3; workspace $ws3 +bindsym $mod+F3 exec $browser bindsym Mod4+$mod+F3 workspace $ws3; exec firefox -P work # bindsym Mod4+b workspace $ws3; layout stacked; exec $term -e fish -c "buku-fzf" # bindsym Mod4+$mod+b workspace $ws3; layout stacked; exec $term -e fish -c "buku-fzf fq" diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 069ab81..c6fc4f8 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1,8 +1,8 @@ include ~/.cache/wal/colors-kitty.conf # background_opacity .7 # background_opacity .8 -background_opacity .85 -# background_opacity .9 +# background_opacity .85 +background_opacity .9 clipboard_control write-clipboard write-primary enable_audio_bell no diff --git a/dot_config/mpv/input.conf b/dot_config/mpv/input.conf index c142deb..2b1dd57 100755 --- a/dot_config/mpv/input.conf +++ b/dot_config/mpv/input.conf @@ -11,8 +11,10 @@ a add speed -.2 s add speed .2 # seek -Shift+RIGHT seek 1 -Shift+LEFT seek -1 +Ctrl+RIGHT no-osd seek 0.2 exact +Ctrl+LEFT no-osd seek -0.2 exact +Shift+RIGHT no-osd seek 1 exact +Shift+LEFT no-osd seek -1 exact RIGHT seek 3 LEFT seek -3 UP seek 10 diff --git a/dot_config/mpv/mpv.conf b/dot_config/mpv/mpv.conf index 4dec4fa..981fc28 100644 --- a/dot_config/mpv/mpv.conf +++ b/dot_config/mpv/mpv.conf @@ -1,5 +1,5 @@ sub-auto=fuzzy # volume=25 -volume=75 +# volume=75 ytdl-format=best ytdl-raw-options=sub-format=en,write-srt= diff --git a/dot_taskrc b/dot_taskrc index 136d2b3..72a8823 100644 --- a/dot_taskrc +++ b/dot_taskrc @@ -56,7 +56,7 @@ urgency.user.project.fn.coefficient=5 urgency.user.project.mny.coefficient=7 urgency.user.project.ms.coefficient=3 urgency.user.project.pey.coefficient=10 -urgency.user.project.pogo.coefficient=5 +urgency.user.project.pogo.coefficient=7 urgency.user.project.sch.coefficient=7 urgency.uda.priority.H.coefficient=10 urgency.uda.priority.M.coefficient=4 @@ -64,6 +64,7 @@ urgency.uda.priority.L.coefficient=-7 urgency.uda.priority..coefficient=1 urgency.user.tag.jira.coefficient=5 # urgency.user.tag.nx.coefficient=15 +urgency.user.tag.nexus.coefficient=3 # }}} urgency # diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index 7e4df87..570f40e 100644 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -66,8 +66,8 @@ autocmd FileType *css,gitcommit,haskell,htmldjango,html,javascript,json,lisp,mar autocmd BufNewFile,BufRead *.gd set expandtab! autocmd Filetype go set noexpandtab sw=4 " autocmd FileType go,html,java,javascript,python,lua set fdm=indent -" autocmd FileType go,html,java,javascript,Jenkinsfile,python,lua set fdm=indent -autocmd FileType html,javascript,Jenkinsfile,python,lua set fdm=indent +autocmd FileType go,html,java,javascript,Jenkinsfile,python,lua set fdm=indent +" autocmd FileType html,javascript,Jenkinsfile,python,lua set fdm=indent autocmd Filetype markdown let g:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''", "*":"*"} " autocmd Filetype markdown map :LivedownToggle autocmd Filetype markdown map :InstantMarkdownPreview @@ -598,6 +598,7 @@ autocmd Filetype fish inoremap 2 $argv[2] autocmd Filetype javascript inoremap x process.exit() autocmd Filetype markdown inoremap c - [ ] +autocmd Filetype markdown inoremap t TODO: autocmd Filetype markdown nnoremap x 0f[lrx " nnoremap x 0f[lrx @@ -610,6 +611,9 @@ autocmd Filetype go-template inoremap e {{"{{ else }}"}} autocmd Filetype go-template inoremap hd {{"{{ .chezmoi.homedir }}"}} autocmd Filetype go-template nnoremap fp :%s/{{"{{{"}}/[[[/g:%s/}}}/]]]/g +autocmd Filetype Jenkinsfile nnoremap q :.s/"/'/g +autocmd Filetype Jenkinsfile vnoremap q :s/"/'/g + autocmd Filetype python inoremap bp breakpoint() autocmd Filetype python inoremap s self.