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

bin: show stashes in git-st

This commit is contained in:
xerus2000 2021-03-25 10:27:44 +01:00
parent 9065abb03b
commit 9d91fb90fa
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.config/git/config
View File

@ -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

2
.local/bin/scripts/git-st Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
git stl && git stb "$@"

2
.local/bin/scripts/update-keyboard-layout
View File

@ -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