Compare commits

..

No commits in common. "9afbc424d11514c53d2495d0fc5c3ca3a0d2e1a6" and "079745c41acb60b77286986b7faebffa23b852c1" have entirely different histories.

4 changed files with 4 additions and 7 deletions

View File

@ -48,7 +48,6 @@ SEAFDIRS=(/mnt/data/Documents)
echo -e "###\n# Seafile conflicts\n###" echo -e "###\n# Seafile conflicts\n###"
for i in "${SEAFDIRS[@]}"; do for i in "${SEAFDIRS[@]}"; do
find "$i" -name "*.sbak"
find "$i" -name "*SFConflict*" find "$i" -name "*SFConflict*"
done done

View File

@ -251,7 +251,6 @@ alias uuuuu='cd ../../../../..'
diffver="$(diff -v | grep -o '\([0-9]\+\.[0-9]\+\)')" diffver="$(diff -v | grep -o '\([0-9]\+\.[0-9]\+\)')"
if [ ${diffver//\.*/} -ge 3 ] && [ ${diffver//*\./} -ge 4 ]; then if [ ${diffver//\.*/} -ge 3 ] && [ ${diffver//*\./} -ge 4 ]; then
alias diff='diff --color' alias diff='diff --color'
alias_if zdiff zdiff='zdiff --color'
fi fi
## don't assume the rest of these will exist ## don't assume the rest of these will exist
@ -315,7 +314,6 @@ alias_if git \
gcam="git commit -v -am" \ gcam="git commit -v -am" \
gci='git commit --interactive' \ gci='git commit --interactive' \
gb='git branch' \ gb='git branch' \
gbl='git branch --list' \
gco='git checkout' \ gco='git checkout' \
glol="git log --graph --decorate --pretty=oneline --abbrev-commit" \ glol="git log --graph --decorate --pretty=oneline --abbrev-commit" \
glola="git log --graph --decorate --pretty=oneline --abbrev-commit --all" \ glola="git log --graph --decorate --pretty=oneline --abbrev-commit --all" \

View File

@ -5,7 +5,7 @@ pkgdesc="custom us keyboard layout with hyper modifiers"
arch=('any') arch=('any')
license=('MIT') license=('MIT')
depends=('xkeyboard-config') depends=('xkeyboard-config')
source=("https://github.com/ndwarshuis/xkb-hypermode/archive/v$pkgver.tar.gz") source=("https://lamdahub.yavin4.ch/ndwarshuis/xkb-hypermode/archive/v$pkgver.tar.gz")
md5sums=('8a211c564d0d31ca514bd3253b5990ba') md5sums=('8a211c564d0d31ca514bd3253b5990ba')
backup=("etc/X11/xorg.conf.d/10-hyperctrl.conf") backup=("etc/X11/xorg.conf.d/10-hyperctrl.conf")

View File

@ -8,6 +8,6 @@
# See https://docs.haskellstack.org/en/stable/yaml_configuration/#templates # See https://docs.haskellstack.org/en/stable/yaml_configuration/#templates
templates: templates:
params: params:
author-name: Nathan Dwarshuis author-name: Nathan Dwarshuis
author-email: ndwar@yavin4.ch author-email: ndwar@yavin4.ch
github-username: ndwarshuis github-username: ndwarshuis