Compare commits
4 Commits
079745c41a
...
9afbc424d1
Author | SHA1 | Date |
---|---|---|
Nathan Dwarshuis | 9afbc424d1 | |
Nathan Dwarshuis | b58edd1643 | |
Nathan Dwarshuis | 4c96de59bc | |
Nathan Dwarshuis | 1a4f89a8f9 |
|
@ -48,6 +48,7 @@ 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
|
||||||
|
|
||||||
|
|
|
@ -251,6 +251,7 @@ 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
|
||||||
|
@ -314,6 +315,7 @@ 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" \
|
||||||
|
|
|
@ -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://lamdahub.yavin4.ch/ndwarshuis/xkb-hypermode/archive/v$pkgver.tar.gz")
|
source=("https://github.com/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")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue