kugane + upgrade modules

bash/bash_aliases.sh

@@ -43,19 +43,19 @@ function __common_configs_in_sync()
     # Failure modes, in order:
     #   exit 9: Problem cd'ing or getting commit hashes - things that should never fail
     cd "$__COMMON_CONFIGS" || exit 9
-    localCommit=$(git show-ref --verify --hash refs/heads/master) || exit 9
+    localCommit=$(git show-ref --verify --hash refs/heads/main) || exit 9
     if [[ $1 == --force-fetch ]] || [[ ! -f .last-fetch ]] || [[ $(date --reference=.last-fetch +%s) -lt $(date --date='5 minutes ago' +%s) ]]; then
       git fetch --quiet origin && touch .last-fetch
     fi
-    remoteCommit=$(git show-ref --verify --hash refs/remotes/origin/master) || exit 9
+    remoteCommit=$(git show-ref --verify --hash refs/remotes/origin/main) || exit 9
     #   exit 1: master is not the commit which is checked out.
-    [[ $(git symbolic-ref HEAD) == "refs/heads/master" ]] || exit 1
+    [[ $(git symbolic-ref HEAD) == "refs/heads/main" ]] || exit 1
     #   exit 2: master and origin/master are different.
     [[ $localCommit == $remoteCommit ]] || exit 2
     #   exit 3: There are staged changes.
     git diff-index --cached --exit-code --quiet HEAD || exit 3
     #   exit 4: There are unstaged changes.
-    git diff-files --exit-code --quiet HEAD || exit 4
+    git diff-files --exit-code --quiet || exit 4
   )
 }
 

bash/git-aware-prompt

@@ -1 +1 @@
-Subproject commit b032b4156241182a69c2bce36bddb97469194336
+Subproject commit df8f218d4af51b1fac03f58bf0ddc776466312de

i3/helpers/recently_used

@@ -1 +1 @@
-Subproject commit 214f15d38dac18d23b32d310b290491d91fff958
+Subproject commit a134dd4a6497963ba2acb76ec0c9a1d90f36bbd8

per-host/kugane/.bash_aliases

@@ -0,0 +1,2 @@
+#!/bin/bash
+. "$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )"/../../bash/bash_aliases.sh

per-host/kugane/.config/i3/config

@@ -0,0 +1 @@
+../../../../i3/config

per-host/kugane/.config/khard

@@ -0,0 +1 @@
+../../../khard

per-host/kugane/.config/nvim

@@ -0,0 +1 @@
+../../../nvim

per-host/kugane/.config/vdirsyncer

@@ -0,0 +1 @@
+../../../vdirsyncer/

per-host/kugane/.gitconfig

@@ -0,0 +1 @@
+../../git/gitconfig

per-host/kugane/.inputrc

@@ -0,0 +1 @@
+$include ~/.inputrc-common

per-host/kugane/.inputrc-common

@@ -0,0 +1 @@
+../../readline/inputrc

per-host/kugane/.ssh/config

@@ -0,0 +1 @@
+Include config-common

per-host/kugane/.ssh/config-common

@@ -0,0 +1 @@
+../../../ssh/config

per-host/kugane/.ssh/rc

@@ -0,0 +1,6 @@
+if [ -n "$BASH_VERSION" ]; then
+  export __COMMON_CONFIGS=$(readlink -e "$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )/../../..")
+  source ${__COMMON_CONFIGS}/ssh/rc
+else
+  exec bash ~/.ssh/rc
+fi

per-host/kugane/.tmux.conf

@@ -0,0 +1 @@
+../../tmux/oh-my-tmux/.tmux.conf

per-host/kugane/.tmux.conf.local

@@ -0,0 +1 @@
+../../tmux/tmux.conf

per-host/kugane/.vim

@@ -0,0 +1 @@
+../../vim

per-host/kugane/.vimrc

@@ -0,0 +1 @@
+source $VIM_CONFIG_DIR/vimrc

per-host/kugane/.zshrc

@@ -0,0 +1 @@
+source $(dirname $(readlink -e ${(%):-%N}))/../../zsh/zshrc.zsh

tmux/oh-my-tmux

@@ -1 +1 @@
-Subproject commit ed0b83a1184929ec967921d0db6bb0c4e6e9a2c5
+Subproject commit 9cf49731cd785b76cf792046feed0e8275457918

tmux/tmux-open

@@ -1 +1 @@
-Subproject commit 5b09bd955292ae33ef6d3519df09b5bc1b0ff49e
+Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e

vim/bundle/ctrlp.vim

@@ -1 +1 @@
-Subproject commit d93d97813dc839ef0782302a0debd7c4877f09f3
+Subproject commit 7c972cb19c8544c681ca345c64ec39e04f4651cc

vim/bundle/nerdtree

@@ -1 +1 @@
-Subproject commit 052b1f00a0ef14b0019f4d0cda9906ba93f9a0d6
+Subproject commit 9b465acb2745beb988eff3c1e4aa75f349738230

vim/bundle/nerdtree-git-plugin

@@ -1 +1 @@
-Subproject commit f522a091e2838812d2669c331d7e9c283db6d54d
+Subproject commit e1fe727127a813095854a5b063c15e955a77eafb

vim/bundle/nvim-cmp

@@ -1 +1 @@
-Subproject commit af07ff9b7973e95eff9e0275e13fe0350281208b
+Subproject commit d818fd0624205b34e14888358037fb6f5dc51234

vim/bundle/nvim-lspconfig

@@ -1 +1 @@
-Subproject commit 22b21bc000a8320675ea10f4f50f1bbd48d09ff2
+Subproject commit fdc44768a09a65140aa00c92872a5381ad486485

vim/bundle/ultisnips

@@ -1 +1 @@
-Subproject commit ee31ea1c7d08ced8577120b4c1d55c5a05351a75
+Subproject commit 49dc8cb2086db19d385791c8e1635723b0fd95c7

vim/bundle/vim-accent

@@ -1 +1 @@
-Subproject commit 3a4d1608eb77eacd05abab6766deec20ae3e45f0
+Subproject commit 2cc9925c59393e277c2714875f1263cc49c59e74

vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit b93492b40b068d4bb3020c123295061aaba7c846
+Subproject commit d25c049e617775eb2eb26c580e5dec591c94d480

vim/bundle/vim-gitgutter

@@ -1 +1 @@
-Subproject commit b356cc9a7da08ebeb919cd04b2831dad71a34d38
+Subproject commit 7b0b5098e3e57be86bb96cfbf2b8902381eef57c

zsh/customizations/plugins/zlong_alert

@@ -1 +1 @@
-Subproject commit e5a789635fd074c39c3faad7959644f690b6ae88
+Subproject commit 8df5b6808bba4bf896f6765cca28b5705a048bad

zsh/ohmyzsh

@@ -1 +1 @@
-Subproject commit d41ca84af1271e8bfbe26f581cebe3b86521d0db
+Subproject commit d525e80355597d752f941edfe0415b3ae881a774