Red Hat config, Kogito completions

2020-08-05 23:32:40 -04:00
parent 9e559088a2
commit b5f5e62afa
17 changed files with 327 additions and 57 deletions
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -90,6 +90,7 @@ xcssh "bat ~/.ssh/id_rsa.pub | xclip -selection clipboard"
 # digital ocean
 ssd "mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a"
 sdh "mosh --ssh='ssh -p 399' kevin@165.22.239.234 htop"
+scd "scp -P 399 kevin@165.22.239.234"
 sfd "sftp -rP 399 kevin@165.22.239.234"
 # phone
 ssp "mosh --ssh='ssh -p 8022' $PHONE_IP"
@@ -103,6 +104,7 @@ sdt "ssh kevin@165.22.239.234 -L 5433:localhost:5432"
 # ]]] ssh #

 wh "watch"
+w60 "watch -n60 '"
 ct "crontab"
 cte "crontab -e"

@@ -110,9 +112,11 @@ wm "sudo wifi-menu"

 # mounting [[[ #
 udm "udisksctl mount -b"
+udmi "ifuse /mnt/ipad"
 udmb "udisksctl mount -b /dev/sdc2"
 udu "udisksctl unmount -b"
 udub "udisksctl unmount -b /dev/sdc2"
+udui "umount /mnt/ipad"

 # ]]] mounting # 

@@ -302,12 +306,15 @@ aamy "task add proj:mny"
 aap "task add proj:"
 aacm "task add proj:codm"
 aacr "task add proj:crim"
+aaj "task add proj:pey +jira []"
 aas "task add proj:sch"
 aay "task add proj:pey"
 ac "task context"
 acn "task context none && task"
 ach "task context home && task"
 aco "task context out && task"
+acp "task context pey && task"
+acnp "task context not-pey && task"
 acs "task context sch && task"
 af "task proj:"
 afcm "task proj:codm"
@@ -366,8 +373,8 @@ htm "htop -s PERCENT_MEM"
 # i "sxiv"
 ia "sxiv -a"
 it "sxiv -t *"
-ki "kill -9"
-ka "killall"
+kill "kill -9"
+kal "killall"
 kd "killall Discord && killall Discord"
 ke "killall electron"
 kf "killall firefox"
@@ -375,8 +382,8 @@ kai "killall imwheel && imwheel"
 kt "killall thunderbird"
 lo "libreoffice"
 # mpv "mpv --volume=50"
-# mp "mpv"
 m "mpv"
+ml "mpv --loop"
 msf "mpv --sub-file="
 mra "man ranger"
 # mt "minetest"
@@ -386,6 +393,8 @@ ndu "ncdu"
 p3 "python3"
 pdft "pdftotext"
 pipes "pipes.sh -t 3"
+pcp "pycp"
+pmv "pymv"
 py "python"
 q "qalc '"
 qg "qalculate-gtk"
@@ -403,6 +412,7 @@ stp "termdown"
 # sw "swex"
 t  "tmux"#[[[
 ta "tmux a -t"
+tabu "tmux a -t backup || tmux new -s backup"
 tacf "tmux a -t config || tmux new -s config"
 tacm "tmux a -t codm || tmux new -s codm"
 tacr "tmux a -t crimson || tmux new -s crimson"
@@ -423,6 +433,7 @@ tnb "tmux new -s backup"
 usn "usernames --num 20"
 vmd "vimdiff"
 wc "wc -l"
+wch "weechat"
 # wg "wego"
 wg "curl -L wthr.ml"
 wgm "curl -L wthr.ml/m"
@@ -489,6 +500,7 @@ wr "watson report -Gcd"
 wra "watson report -Gcap"
 wram "watson report -Gca | rg -S '^\w.*-\s\d*h' | sort -t' ' -hk3 | sed 's/ - /,/' | xsv table"
 wrat "watson report -GcaT"
+wrf "watson report -Gc --from ''"
 wrm "watson report -GcmT"
 wrw "watson report -Gc"

@@ -513,6 +525,7 @@ gbd "git branch -D"
 gba "git branch --no-merged && echo '' && git branch --merged"
 gbu "git branch --no-merged"
 gbm "git branch --merged"
+gbr "git branch -m"

 gsm "git submodule"
 gsma "git submodule add"
@@ -521,6 +534,8 @@ gsmp "git submodule foreach git pull"
 gsmu "git submodule update --recursive --remote"
 
 gmg "git merge"
+gmga "git merge --abort"
+gmgs "git merge --squash"
 gmgts "git merge -X theirs"
 gmgt "git mergetool"

@@ -530,7 +545,6 @@ grao "git remote add orig"
 # grag "git remote add gitea git@ataraxy.tk:Kevin-Mok/.git"

 grr "git remote remove origin"
-grs "git remote show origin"
 gru "git branch --set-upstream-to=origin/master master"

 # ]]] branch  #
@@ -567,9 +581,13 @@ gdh "git diff --cached -w HEAD~1"
 gds "git diff --stat"
 gdt "git difftool -w --tool=vimdiff"
 gdtc "git difftool -w --cached --tool=vimdiff"
-gl "git log"
+gl "git log -5"
+gl1 "git log --oneline"
+gl1x "git log --oneline -1 | xclip -selection clipboard"
+gla "git log"
 glm "git log master"
 # gsl "git shortlog"
+gsh "git show"

 # ]]] diff/log #

@@ -578,8 +596,7 @@ glm "git log master"
 gcl "git clone"
 gs "git status -u"
 gf "git fetch"
-gfo "git fetch orig"
-gfg "git fetch gitea"
+gfa "git fetch --all"

 gch "git checkout"
 gchn "git checkout -b"
@@ -588,9 +605,11 @@ gchnw "git checkout -b wip"
 gchw "git checkout wip"
 gchh "git checkout HEAD --"

-grom "git reset --hard origin/master"
-grh "git reset --hard HEAD"
-grh1 "git reset --hard HEAD~1"
+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"
 # show files in git repo
 # gls "git ls-tree -r HEAD --name-only"
 gls "git ls-tree HEAD --name-only"
@@ -603,7 +622,7 @@ gst "git stash"
 gstl "git stash list"
 gstp "git stash pop"
 gsts "git stash show stash@\{0\} -p"
-gclear "git stash clear"
+gstcl "git stash clear"

 gpl "git pull --rebase"
 gplo "git fetch orig && git pull --rebase . orig/master"
@@ -611,6 +630,9 @@ grb "git rebase -i"
 grba "git rebase --abort"
 grbc "git rebase --continue"

+grl "git reflog"
+grlc "git checkout HEAD@{1}"
+
 # ]]] pull #

 # push [[[ #
@@ -623,6 +645,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"
 gpsg "git push gitea"
 # gpsi "git config credential.helper store && git push"
 # gpsn "git push --set-upstream origin master"
@@ -645,10 +668,10 @@ rgt "rg TODO"

 # make [[[ #

-ma "printf '\033c' && bear make"
-mc "bear make clean"
-mca "bear make clean && printf '\033c' && bear make"
-rmc "rm compile_commands.json"
+# ma "printf '\033c' && bear make"
+# mc "bear make clean"
+# mca "bear make clean && printf '\033c' && bear make"
+# rmc "rm compile_commands.json"

 # ]]] make #

@@ -817,6 +840,9 @@ ssc "mosh mokkar@teach.cs.utoronto.ca"
 # red-hat [[[ #

 # laptop
+# gcfr "git config user.email 'kmok@redhat.com' && git config user.signingkey 10B001347552F396"
+gchk "git checkout KOGITO-"
+
 loe "libreoffice ~/Documents/expenses/2020.ods &"
 ssw "mosh $WORK_LAPTOP_IP tmux a"
 ssi "mosh $WORK_LAPTOP_IP -- tmux a -t weechat"
@@ -840,8 +866,26 @@ ot "oc status"

 # ]]] oc #

-jk "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:112ef7228e7a8cea5435473f9416cb56e1"
-jkb "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:112ef7228e7a8cea5435473f9416cb56e1 build -s -v"
-jkc "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:112ef7228e7a8cea5435473f9416cb56e1 console -f"
+# jenkins [[[ #
+
+jk "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:$JENKINS_TOKEN"
+jkb "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:$JENKINS_TOKEN build -s -v"
+jkc "java -jar ~/java/jenkins-cli.jar -s http://localhost:8090 -auth kevin:$JENKINS_TOKEN console -f"
+
+# ]]] jenkins #
+
+# maven [[[ #
+
+mc "mvn clean"
+# mps "mvn package -DskipTests"
+mp "mvn package -DskipTests"
+mpr "mvn package -DskipTests && ./server-control.sh start"
+mt "mvn test"
+mct "mvn clean test"
+
+# ]]] maven #
+
+kg "kogito"
+mk "minikube"

 # ]]] red-hat #
--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -6,6 +6,7 @@ bg ~/Pictures/Backgrounds
 cf ~/linux-config/dot_config
 cfd ~/.config
 cff ~/.config/fish
+da /mnt/ipad
 dl  ~/Downloads
 # dw ~/dwm
 D  ~/Documents
@@ -58,7 +59,7 @@ j ~/Documents/journal
 lh ~/Documents/listening-history
 mmd ~/coding/move-mouse-with-head
 ms ~/coding/mf-site
-ml ~/coding/mf-site/content/letter
+msl ~/coding/mf-site/content/letter
 # mp ~/coding/mf-site/static/pdf
 pn ~/coding/red-discord-bot
 sv ~/coding/spotify-lib-vis/src
@@ -72,10 +73,10 @@ wo ~/Documents/workout-logs

 te ~/Pictures/twitch-emotes

-mt ~/.minetest
-mta ~/.minetest/clientmods/custom_aliases
-mtc ~/.minetest/games/mineclone2/mods
-mtm ~/.minetest/minetest
+# mt ~/.minetest
+# mta ~/.minetest/clientmods/custom_aliases
+# mtc ~/.minetest/games/mineclone2/mods
+# mtm ~/.minetest/minetest

 # pk ~/Downloads/gba/mgba/pokemon/emerald/1

@@ -95,19 +96,26 @@ adP ~/Pictures/ada-mario

 # gaming [[[ #

+lfo /mnt/linux-files/Videos/obs
+
 cm ~/Documents/codm
 cs ~/Documents/codm/site
 csi ~/Documents/codm/site/static/images
 Css ~/Pictures/screenshots/mobile/codm

+# fortnite [[[ #
+
 fn ~/Documents/fortnite
 fnc /mnt/linux-files/Videos/yt/fortnite/clips/4
+fni /mnt/ipad/DCIM/100APPLE
 fnm ~/Documents/fortnite/pics/maps
 fnn ~/Documents/fortnite/notes
 fns ~/Documents/fortnite/stats/api
 fnv /mnt/linux-files/Videos/personal-fortnite-games/review
 tcd /mnt/linux-files/Videos/yt/fortnite/clips/twitch-clip-downloader

+# ]]] fortnite #
+
 # ]]] gaming #

 # sch [[[ #
@@ -121,17 +129,31 @@ lt ~/school/latex-notes

 rh ~/Documents/red-hat
 rhc ~/Documents/red-hat/chat
+wcl ~/.weechat/logs

 # kogito [[[ #

 k  ~/coding/kogito
+ka ~/coding/kogito/kogito-apps
+kdo ~/coding/kogito/kie-docs
 kex ~/coding/kogito/kogito-examples
-kg ~/coding/kogito/github-release-test
+kfl ~/coding/kogito/kogito-apps
+ki ~/coding/kogito/kogito-images
+kj ~/coding/kogito/jenkins-test
+kjb ~/coding/kogito/jenkins-test-bot
 kl ~/coding/kogito/shared-libraries
-ko ~/coding/kogito/kogito-cloud-operator
-kp ~/Documents/red-hat/pull-requests
-kr ~/coding/kogito/runtimes
+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
+kp ~/coding/kogito/kogito-pipelines
+kpr ~/Documents/red-hat/pull-requests
+kr ~/coding/kogito/kogito-runtimes
+krj ~/coding/kogito/kogito-runtimes/jenkins-spock-tests

 # ]]] kogito #

+vb ~/coding/VileBot/vilebot
+vbs ~/coding/VileBot/vilebot/src/main/java/com/oldterns/vilebot
+
 # ]]] pey #
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@@ -98,6 +98,14 @@ tc /mnt/linux-files/Videos/yt/fortnite/clips/twitch-clip-downloader/clips.txt

 # ]]] gaming #

-kl ~/coding/kogito/shared-libraries/vars/githubscm.groovy
-rht ~/Documents/red-hat/todo.md
+# pey [[[ #
+
 j Jenkinsfile
+klg ~/coding/kogito/shared-libraries/vars/githubscm.groovy
+klm ~/coding/kogito/shared-libraries/vars/maven.groovy
+krt /home/kevin/coding/kogito/kogito-runtimes/jenkins-spock-tests/src/test/vars/JenkinsfilePromote.groovy
+rhd ~/Documents/red-hat/dates.md
+rhm ~/Documents/red-hat/meeting.md
+rht ~/Documents/red-hat/todo.md
+
+# ]]] pey #
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -19,6 +19,7 @@ Xft.rgba: rgb
 /* font [[[ */

 URxvt*cursorBlink: 0
+URxvt*cursorBlink: False
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11
 URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11.5
--- a/dot_config/fish/completions/kogito.fish
+++ b/dot_config/fish/completions/kogito.fish
@@ -0,0 +1,137 @@
+# fish completion for kogito                               -*- shell-script -*-
+
+function __kogito_debug
+    set file "$BASH_COMP_DEBUG_FILE"
+    if test -n "$file"
+        echo "$argv" >> $file
+    end
+end
+
+function __kogito_perform_completion
+    __kogito_debug "Starting __kogito_perform_completion with: $argv"
+
+    set args (string split -- " " "$argv")
+    set lastArg "$args[-1]"
+
+    __kogito_debug "args: $args"
+    __kogito_debug "last arg: $lastArg"
+
+    set emptyArg ""
+    if test -z "$lastArg"
+        __kogito_debug "Setting emptyArg"
+        set emptyArg \"\"
+    end
+    __kogito_debug "emptyArg: $emptyArg"
+
+    set requestComp "$args[1] __complete $args[2..-1] $emptyArg"
+    __kogito_debug "Calling $requestComp"
+
+    set results (eval $requestComp 2> /dev/null)
+    set comps $results[1..-2]
+    set directiveLine $results[-1]
+
+    # For Fish, when completing a flag with an = (e.g., <program> -n=<TAB>)
+    # completions must be prefixed with the flag
+    set flagPrefix (string match -r -- '-.*=' "$lastArg")
+
+    __kogito_debug "Comps: $comps"
+    __kogito_debug "DirectiveLine: $directiveLine"
+    __kogito_debug "flagPrefix: $flagPrefix"
+
+    for comp in $comps
+        printf "%s%s\n" "$flagPrefix" "$comp"
+    end
+
+    printf "%s\n" "$directiveLine"
+end
+
+# This function does three things:
+# 1- Obtain the completions and store them in the global __kogito_comp_results
+# 2- Set the __kogito_comp_do_file_comp flag if file completion should be performed
+#    and unset it otherwise
+# 3- Return true if the completion results are not empty
+function __kogito_prepare_completions
+    # Start fresh
+    set --erase __kogito_comp_do_file_comp
+    set --erase __kogito_comp_results
+
+    # Check if the command-line is already provided.  This is useful for testing.
+    if not set --query __kogito_comp_commandLine
+        set __kogito_comp_commandLine (commandline)
+    end
+    __kogito_debug "commandLine is: $__kogito_comp_commandLine"
+
+    set results (__kogito_perform_completion "$__kogito_comp_commandLine")
+    set --erase __kogito_comp_commandLine
+    __kogito_debug "Completion results: $results"
+
+    if test -z "$results"
+        __kogito_debug "No completion, probably due to a failure"
+        # Might as well do file completion, in case it helps
+        set --global __kogito_comp_do_file_comp 1
+        return 0
+    end
+
+    set directive (string sub --start 2 $results[-1])
+    set --global __kogito_comp_results $results[1..-2]
+
+    __kogito_debug "Completions are: $__kogito_comp_results"
+    __kogito_debug "Directive is: $directive"
+
+    if test -z "$directive"
+        set directive 0
+    end
+
+    set compErr (math (math --scale 0 $directive / 1) % 2)
+    if test $compErr -eq 1
+        __kogito_debug "Received error directive: aborting."
+        # Might as well do file completion, in case it helps
+        set --global __kogito_comp_do_file_comp 1
+        return 0
+    end
+
+    set nospace (math (math --scale 0 $directive / 2) % 2)
+    set nofiles (math (math --scale 0 $directive / 4) % 2)
+
+    __kogito_debug "nospace: $nospace, nofiles: $nofiles"
+
+    # Important not to quote the variable for count to work
+    set numComps (count $__kogito_comp_results)
+    __kogito_debug "numComps: $numComps"
+
+    if test $numComps -eq 1; and test $nospace -ne 0
+        # To support the "nospace" directive we trick the shell
+        # by outputting an extra, longer completion.
+        __kogito_debug "Adding second completion to perform nospace directive"
+        set --append __kogito_comp_results $__kogito_comp_results[1].
+    end
+
+    if test $numComps -eq 0; and test $nofiles -eq 0
+        __kogito_debug "Requesting file completion"
+        set --global __kogito_comp_do_file_comp 1
+    end
+
+    # If we don't want file completion, we must return true even if there
+    # are no completions found.  This is because fish will perform the last
+    # completion command, even if its condition is false, if no other
+    # completion command was triggered
+    return (not set --query __kogito_comp_do_file_comp)
+end
+
+# Remove any pre-existing completions for the program since we will be handling all of them
+# TODO this cleanup is not sufficient.  Fish completions are only loaded once the user triggers
+# them, so the below deletion will not work as it is run too early.  What else can we do?
+complete -c kogito -e
+
+# The order in which the below two lines are defined is very important so that __kogito_prepare_completions
+# is called first.  It is __kogito_prepare_completions that sets up the __kogito_comp_do_file_comp variable.
+#
+# This completion will be run second as complete commands are added FILO.
+# It triggers file completion choices when __kogito_comp_do_file_comp is set.
+complete -c kogito -n 'set --query __kogito_comp_do_file_comp'
+
+# This completion will be run first as complete commands are added FILO.
+# The call to __kogito_prepare_completions will setup both __kogito_comp_results abd __kogito_comp_do_file_comp.
+# It provides the program's completion choices.
+complete -c kogito -n '__kogito_prepare_completions' -f -a '$__kogito_comp_results'
+
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -28,13 +28,10 @@ abbr hum "cd $mfs_dir && hugo serve -D --disableFastRender"
 # system [[[
 set -x HASTE_SERVER https://pste.gq
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
+set -x GOPATH ~/go
 # set -x PATH $GRAALVM_BIN $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
-set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
+set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
-{{ if eq .chezmoi.fullHostname "nzxt" }}
-set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1)
-status --is-interactive; and source (pyenv init -|psub)
-{{ end }}

 # Java [[[ #

@@ -43,6 +40,11 @@ status --is-interactive; and source (pyenv init -|psub)
 # set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk
 # set -x JAVA_HOME $GRAALVM_HOME

+# for shared libs
+# set -x JAVA_HOME /usr/lib/jvm/java-8-openjdk
+set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk
+set -x PATH $JAVA_HOME/bin $PATH
+
 # ]]] Java #

 # system ]]]
@@ -72,8 +74,16 @@ set -xU BROWSER "firefox"

 set -xU FZF_DEFAULT_COMMAND "find ."

-set -xU PHONE_IP "192.168.0.10"
-set -xU WORK_LAPTOP_IP "kmok@192.168.0.15"
+# 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.10"
+set -x WORK_LAPTOP_IP "kmok@192.168.0.12"
+
+{{ if eq .chezmoi.fullHostname "nzxt" }}
+set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1)
+set -x JENKINS_TOKEN 114a1b2e8693b57fa6f4bce88e2deee8cc
+status --is-interactive; and source (pyenv init -|psub)
+{{ end }}

 # ]]] universal var's #

@@ -136,6 +146,7 @@ abbr aprh "task-mod-pri H"
 abbr apj "task-mod-proj"
 abbr asr "task-start"
 abbr at "task-mod-tag"
+abbr atj "task-mod-tag jira"
 abbr aw "task-wait"
 abbr ax "task-context"

@@ -144,6 +155,7 @@ abbr ag "grep-aliases"
 abbr b "buku-fzf"
 abbr bf "buku-fzf fq"
 abbr bq "benq-brightness"
+abbr bun "backup nzxt"
 abbr bupp "backup-phone-pics"
 abbr cccs "sync-alt-cal class"
 abbr cl "clip"
@@ -181,6 +193,7 @@ abbr mn "man-vim"
 abbr ma "man-vim task"
 abbr mat "math"
 abbr mdf "mkdir-cd"
+abbr mtm "maven-test-method"
 abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
 abbr pst "pastebin"
@@ -199,6 +212,8 @@ abbr thes "thesaurus"
 abbr usc "us-to-cad"
 abbr ut "unix-timestamp"
 abbr uzr "unzip-rm"
+abbr vpu "vpn-red-hat up"
+abbr vpd "vpn-red-hat down"
 abbr vsnp "vim-snippet"
 abbr waf "watson-add-fortnite"
 abbr xya "export-pkgs"
--- a/dot_config/fish/functions/maven-test-method.fish
+++ b/dot_config/fish/functions/maven-test-method.fish
@@ -0,0 +1,4 @@
+function maven-test-method
+    # mvn "-Dtest=$argv[1]#*$argv[2]*" clean test
+    mvn "-Dtest=$argv[1]#*$argv[2]*" test
+end
--- a/dot_config/fish/functions/vpn-red-hat.fish
+++ b/dot_config/fish/functions/vpn-red-hat.fish
@@ -0,0 +1,10 @@
+function vpn-red-hat
+    if test $argv[1] = 'up'
+        sudo systemctl start NetworkManager.service
+        and sleep 3
+        and nmcli con up id "1 - Red Hat Global VPN" --ask
+    else if test $argv[1] = 'down'
+        nmcli con down id "1 - Red Hat Global VPN"
+        and sudo systemctl stop NetworkManager.service
+    end
+end
--- a/dot_config/fish/functions/watson-add-fortnite.fish
+++ b/dot_config/fish/functions/watson-add-fortnite.fish
@@ -1,5 +1,5 @@
 function watson-add-fortnite
-  set year_month "2020-06"
+  set year_month "2020-08"
  set start_time "$year_month-$argv[1] $argv[2]"
  set end_time "$year_month-$argv[3] $argv[4]"

--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -95,7 +95,9 @@ bindsym Mod4+z exec cliqz
 set $screenshot_folder "/home/kevin/Pictures/screenshots/desktop/unsorted"
 set $scripts_path "/home/kevin/scripts"
 {{ if .ext_kb }}
-bindsym Mod4+x exec ~/scripts/xmodmap-custom
+# bindsym Mod4+x exec ~/scripts/xmodmap-custom
+bindsym Mod4+x exec notify-send "xmodmap" "$(~/scripts/xmodmap-custom)"
+# bindsym Mod4+e exec notify-send "HPS Word Count" "$(pdftotext /home/kevin/school/latex-notes/hps/essay.pdf - | wc -w)"
 # bindsym Print --release exec "scrot -s $screenshot_folder/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
 bindsym Print --release exec "maim -su | tee ~/Pictures/screenshots/desktop/unsorted/screenshot-$(date +%F_%T).png | xclip -selection clipboard -t image/png"
 bindsym Control+Print --release exec "scrot -u ~/Pictures/screenshots/desktop/unsorted/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
@@ -191,7 +193,7 @@ for_window [class="^.*"] border pixel 3
 gaps inner 0
 gaps outer 0
 {{ if eq .chezmoi.fullHostname "nzxt" }}
-border_radius $border_radius
+# border_radius $border_radius
 {{ end }}

 #  other gaps [[[ # 
@@ -321,13 +323,15 @@ 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 "5"
+set $wl_ip_nast_num "2"
 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'

+#  ws3 [[[ # 
+
 set $ws3 "3 "
 # set $ws3 "3 "
 # workspace $ws3 output $main
@@ -340,11 +344,15 @@ bindsym Mod4+b layout tabbed; exec $term -e fish -c "buku-fzf"
 bindsym Mod4+$mod+b layout tabbed; exec $term -e fish -c "buku-fzf fq"
 bindsym Mod4+g workspace $ws3; layout tabbed; exec gimp

+#  ]]] ws3 # 
+
 set $ws4 "4 "
 workspace $ws4 output $secondary
 bindsym $mod+F4 workspace $ws4; exec $term
 bindsym Mod4+$mod+F4 workspace $ws4; exec urxvt -e ranger $screenshot_folder

+#  ws5 [[[ # 
+
 set $ws5 "5 "
 # workspace $ws5 output $secondary
 assign [class="Steam"] $ws5
@@ -369,11 +377,15 @@ for_window [class="ada-mario"] floating enable
 # for_window [class="ada-mario"] move absolute position 930 480
 for_window [class="ada-mario"] move absolute position 640 0

+#  ]]] ws5 # 
+
+#  ws6 [[[ # 
+
 set $ws6 "6 "
 workspace $ws6 output $secondary
 assign [class="Slack"] $ws6
 # bindsym Mod4+$mod+d workspace $ws6; exec discord
-bindsym Mod4+d workspace $ws6; exec riot-desktop
+bindsym Mod4+d workspace $ws6; exec element-desktop
 # bindsym Mod4+d workspace $ws6; exec firefox -new-window https://riot.im/app
 bindsym Mod4+$mod+d workspace $ws6; exec discord
 # bindsym Mod4+d workspace $ws6; exec discord
@@ -381,7 +393,11 @@ bindsym Mod4+$mod+d workspace $ws6; exec discord
 # bindsym Mod4+d workspace $ws6; exec firefox --new-window https://discordapp.com/channels/430798446723727367/443950744996020228
 # bindsym Mod4+i workspace $ws6; exec firefox -new-window https://riot.im/app
 bindsym Mod4+k workspace $ws6; exec slack
+# bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t weechat'
 bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'mosh kmok@192.168.0.1$wl_ip_nast_num -- tmux a -t weechat'
+# bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'tmux-attach weechat'
+
+#  ]]] ws6 # 

 set $ws7 "7 "
 workspace $ws7 output $secondary
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -1,6 +1,8 @@
 include ~/.cache/wal/colors-kitty.conf
-/* background_opacity .8 */
-background_opacity .9
+# background_opacity .7
+# background_opacity .8
+background_opacity .85
+# background_opacity .9
 clipboard_control write-clipboard write-primary
 enable_audio_bell no

--- a/dot_config/mpv/mpv.conf
+++ b/dot_config/mpv/mpv.conf
@@ -1,3 +1,5 @@
 sub-auto=fuzzy
+# volume=25
+volume=75
 ytdl-format=best
 ytdl-raw-options=sub-format=en,write-srt=
--- a/dot_config/ranger/rc.conf.tmpl
+++ b/dot_config/ranger/rc.conf.tmpl
@@ -667,8 +667,8 @@ set preview_images true
 #   The same as urxvt but utilizing not only the preview pane but the
 #   whole terminal window.
 # set preview_images_method w3m
-# set preview_images_method kitty
 # set preview_images_method ueberzug
+# set preview_images_method kitty
 set preview_images_method urxvt
 # set preview_images_method urxvt-full

--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -1,7 +1,7 @@
 [user]
-	email = me@kevin-mok.com
+	email = kmok@redhat.com
 	name = Kevin Mok
-	signingkey = 6E920656BBAD3E6C
+	signingkey = 10B001347552F396
 [color]
 	ui = auto
 [core]
--- a/6
+++ b/6
@@ -70,11 +70,15 @@ urgency.user.tag.jira.coefficient=5
 # context.home=project.not:ieas project.not:out project.not:sch tag.not:amn
 context.home=project.not:ieas project.not:out
 context.ieas=project:ieas
+context.not-pey=project.not:pey 
 context.out=project:out 
+context.pey=project:pey 
 context.sch=project:sch

-context=home
+# context=home
 # context=out
+context=pey
+# context=not-pey
 # context=sch

 #  }}} context # 
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -64,9 +64,10 @@ autocmd FileType *css,gitcommit,haskell,htmldjango,html,javascript,json,lisp,mar
 " autocmd Filetype markdown set textwidth=0
 " autocmd Filetype html set foldmarker=0
 autocmd BufNewFile,BufRead *.gd set expandtab!
-autocmd Filetype go set expandtab! sw=4
-" autocmd FileType go,groovy,html,java,javascript,Jenkinsfile,python,lua set fdm=indent
-autocmd FileType go,groovy,html,java,javascript,python,lua set fdm=indent
+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 markdown let g:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''", "*":"*"}
 " autocmd Filetype markdown map <F8> :LivedownToggle<CR>
 autocmd Filetype markdown map <F8> :InstantMarkdownPreview<CR>
@@ -91,7 +92,7 @@ autocmd Filetype markdown inoremap >> >
 " ]]] format options "
 " autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=acjMqtvw
 autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=cjMqtvw
-autocmd Filetype Jenkinsfile,taskdata set tw=0
+autocmd Filetype groovy,Jenkinsfile,taskdata set tw=0
 autocmd Filetype json nnoremap <leader>j :%!python -m json.tool<CR>
 autocmd Filetype json set foldmethod=marker
 autocmd Filetype racket set commentstring=;%s;
@@ -271,10 +272,9 @@ Plug 'terryma/vim-multiple-cursors'
 	let g:multi_cursor_exit_from_insert_mode=0
 Plug 'dag/vim-fish'
 " live preview Markdown"
-" Plug 'shime/vim-livedown'
-" Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
-  " let g:instant_markdown_autostart = 0
-  " let g:instant_markdown_port = 8888
+Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
+  let g:instant_markdown_autostart = 0
+  let g:instant_markdown_port = 8888
 " Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }
  " let g:mkdp_auto_start = 1
  " let g:mkdp_browser = 'firefox'
@@ -338,6 +338,8 @@ Plug 'dpelle/vim-LanguageTool'
 " increment dates with C-a
 Plug 'tpope/vim-speeddating'
 Plug 'martinda/Jenkinsfile-vim-syntax'
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+  let g:go_fmt_command = ""
 " ]]] vim-plug "

 " Mappings [[[ "
@@ -406,8 +408,10 @@ nnoremap <leader>fi :YcmCompleter FixIt<CR>
 nnoremap <leader>ft :se ft?<CR>
 " check todo's
 nnoremap <leader>ftd /TODO<CR>
-nnoremap <leader>g :YcmCompleter GoTo<CR>
-nnoremap <leader>gb <C-O>
+" nnoremap <leader>g :YcmCompleter GoTo<CR>
+nnoremap <leader>g :vs \| YcmCompleter GoTo<CR>
+" nnoremap <leader>gb <C-O>
+nnoremap <leader>gb :Git blame<CR>
 " vimdiff split
 nnoremap <leader>gd :Gvdiff 
 nnoremap <leader>gdh :Gvdiff HEAD^
--- a/txt/exclude-dirs-backup.txt.tmpl
+++ b/txt/exclude-dirs-backup.txt.tmpl
@@ -20,4 +20,5 @@
 /var/cache/pacman
 /var/lib/systemd/coredump
 /var/lib/dhcpcd/proc
+/var/lib/docker/overlay2
 /var/log/journal