Merge remote-tracking branch 'refs/remotes/origin/master'

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'
+

dot_config/fish/completions/minikube.fish

@@ -0,0 +1,178 @@
+
+# Copyright 2016 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# fish completion for minikube                             -*- shell-script -*-
+
+function __minikube_debug
+    set file "$BASH_COMP_DEBUG_FILE"
+    if test -n "$file"
+        echo "$argv" >> $file
+    end
+end
+
+function __minikube_perform_completion
+    __minikube_debug "Starting __minikube_perform_completion with: $argv"
+
+    set args (string split -- " " "$argv")
+    set lastArg "$args[-1]"
+
+    __minikube_debug "args: $args"
+    __minikube_debug "last arg: $lastArg"
+
+    set emptyArg ""
+    if test -z "$lastArg"
+        __minikube_debug "Setting emptyArg"
+        set emptyArg \"\"
+    end
+    __minikube_debug "emptyArg: $emptyArg"
+
+    if not type -q "$args[1]"
+        # This can happen when "complete --do-complete minikube" is called when running this script.
+        __minikube_debug "Cannot find $args[1]. No completions."
+        return
+    end
+
+    set requestComp "$args[1] __complete $args[2..-1] $emptyArg"
+    __minikube_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")
+
+    __minikube_debug "Comps: $comps"
+    __minikube_debug "DirectiveLine: $directiveLine"
+    __minikube_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 __minikube_comp_results
+# 2- Set the __minikube_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 __minikube_prepare_completions
+    # Start fresh
+    set --erase __minikube_comp_do_file_comp
+    set --erase __minikube_comp_results
+
+    # Check if the command-line is already provided.  This is useful for testing.
+    if not set --query __minikube_comp_commandLine
+        # Use the -c flag to allow for completion in the middle of the line
+        set __minikube_comp_commandLine (commandline -c)
+    end
+    __minikube_debug "commandLine is: $__minikube_comp_commandLine"
+
+    set results (__minikube_perform_completion "$__minikube_comp_commandLine")
+    set --erase __minikube_comp_commandLine
+    __minikube_debug "Completion results: $results"
+
+    if test -z "$results"
+        __minikube_debug "No completion, probably due to a failure"
+        # Might as well do file completion, in case it helps
+        set --global __minikube_comp_do_file_comp 1
+        return 1
+    end
+
+    set directive (string sub --start 2 $results[-1])
+    set --global __minikube_comp_results $results[1..-2]
+
+    __minikube_debug "Completions are: $__minikube_comp_results"
+    __minikube_debug "Directive is: $directive"
+
+    set shellCompDirectiveError 1
+    set shellCompDirectiveNoSpace 2
+    set shellCompDirectiveNoFileComp 4
+    set shellCompDirectiveFilterFileExt 8
+    set shellCompDirectiveFilterDirs 16
+
+    if test -z "$directive"
+        set directive 0
+    end
+
+    set compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2)
+    if test $compErr -eq 1
+        __minikube_debug "Received error directive: aborting."
+        # Might as well do file completion, in case it helps
+        set --global __minikube_comp_do_file_comp 1
+        return 1
+    end
+
+    set filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2)
+    set dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2)
+    if test $filefilter -eq 1; or test $dirfilter -eq 1
+        __minikube_debug "File extension filtering or directory filtering not supported"
+        # Do full file completion instead
+        set --global __minikube_comp_do_file_comp 1
+        return 1
+    end
+
+    set nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2)
+    set nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2)
+
+    __minikube_debug "nospace: $nospace, nofiles: $nofiles"
+
+    # Important not to quote the variable for count to work
+    set numComps (count $__minikube_comp_results)
+    __minikube_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.
+        __minikube_debug "Adding second completion to perform nospace directive"
+        set --append __minikube_comp_results $__minikube_comp_results[1].
+    end
+
+    if test $numComps -eq 0; and test $nofiles -eq 0
+        __minikube_debug "Requesting file completion"
+        set --global __minikube_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 __minikube_comp_do_file_comp)
+end
+
+# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves
+# so we can properly delete any completions provided by another script.
+# The space after the the program name is essential to trigger completion for the program
+# and not completion of the program name itself.
+complete --do-complete "minikube " > /dev/null 2>&1
+# Using '> /dev/null 2>&1' since '&>' is not supported in older versions of fish.
+
+# Remove any pre-existing completions for the program since we will be handling all of them.
+complete -c minikube -e
+
+# The order in which the below two lines are defined is very important so that __minikube_prepare_completions
+# is called first.  It is __minikube_prepare_completions that sets up the __minikube_comp_do_file_comp variable.
+#
+# This completion will be run second as complete commands are added FILO.
+# It triggers file completion choices when __minikube_comp_do_file_comp is set.
+complete -c minikube -n 'set --query __minikube_comp_do_file_comp'
+
+# This completion will be run first as complete commands are added FILO.
+# The call to __minikube_prepare_completions will setup both __minikube_comp_results and __minikube_comp_do_file_comp.
+# It provides the program's completion choices.
+complete -c minikube -n '__minikube_prepare_completions' -f -a '$__minikube_comp_results'
+

dot_config/fish/config.fish.tmpl

@@ -17,41 +17,80 @@ set -x GPG_TTY (tty)
 
 set -U fish_greeting
 
-# spv
 {{ if eq .chezmoi.hostname "nzxt" }}
 set -U spv_dir "/home/kevin/coding/spotify-lib-vis"
 set -U mfs_dir "/home/kevin/coding/mf-site"
 source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh
 abbr hum "cd $mfs_dir && hugo serve -D --disableFastRender"
-{{ end }}
+{{ end }}#]]]
 
-set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin
-set -x CLASSPATH $CLASSPATH /home/kevin/java/*.jar
-set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64
-set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
+# system [[[
 set -x HASTE_SERVER https://pste.gq
 {{ if eq .chezmoi.hostname "nzxt" }}
 set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1)
 {{ end }}
+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 $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/*/bin ~/.yarn/bin
+set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig
 
-{{ if eq .linux_os "termux" }}
+# Java [[[ #
+
+set -x GRAALVM_HOME /usr/lib/jvm/graalvm-ce-java11-21.1.0
+set -x GRAALVM_BIN $GRAALVM_HOME/bin
+set -x JAVA_HOME $GRAALVM_HOME
+
+# set -x JAVA_HOME /usr/lib/jvm/java-11-openjdk
+# set -x JAVA_HOME /usr/lib/jvm/java-8-openjdk # for shared libs
+
+set -x PATH $JAVA_HOME/bin $PATH
+
+# ]]] Java #
+
+# system ]]]
+
+# space prompt[[[
 # set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char
-set SPACEFISH_DIR_PREFIX ''
+set SPACEFISH_ADD_NEWLINE false
 set SPACEFISH_PROMPT_ORDER vi_mode dir git pyenv exec_time jobs exit_code line_sep char
+set SPACEFISH_DIR_PREFIX ''
+set SPACEFISH_DIR_TRUNC 0
+set SPACEFISH_DIR_TRUNC_REPO false
 set SPACEFISH_VI_MODE_INSERT ''
 set SPACEFISH_VI_MODE_NORMAL '[n] '
 set SPACEFISH_VI_MODE_SUFFIX ''
-{{ end }}
+#]]]
 
+# pass[[[
 set -x PASSWORD_STORE_CLIP_TIME 120
 set -xU XSET_RATE 90
 set -xU XSET_DELAY 200
 {{ if and (eq .chezmoi.hostname "x1-carbon") (not (eq .chezmoi.username "root")) }}
 xset r rate $XSET_DELAY $XSET_RATE
+{{ end }}#]]]
+
+set -xU BROWSER "firefox"
+# set -U BROWSER "chromium"
+
+set -xU FZF_DEFAULT_COMMAND "find ."
+
+set -x PHONE_IP "192.168.0.12"
+set -x PIXEL_IP "192.168.0.18"
+set -x WORK_LAPTOP_IP "kmok@192.168.0.11"
+
+{{ if eq .chezmoi.hostname "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 }}
 
-# set -U BROWSER "chromium"
-set -xU BROWSER "firefox"
+set -xU MINIKUBE_IP "http://192.168.49.2"
+set -xU LOCAL_KOGITO_SERVICE_PORT "32000"
+# set -xU LOCAL_KOGITO_SERVICE_URL "$MINIKUBE_IP:$LOCAL_KOGITO_SERVICE_PORT"
+
+set -x FLASK_DEBUG 1
+set -x DB_NAME "covid_monitor"
 
 # ]]] universal var's #
 
@@ -67,11 +106,11 @@ builtin cd $last_dir && ls > /dev/null
 bind \ce edit_command_buffer
 bind \cr forward-word
 
-chezmoi apply
+# chezmoi apply
 {{ if not (eq .linux_os "termux") }}
   ~/scripts/sync-shortcuts
 {{ end }}
-source ~/.config/fish/key_abbr.fish > /dev/null
+# source ~/.config/fish/key_abbr.fish > /dev/null
 set -U fish_fxn_dir "{{ .chezmoi.homeDir }}/linux-config/dot_config/fish/functions"
 # set -U fish_fxn_dir "~/.config/fish/functions"
 abbr ff "cd $fish_fxn_dir"
@@ -97,33 +136,50 @@ abbr xf "fish_config"
 abbr ! "sudo !!"
 # task [[[ #
 
-abbr aan "task-anno"
+abbr aan "task-anno ''"
 abbr ae "task-edit"
 abbr adl "task-delete"
 abbr adn "task-done"
+abbr adu "task-due"
+abbr adr "task-due-rm"
 abbr an "task-next"
+abbr anr "task-next-rm"
 abbr ant "task-notes"
 abbr apr "task-mod-pri"
+abbr aprl "task-mod-pri L"
+abbr aprm "task-mod-pri M"
+abbr aprn "task-mod-pri ''"
+abbr aprh "task-mod-pri H"
 abbr apj "task-mod-proj"
-abbr at "task-mod-tag"
 abbr asr "task-start"
+abbr at "task-mod-tag"
+abbr atj "task-mod-tag jira"
+abbr aw "task-wait"
 abbr ax "task-context"
 
 # ]]] task #
 abbr ag "grep-aliases"
-abbr b "buku-fzf"
-abbr bf "buku-fzf fq"
+abbr bk "buku-fzf"
+abbr bkf "buku-fzf fq"
 abbr bq "benq-brightness"
+abbr bn "discord-burner"
+abbr bun "backup nzxt"
 abbr bupp "backup-phone-pics"
+abbr ca "cad-to-us"
+abbr cccs "sync-alt-cal class"
+abbr cl "clip"
 abbr cpc "copy cat"
 abbr cpe "copy echo"
 abbr cpp "copy echo (pwd)"
 abbr cff "create-fish-function"
 abbr ctr "systemctl-restart"
 abbr def "define"
+abbr drs "dump-rarity-check"
 abbr ens "enable-site"
 abbr ev "evince-silent"
+abbr ff "fzf-cd"
 # abbr fbg "find-bg"
+# abbr fr "fzf-ranger"
 abbr fv "fzf-vim"
 abbr fvft "find-vim-filetype"
 # git [[[ #
@@ -131,49 +187,62 @@ abbr fvft "find-vim-filetype"
 abbr gcamp "git-amend-push"
 abbr gclg "git-clone-gitea"
 abbr gdf "git-diff-files"
+abbr gpsd "git-push-diff-name"
 abbr gpsi "git-push-initial"
 abbr gpsmt "git-push-multiple"
-abbr gpng "git-push-new-gitea gitea"
-abbr gpngo "git-push-new-gitea origin"
+abbr gpng "git-push-new-gitea"
+abbr gpngg "git-push-new-gitea gitea"
 abbr gremotes "git-mult-remotes"
 abbr grmb "git-delete-branch"
 abbr gro "git-replace-origin"
+abbr grog "git-replace-origin-gitea"
+abbr gsmb "git-submodule-branch"
 
 # ]]] git #
+abbr i "sxiv-silent"
+abbr lo "libreoffice-silent"
 abbr ma "man-vim task"
 abbr mat "math"
 abbr mn "man-vim"
+abbr mdf "mkdir-cd"
+abbr mtm "maven-test-method"
 abbr pgr "grep-pdf"
 abbr pgrf "grep-pdf-file"
-abbr png "git-push-new-gitea"
 abbr pst "pastebin"
+abbr qh "qalc-history"
+abbr qu "qalc-update"
+abbr re "reminder ''"
 abbr rf "refresh-config"
-abbr rs "redshift-set"
+abbr rl "readlink-cp"
+abbr rds "redshift-set"
+abbr scf "scp-vid fn"
 abbr sma "smol-add"
 abbr smd "smol-delete"
 abbr sml "smol-slist"
 abbr smr "smol-replace"
 abbr shrm "shred-rm"
-abbr svs "scan-history"
-abbr tac "tmux-attach config"
-abbr taj "tmux-attach journal"
+abbr shs "scan-history"
+abbr svp "server-pages"
+abbr ta "tmux-attach"
+abbr taa "tmux-attach atx"
+abbr taf "tmux-attach fn"
+abbr tan "tmux-attach nft"
+abbr tan2 "tmux-attach nft-2"
+abbr tao "tmux-attach obs"
 abbr thes "thesaurus"
+# abbr usc "us-to-cad"
+abbr us "us-to-cad"
 abbr ut "unix-timestamp"
 abbr uzr "unzip-rm"
 abbr vsnp "vim-snippet"
 abbr wga "wget-all"
+abbr wag "watson-add-game"
+abbr waf "watson-add-game fortnite"
+abbr wap "watson-add-game pokemon-go"
 abbr xya "export-pkgs"
 
 # school [[[ #
 
-# 369
-abbr grc "grep-c"
-abbr grh "grep-headers"
-abbr rgh "rg-headers"
-
-abbr jcr "java-compile-run"
-abbr jct "java-compile-test"
-
 # ]]] school #
 
 # ]]] fxn abbr's #

dot_config/fish/functions/cad-to-us.fish

@@ -0,0 +1,3 @@
+function cad-to-us
+    qalc "$argv[1]CAD to \$"
+end

dot_config/fish/functions/clip.fish

@@ -0,0 +1,7 @@
+function clip
+    if test (count $argv) -eq 3
+        ffmpeg -ss $argv[1] -i $argv[2] -codec copy $argv[3]
+    else
+        ffmpeg -ss $argv[1] -to $argv[2] -i $argv[3] -codec copy $argv[4]
+    end
+end

dot_config/fish/functions/discord-burner.fish

@@ -0,0 +1,15 @@
+function discord-burner
+    # echo nordvpn connect ca1$argv[1] && curl ifconfig.me
+    # nordvpn connect ca1$argv[1] && \
+    # nordvpn connect ca10$argv[1]
+    nordvpn connect
+    curl ifconfig.me
+    if test (count $argv) -gt 1
+        firefox -P discord-$argv[2] $argv[1] &
+    else
+        firefox -P discord-$argv[1] &
+    end
+    # for i in (seq $argv[1] $argv[2])
+        # firefox -P discord-$i $argv[3] &
+    # end
+end

dot_config/fish/functions/dump-rarity-check.fish

@@ -0,0 +1,3 @@
+function dump-rarity-check
+    pg_dump -U rarity_check rarity_check > $argv[1].sql
+end

dot_config/fish/functions/fzf-cd.fish

@@ -0,0 +1,4 @@
+function fzf-cd
+    set dir (fd -td | fzf)
+    cd $dir
+end

dot_config/fish/functions/fzf-ranger.fish

@@ -0,0 +1,6 @@
+function fzf-ranger
+    set dir (fd -td | fzf)
+    if test ! -z "$dir"
+        ranger $dir
+    end
+end

dot_config/fish/functions/fzf-vim.fish

@@ -1,3 +1,6 @@
 function fzf-vim
-    fzf | xargs $EDITOR
+    set file (fzf)
+    if test ! -z "$file"
+        $EDITOR $file
+    end
 end

dot_config/fish/functions/git-log-short.fish

@@ -0,0 +1,3 @@
+function git-log-short
+    git log --pretty="%C(Yellow)%h  %C(reset)%ad (%C(Green)%cr%C(reset))%x09 %C(Cyan)%an: %C(reset)%s"
+end

dot_config/fish/functions/git-submodule-branch.fish

@@ -0,0 +1,3 @@
+function git-submodule-branch
+    git submodule set-branch --branch $argv[2] -- $argv[1]
+end

dot_config/fish/functions/git/git-clone-gitea.fish

@@ -1,3 +1,3 @@
 function git-clone-gitea
-    git clone ssh://git@ataraxy.tk:399/Kevin-Mok/$argv[1].git
+    git clone ssh://git@kevin-mok.com:399/Kevin-Mok/$argv[1].git
 end

dot_config/fish/functions/git/git-push-diff-name.fish

@@ -0,0 +1,3 @@
+function git-push-diff-name
+    git push -f origin HEAD:$argv[1]
+end

dot_config/fish/functions/git/git-push-new-gitea.fish

@@ -1,4 +1,4 @@
 function git-push-new-gitea
-    git remote add $argv[1] ssh://git@ataraxy.tk:399/Kevin-Mok/$argv[2].git
-    and git push --set-upstream $argv[1] master
+    git remote add origin ssh://git@kevin-mok.com:399/Kevin-Mok/$argv[1].git
+    and git push --set-upstream origin main
 end

dot_config/fish/functions/git/git-replace-origin-gitea.fish

@@ -0,0 +1,6 @@
+function git-replace-origin-gitea
+    git remote remove origin
+    and git remote add origin ssh://git@kevin-mok.com:399/Kevin-Mok/$argv[1].git
+    and git branch --set-upstream-to=origin/master master
+    and git push
+end

dot_config/fish/functions/libreoffice-silent.fish

@@ -0,0 +1,3 @@
+function libreoffice-silent
+    libreoffice $argv[1] &
+end

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

dot_config/fish/functions/mkdir-cd.fish

@@ -0,0 +1,3 @@
+function mkdir-cd
+    mkdir -p $argv[1] && cd $argv[1]
+end

dot_config/fish/functions/mute-video.fish

@@ -0,0 +1,3 @@
+function mute-video
+    ffmpeg -i $argv[1] -c copy -an $argv[2]
+end

dot_config/fish/functions/pastebin.fish

@@ -1,5 +1,6 @@
 function pastebin
     # cat $argv[1] | curl -F 'sprunge=<-' http://sprunge.us
     # set -x HASTE_SERVER https://pste.gq
-    cat $argv[1] | haste --raw
+    # cat $argv[1] | haste --raw
+    cat $argv[1] | haste
 end

dot_config/fish/functions/qalc-history.fish

@@ -0,0 +1,3 @@
+function qalc-history
+    qalc $argv[1] | tee -a /home/kevin/Documents/journal/personal/calc-history.md
+end

dot_config/fish/functions/qalc-update.fish

@@ -0,0 +1,3 @@
+function qalc-update
+    qalc -e "$argv[1]USD to CAD" 
+end

dot_config/fish/functions/readlink-cp.fish

@@ -0,0 +1,3 @@
+function readlink-cp
+    readlink -f $argv[1] | xclip -selection clipboard
+end

dot_config/fish/functions/refresh-config-task.fish

@@ -0,0 +1,13 @@
+function refresh-config
+    chezmoi apply
+    and echo 'Applied chezmoi.'
+    # and tmux source-file ~/.tmux.conf
+    # and echo 'Sourced tmux config.'
+
+    sync-shortcuts
+    echo 'Synced shortcuts.'
+    source ~/.config/fish/key_abbr.fish > /dev/null
+    and echo 'Sourced shortcuts.'
+    and echo 'Reloading fish.'
+    and exec fish
+end

dot_config/fish/functions/reminder.fish

@@ -0,0 +1,3 @@
+function reminder
+    termdown $argv[2] && notify-send $argv[1]
+end

dot_config/fish/functions/scan-history.fish

@@ -2,6 +2,7 @@ function scan-history
 	sudo systemctl start postgresql.service
 	# and systemctl status postgresql.service
 	and source $spv_dir/src/scripts/api-keys.sh
+	# and $spv_dir/src/scripts/update-history-2.sh
 	and $spv_dir/src/scripts/update-history.sh 
 	and cat $spv_dir/src/api/management/commands/update-history.log | tail -n 1
 end

dot_config/fish/functions/scp-vid.fish

@@ -0,0 +1,7 @@
+function scp-vid
+    set dest_dir "/mnt/linux-files/Videos/personal-fortnite-games/review"
+	if test $argv[1] = 'pogo'
+        set dest_dir "/mnt/linux-files/Videos/pokemon-go"
+    end
+    scp -P 8022 192.168.0.18:/data/data/com.termux/files/home/storage/dcim/\'Screen\ recordings\'/$argv[2] $dest_dir
+end

dot_config/fish/functions/server-pages.fish

@@ -1,8 +1,8 @@
 function server-pages
-    set sites git.ataraxy.tk khkm.tk cal.khkm.tk mnpd.gq/k-bg pste.gq smol.gq twem.tk
-    set titles "Kevin Mok's Gitea" "Kevin Mok" "Baïkal server" "k-bg" "hastebin" "Kevin's URL Shortener" "Index of /"
-    # set sites mnpd.gq/k-bg
-    # set titles "k-bg"
+    set sites kevin-mok.com git.kevin-mok.com cal.khkm.tk mnpd.gq/kbg pste.gq smol.gq twem.tk
+    set titles "Kevin Mok" "Kevin Mok's Gitea" "Baïkal server" "kbg" "hastebin" "Kevin's URL Shortener" "Twitch Emote Links"
+    # set sites twem.tk
+    # set titles "Twitch Emote Links"
 
     for i in (seq (count $sites))
         set title (wget -qO- "$sites[$i]" | perl -l -0777 -ne 'print $1 if /<title.*?>\s*(.*?)\s*<\/title/si' | recode html)

dot_config/fish/functions/sxiv-silent.fish

@@ -0,0 +1,3 @@
+function sxiv-silent
+    sxiv $argv[1] &
+end

dot_config/fish/functions/task/task-anno.fish

@@ -1,4 +1,4 @@
 function task-anno
-    task $argv[1] annotate $argv[2]
+    task $argv[2] annotate $argv[1]
     and task
 end

dot_config/fish/functions/task/task-delete.fish

@@ -1,5 +1,4 @@
 function task-delete
     task $argv[1] delete
-    and task sync
     and task
 end

dot_config/fish/functions/task/task-done.fish

@@ -1,5 +1,4 @@
 function task-done
     task $argv[1] done
-    and task sync
     and task
 end

dot_config/fish/functions/task/task-due-rm.fish

@@ -0,0 +1,4 @@
+function task-due-rm
+    task $argv[1] mod due:
+    and task
+end

dot_config/fish/functions/task/task-due.fish

@@ -0,0 +1,4 @@
+function task-due
+    task $argv[1] mod due:+$argv[2]
+    and task
+end

dot_config/fish/functions/task/task-mod-pri.fish

@@ -1,4 +1,4 @@
 function task-mod-pri
-    task $argv[1] modify pri:$argv[2]
+    task $argv[2] modify pri:$argv[1]
     and task
 end

dot_config/fish/functions/task/task-next-rm.fish

@@ -0,0 +1,4 @@
+function task-next-rm
+    task $argv[1] modify -next
+    and task
+end

dot_config/fish/functions/task/task-wait.fish

@@ -0,0 +1,4 @@
+function task-wait
+    task $argv[1] mod wait:+$argv[2]
+    and task
+end

dot_config/fish/functions/us-to-cad.fish

@@ -0,0 +1,4 @@
+function us-to-cad
+    # qalc -e "$argv[1]\$ to CAD"
+    qalc "$argv[1]\$ to CAD"
+end

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

dot_config/fish/functions/watson-add-fortnite.fish

@@ -0,0 +1,11 @@
+function watson-add-fortnite
+  set year_month "2020-08"
+  set start_time "$year_month-$argv[1] $argv[2]"
+  set end_time "$year_month-$argv[3] $argv[4]"
+
+  if test (count $argv) -eq 4
+    watson add -f $start_time -t $end_time fun +fortnite
+  else
+    watson add -f $start_time -t $end_time fun +fortnite +$argv[5]
+  end
+end

dot_config/fish/functions/watson-add-game.fish

@@ -0,0 +1,11 @@
+function watson-add-game
+  set year_month (date -u +"%Y-%m")
+  set start_time "$year_month-$argv[2] $argv[3]"
+  set end_time "$year_month-$argv[4] $argv[5]"
+
+  if test (count $argv) -eq 5
+    watson add -f $start_time -t $end_time fun +$argv[1]
+  else
+    watson add -f $start_time -t $end_time fun +$argv[1] +$argv[6]
+  end
+end