4 files changed, 183 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index cf6e58e..f86960f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ tig:
 vim:
         # amix-vimrc
         if [ ! -d "$(HOME)/.vim_runtime" ]; then 
-                git clone --depth=1 --origin my git@github.com:amix/vimrc.git ~/.vim_runtime && 
+                git clone --depth=1 --origin my https://github.com/amix/vimrc ~/.vim_runtime && 
                 cd ~/.vim_runtime && sh ~/.vim_runtime/install_awesome_vimrc.sh
         fi
         # vim-plug
diff --git a/alias b/alias
index a4ce0b3..50f994f 100644
--- a/alias
+++ b/alias
@@ -422,8 +422,11 @@ tt() {
 
 # upload with 0x0.st
 up() {
-    #curl -F"file=@${1}" http://0x0.st
-    curl -F "file=@${1}" https://api.anonfiles.com/upload
+    curl -F"file=@${1}" http://0x0.st
+    #curl -F "file=@${1}" https://api.anonfiles.com/upload
+}
+sshup() {
+    scp "$1" topo:~/public 
 }
 short() {
     curl -F"shorten=${1}" http://0x0.st
diff --git a/tools/init/load-settings.sh b/tools/init/load-settings.sh
index 779ef45..68844c1 100755
--- a/tools/init/load-settings.sh
+++ b/tools/init/load-settings.sh
@@ -5,9 +5,6 @@ export EDITOR=vim
 source $SETTING_DIR/alias
 [[ -d $SETTING_DIR/private ]] && for f in $SETTING_DIR/private/*; do source $f; done
 
-# set caps as ctrl under X
-setxkbmap -option ctrl:nocaps 2>/dev/null
-
 # Config shell
 shell=$(cat /proc/$$/cmdline | tr -d '\0')
 case $shell in
diff --git a/zsh/_hugo b/zsh/_hugo
new file mode 100644
index 0000000..b6ada8d
--- /dev/null
+++ b/zsh/_hugo
@@ -0,0 +1,177 @@
+#compdef _hugo hugo
+
+# zsh completion for hugo                                 -*- shell-script -*-
+
+__hugo_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_hugo()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
+    local -a completions
+
+    __hugo_debug "\n========= starting completion logic =========="
+    __hugo_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __hugo_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __hugo_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., hugo -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __hugo_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __hugo_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __hugo_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __hugo_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __hugo_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __hugo_debug "directive: ${directive}"
+    __hugo_debug "completions: ${out}"
+    __hugo_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __hugo_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+
+            __hugo_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __hugo_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __hugo_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subDir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __hugo_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __hugo_debug "Listing directories in ."
+        fi
+
+        local result
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        result=$?
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+        return $result
+    else
+        __hugo_debug "Calling _describe"
+        if eval _describe "completions" completions $flagPrefix $noSpace; then
+            __hugo_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __hugo_debug "_describe did not find completions."
+            __hugo_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __hugo_debug "deactivating file completion"
+
+                # We must return an error code here to let zsh know that there were no
+                # completions found by _describe; this is what will trigger other
+                # matching algorithms to attempt to find completions.
+                # For example zsh can match letters in the middle of words.
+                return 1
+            else
+                # Perform file completion
+                __hugo_debug "Activating file completion"
+
+                # We must return the result of this command, so it must be the
+                # last command, or else we must store its result to return it.
+                _arguments '*:filename:_files'" ${flagPrefix}"
+            fi
+        fi
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_hugo" ]; then
+        _hugo
+fi