janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: shortcut adjustments

This commit is contained in:
xeruf 2021-05-31 18:48:58 +02:00
parent 8facce2ba3
commit 097e2142d2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=/home/janek/.local/bin/scripts/update-keyboard-layout Exec=sh -c "sleep 3 && /home/janek/.local/bin/scripts/update-keyboard-layout"
Icon= Icon=
Name=update-keyboard-layout Name=update-keyboard-layout
Path= Path=

2
.config/git/config
View File

@ -96,7 +96,7 @@
lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph
lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges
lp = log -p --date=local lp = log -p --date=local
ln = !git --no-pager lo "-$(a=$(git rev-list --count HEAD...@{u} 2>/dev/null); test ${a:-0} -gt 4 && expr $a + 3 || echo 7)" --graph HEAD @{u} 2>/dev/null || git --no-pager lo -7 ln = !git --no-pager lo "-$(a=$(git rev-list --count HEAD...@{push} 2>/dev/null); expr $a + 3 \\& ${a:-0} \\> 4 \\| 7)" --color=always --graph HEAD @{u} 2>/dev/null | head -9 || git --no-pager lo -7
my = lo --author [Jj]anek my = lo --author [Jj]anek
standup = my --since yesterday --all standup = my --since yesterday --all
co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++' co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++'

2
.local/bin/scripts/git-ready
View File

@ -3,6 +3,6 @@
# or the first named ref from the history if there is no upstream yet. # or the first named ref from the history if there is no upstream yet.
if test $# -gt 0 if test $# -gt 0
then remote="$1"; shift then remote="$1"; shift
else remote=$(git rev-parse --verify --quiet @{push} || git rev-parse $(git describe --all HEAD~ | cut -d '-' -f-2)) else remote=$(git rev-parse --verify --quiet @{push} || git rev-parse $(git describe --all HEAD~ | rev | cut -d '-' -f3- | rev))
fi fi
git rebase -i "$remote" "$@" git rebase -i "$remote" "$@"

2
.zprofile
View File

@ -43,7 +43,7 @@ test -f "/usr/lib/libstderred.so" && export LD_PRELOAD="/usr/lib/libstderred.so$
# enable pass extensions # enable pass extensions
export PASSWORD_STORE_ENABLE_EXTENSIONS="true" export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
# fzf defaults # fzf defaults
export FZF_DEFAULT_OPTS='--select-1 --exit-0 --tiebreak=end,length --history=/var/tmp/fzf-history --ansi --bind="alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {}),alt-bspace:execute(gio trash {}),change:top,double-click:execute(xdg-open {})"' export FZF_DEFAULT_OPTS='--select-1 --exit-0 --tiebreak=end,length --history=/var/tmp/fzf-history --ansi --bind="alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {}),alt-bspace:execute(gio trash {}),change:top,double-click:execute(xdg-open {}),alt-c:yank"'
FD_BASE="fd --hidden --color=always --no-ignore-vcs" FD_BASE="fd --hidden --color=always --no-ignore-vcs"
export FZF_DEFAULT_COMMAND="$FD_BASE --type file" export FZF_DEFAULT_COMMAND="$FD_BASE --type file"
export FZF_CTRL_T_COMMAND="$FD_BASE -d 7" export FZF_CTRL_T_COMMAND="$FD_BASE -d 7"