From 097e2142d2804959a4c81543113a7f9e1da8aee7 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Mon, 31 May 2021 18:48:58 +0200
Subject: [PATCH] config: shortcut adjustments

---
 .../update-keyboard-layout.desktop##hostname.pavilion-arch      | 2 +-
 .config/git/config                                              | 2 +-
 .local/bin/scripts/git-ready                                    | 2 +-
 .zprofile                                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch b/.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
index abcf05a..690fb2c 100644
--- a/.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
+++ b/.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
@@ -1,5 +1,5 @@
 [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=
 Name=update-keyboard-layout
 Path=
diff --git a/.config/git/config b/.config/git/config
index ce9fb9b..f84a705 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -96,7 +96,7 @@
 	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
 	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
 	standup = my --since yesterday --all
 	co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++'
diff --git a/.local/bin/scripts/git-ready b/.local/bin/scripts/git-ready
index eebdd09..a8e9367 100755
--- a/.local/bin/scripts/git-ready
+++ b/.local/bin/scripts/git-ready
@@ -3,6 +3,6 @@
 # or the first named ref from the history if there is no upstream yet.
 if test $# -gt 0
   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
 git rebase -i "$remote" "$@"
diff --git a/.zprofile b/.zprofile
index 9327e5b..60511b8 100644
--- a/.zprofile
+++ b/.zprofile
@@ -43,7 +43,7 @@ test -f "/usr/lib/libstderred.so" && export LD_PRELOAD="/usr/lib/libstderred.so$
  # enable pass extensions
 export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
  # 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"
 export FZF_DEFAULT_COMMAND="$FD_BASE --type file"
 export FZF_CTRL_T_COMMAND="$FD_BASE -d 7"