From 9d91fb90fa1359ff9b0a9a69ef54adc45f18af05 Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Thu, 25 Mar 2021 10:27:44 +0100
Subject: [PATCH] bin: show stashes in git-st

---
 .config/git/config                        | 3 +--
 .local/bin/scripts/git-st                 | 2 ++
 .local/bin/scripts/update-keyboard-layout | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100755 .local/bin/scripts/git-st

diff --git a/.config/git/config b/.config/git/config
index 93c3102..280d301 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -66,7 +66,6 @@
 
 [alias]
 	# GET INFO
-	st = !git stl && git stb
 	stb = status --short --branch --show-stash
 	stv = --paginate status -v
 	stvv = --paginate status -vv
@@ -124,7 +123,7 @@
 	rh = reset HEAD~
 	rs = reset --keep
 	ru = reset --keep @{upstream}
-	unstage = reset HEAD --
+	unstage = restore --staged --
 
 	format-head = !git stash && git-clang-format HEAD~ && git commit -a --amend --no-edit && git stash pop
 
diff --git a/.local/bin/scripts/git-st b/.local/bin/scripts/git-st
new file mode 100755
index 0000000..31792e9
--- /dev/null
+++ b/.local/bin/scripts/git-st
@@ -0,0 +1,2 @@
+#!/bin/sh
+git stl && git stb "$@"
diff --git a/.local/bin/scripts/update-keyboard-layout b/.local/bin/scripts/update-keyboard-layout
index 0b04c97..7c93a9c 100755
--- a/.local/bin/scripts/update-keyboard-layout
+++ b/.local/bin/scripts/update-keyboard-layout
@@ -9,7 +9,7 @@ echo "Keyboard layout update to $id($ACTION) at $(date)" >>/tmp/scripts.log
 export XAUTHORITY="/run/user/1000/Xauthority" DISPLAY=:0
 # setxkbmap "$id" #nodeadkeys
 xkbstate="$(dirname $(dirname $0))/xkblayout-state"
-test "$(xkbstate print %C)" -gt 1 && xkbstate set $id
+test "$($xkbstate print %C)" -gt 1 && $xkbstate set $id
 # Swap semicolon and colon - https://unix.stackexchange.com/questions/615799/swap-semicolon-colon-to-p-unexpected-cause-semicolon-colon-affected-by-cpas-lock
 # test "$id" = "eu" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon'
 test "$id" = "1" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon' || setxkbmap de nodeadkeys