diff --git a/bash/bash_aliases.sh b/bash/bash_aliases.sh index 5019f4a..d86badd 100644 --- a/bash/bash_aliases.sh +++ b/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 ) } diff --git a/bash/git-aware-prompt b/bash/git-aware-prompt index b032b41..df8f218 160000 --- a/bash/git-aware-prompt +++ b/bash/git-aware-prompt @@ -1 +1 @@ -Subproject commit b032b4156241182a69c2bce36bddb97469194336 +Subproject commit df8f218d4af51b1fac03f58bf0ddc776466312de diff --git a/i3/helpers/recently_used b/i3/helpers/recently_used index 214f15d..a134dd4 160000 --- a/i3/helpers/recently_used +++ b/i3/helpers/recently_used @@ -1 +1 @@ -Subproject commit 214f15d38dac18d23b32d310b290491d91fff958 +Subproject commit a134dd4a6497963ba2acb76ec0c9a1d90f36bbd8 diff --git a/per-host/kugane/.bash_aliases b/per-host/kugane/.bash_aliases new file mode 100644 index 0000000..4a05da1 --- /dev/null +++ b/per-host/kugane/.bash_aliases @@ -0,0 +1,2 @@ +#!/bin/bash +. "$( dirname "$(realpath -e "${BASH_SOURCE[0]}")" )"/../../bash/bash_aliases.sh diff --git a/per-host/kugane/.config/i3/config b/per-host/kugane/.config/i3/config new file mode 120000 index 0000000..8c5e76b --- /dev/null +++ b/per-host/kugane/.config/i3/config @@ -0,0 +1 @@ +../../../../i3/config \ No newline at end of file diff --git a/per-host/kugane/.config/khard b/per-host/kugane/.config/khard new file mode 120000 index 0000000..60d0891 --- /dev/null +++ b/per-host/kugane/.config/khard @@ -0,0 +1 @@ +../../../khard \ No newline at end of file diff --git a/per-host/kugane/.config/nvim b/per-host/kugane/.config/nvim new file mode 120000 index 0000000..90f57e4 --- /dev/null +++ b/per-host/kugane/.config/nvim @@ -0,0 +1 @@ +../../../nvim \ No newline at end of file diff --git a/per-host/kugane/.config/vdirsyncer b/per-host/kugane/.config/vdirsyncer new file mode 120000 index 0000000..4493ea3 --- /dev/null +++ b/per-host/kugane/.config/vdirsyncer @@ -0,0 +1 @@ +../../../vdirsyncer/ \ No newline at end of file diff --git a/per-host/kugane/.gitconfig b/per-host/kugane/.gitconfig new file mode 120000 index 0000000..0b083aa --- /dev/null +++ b/per-host/kugane/.gitconfig @@ -0,0 +1 @@ +../../git/gitconfig \ No newline at end of file diff --git a/per-host/kugane/.inputrc b/per-host/kugane/.inputrc new file mode 100644 index 0000000..99cec8e --- /dev/null +++ b/per-host/kugane/.inputrc @@ -0,0 +1 @@ +$include ~/.inputrc-common diff --git a/per-host/kugane/.inputrc-common b/per-host/kugane/.inputrc-common new file mode 120000 index 0000000..55d45ef --- /dev/null +++ b/per-host/kugane/.inputrc-common @@ -0,0 +1 @@ +../../readline/inputrc \ No newline at end of file diff --git a/per-host/kugane/.ssh/config b/per-host/kugane/.ssh/config new file mode 100644 index 0000000..cfdf849 --- /dev/null +++ b/per-host/kugane/.ssh/config @@ -0,0 +1 @@ +Include config-common diff --git a/per-host/kugane/.ssh/config-common b/per-host/kugane/.ssh/config-common new file mode 120000 index 0000000..6e6d201 --- /dev/null +++ b/per-host/kugane/.ssh/config-common @@ -0,0 +1 @@ +../../../ssh/config \ No newline at end of file diff --git a/per-host/kugane/.ssh/rc b/per-host/kugane/.ssh/rc new file mode 100644 index 0000000..6939f27 --- /dev/null +++ b/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 diff --git a/per-host/kugane/.tmux.conf b/per-host/kugane/.tmux.conf new file mode 120000 index 0000000..00d8ae9 --- /dev/null +++ b/per-host/kugane/.tmux.conf @@ -0,0 +1 @@ +../../tmux/oh-my-tmux/.tmux.conf \ No newline at end of file diff --git a/per-host/kugane/.tmux.conf.local b/per-host/kugane/.tmux.conf.local new file mode 120000 index 0000000..8eab89f --- /dev/null +++ b/per-host/kugane/.tmux.conf.local @@ -0,0 +1 @@ +../../tmux/tmux.conf \ No newline at end of file diff --git a/per-host/kugane/.vim b/per-host/kugane/.vim new file mode 120000 index 0000000..3a26453 --- /dev/null +++ b/per-host/kugane/.vim @@ -0,0 +1 @@ +../../vim \ No newline at end of file diff --git a/per-host/kugane/.vimrc b/per-host/kugane/.vimrc new file mode 100644 index 0000000..1c85cde --- /dev/null +++ b/per-host/kugane/.vimrc @@ -0,0 +1 @@ +source $VIM_CONFIG_DIR/vimrc diff --git a/per-host/kugane/.zshrc b/per-host/kugane/.zshrc new file mode 100644 index 0000000..37d1c7b --- /dev/null +++ b/per-host/kugane/.zshrc @@ -0,0 +1 @@ +source $(dirname $(readlink -e ${(%):-%N}))/../../zsh/zshrc.zsh diff --git a/tmux/oh-my-tmux b/tmux/oh-my-tmux index ed0b83a..9cf4973 160000 --- a/tmux/oh-my-tmux +++ b/tmux/oh-my-tmux @@ -1 +1 @@ -Subproject commit ed0b83a1184929ec967921d0db6bb0c4e6e9a2c5 +Subproject commit 9cf49731cd785b76cf792046feed0e8275457918 diff --git a/tmux/tmux-open b/tmux/tmux-open index 5b09bd9..763d0a8 160000 --- a/tmux/tmux-open +++ b/tmux/tmux-open @@ -1 +1 @@ -Subproject commit 5b09bd955292ae33ef6d3519df09b5bc1b0ff49e +Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim index d93d978..7c972cb 160000 --- a/vim/bundle/ctrlp.vim +++ b/vim/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit d93d97813dc839ef0782302a0debd7c4877f09f3 +Subproject commit 7c972cb19c8544c681ca345c64ec39e04f4651cc diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index 052b1f0..9b465ac 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 052b1f00a0ef14b0019f4d0cda9906ba93f9a0d6 +Subproject commit 9b465acb2745beb988eff3c1e4aa75f349738230 diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin index f522a09..e1fe727 160000 --- a/vim/bundle/nerdtree-git-plugin +++ b/vim/bundle/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit f522a091e2838812d2669c331d7e9c283db6d54d +Subproject commit e1fe727127a813095854a5b063c15e955a77eafb diff --git a/vim/bundle/nvim-cmp b/vim/bundle/nvim-cmp index af07ff9..d818fd0 160000 --- a/vim/bundle/nvim-cmp +++ b/vim/bundle/nvim-cmp @@ -1 +1 @@ -Subproject commit af07ff9b7973e95eff9e0275e13fe0350281208b +Subproject commit d818fd0624205b34e14888358037fb6f5dc51234 diff --git a/vim/bundle/nvim-lspconfig b/vim/bundle/nvim-lspconfig index 22b21bc..fdc4476 160000 --- a/vim/bundle/nvim-lspconfig +++ b/vim/bundle/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 22b21bc000a8320675ea10f4f50f1bbd48d09ff2 +Subproject commit fdc44768a09a65140aa00c92872a5381ad486485 diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips index ee31ea1..49dc8cb 160000 --- a/vim/bundle/ultisnips +++ b/vim/bundle/ultisnips @@ -1 +1 @@ -Subproject commit ee31ea1c7d08ced8577120b4c1d55c5a05351a75 +Subproject commit 49dc8cb2086db19d385791c8e1635723b0fd95c7 diff --git a/vim/bundle/vim-accent b/vim/bundle/vim-accent index 3a4d160..2cc9925 160000 --- a/vim/bundle/vim-accent +++ b/vim/bundle/vim-accent @@ -1 +1 @@ -Subproject commit 3a4d1608eb77eacd05abab6766deec20ae3e45f0 +Subproject commit 2cc9925c59393e277c2714875f1263cc49c59e74 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline index b93492b..d25c049 160000 --- a/vim/bundle/vim-airline +++ b/vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit b93492b40b068d4bb3020c123295061aaba7c846 +Subproject commit d25c049e617775eb2eb26c580e5dec591c94d480 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter index b356cc9..7b0b509 160000 --- a/vim/bundle/vim-gitgutter +++ b/vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit b356cc9a7da08ebeb919cd04b2831dad71a34d38 +Subproject commit 7b0b5098e3e57be86bb96cfbf2b8902381eef57c diff --git a/zsh/customizations/plugins/zlong_alert b/zsh/customizations/plugins/zlong_alert index e5a7896..8df5b68 160000 --- a/zsh/customizations/plugins/zlong_alert +++ b/zsh/customizations/plugins/zlong_alert @@ -1 +1 @@ -Subproject commit e5a789635fd074c39c3faad7959644f690b6ae88 +Subproject commit 8df5b6808bba4bf896f6765cca28b5705a048bad diff --git a/zsh/ohmyzsh b/zsh/ohmyzsh index d41ca84..d525e80 160000 --- a/zsh/ohmyzsh +++ b/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit d41ca84af1271e8bfbe26f581cebe3b86521d0db +Subproject commit d525e80355597d752f941edfe0415b3ae881a774