diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .gitconfig | 2 | ||||
| -rwxr-xr-x | bin/menuscripts/keyadd | 4 | ||||
| -rwxr-xr-x | bin/menuscripts/mpass | 2 | ||||
| -rwxr-xr-x | bin/menuscripts/mpower | 9 | ||||
| -rwxr-xr-x | config/essentials/zsh/.zprofile | 7 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 7 | ||||
| -rwxr-xr-x | config/home/.xprofile | 9 | ||||
| -rw-r--r-- | config/home/.zshenv | 10 | ||||
| -rwxr-xr-x | setup.sh | 5 | ||||
| -rwxr-xr-x | utils/gpgidentity | 2 | ||||
| -rwxr-xr-x | utils/post-commit (renamed from hooks/post-commit) | 0 | ||||
| -rwxr-xr-x | utils/post-merge (renamed from hooks/post-merge) | 0 |
13 files changed, 39 insertions, 19 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00f0b60 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +config/essentials/zsh/.zshrc filter=gpgid
\ No newline at end of file diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..673478c --- /dev/null +++ b/.gitconfig @@ -0,0 +1,2 @@ +[filter "gpgid"] + clean = /home/void/proj/dotfiles/utils/gpgidentity diff --git a/bin/menuscripts/keyadd b/bin/menuscripts/keyadd index 4e7949f..5a38bfb 100755 --- a/bin/menuscripts/keyadd +++ b/bin/menuscripts/keyadd @@ -2,7 +2,7 @@ log() { - notify-send -t 1000 "keyadd" "$1" & + herbe "keyadd" "$1" & >&2 printf '%s\n' "$1" } @@ -55,7 +55,7 @@ then exit 1 fi -HOST=$(hostnamectl hostname) +HOST="$(hostname)" export PASSWORD="keys/$HOST/ssh/$key_pretty" export SSH_ASKPASS="sshpass" ssh-add -q - < "$key" && diff --git a/bin/menuscripts/mpass b/bin/menuscripts/mpass index 5dc2289..fb11091 100755 --- a/bin/menuscripts/mpass +++ b/bin/menuscripts/mpass @@ -22,7 +22,7 @@ done [ "$file" ] || exit 1 pass show -c "$file" || exit 1 -notify-send -t 1000 "mpass" "$file" +herbe "*mpass" "$file" [ "$WAYLAND_DISPLAY" ] && cliphist list >/dev/null && # on wayland and cliphist is running cliphist list | head -n 1 | cliphist delete diff --git a/bin/menuscripts/mpower b/bin/menuscripts/mpower index 51b8e1d..b4b8640 100755 --- a/bin/menuscripts/mpower +++ b/bin/menuscripts/mpower @@ -9,5 +9,10 @@ hibernate EOF )" -[ "$choice" = "firmware" ] && systemctl reboot --firmware-setup -[ "$choice" ] && systemctl "$choice" +case "$choice" in + "suspend") doas /usr/sbin/zzz ;; + "poweroff") doas /usr/sbin/poweroff ;; + "reboot"|"firmware") doas /usr/sbin/reboot ;; + "") exit 1 ;; + *) ;; +esac diff --git a/config/essentials/zsh/.zprofile b/config/essentials/zsh/.zprofile deleted file mode 100755 index 9072f28..0000000 --- a/config/essentials/zsh/.zprofile +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne 0 ]; then - eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" - exec startx > /dev/null 2>&1 - exit -fi diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 68aae3f..3a75873 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -1,5 +1,12 @@ #!/bin/zsh +if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne 0 ]; then + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents ssh,gpg)" + keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg IDENTITY #FILTERED + exec startx > /dev/null 2>&1 + exit +fi + # zmodload zsh/zprof autoload -U select-word-style diff --git a/config/home/.xprofile b/config/home/.xprofile index f51fcad..718a319 100755 --- a/config/home/.xprofile +++ b/config/home/.xprofile @@ -1,3 +1,9 @@ +#!/bin/sh + +feh --no-fehbg --bg-scale "$HOME"/pics/wallpaper & + +setxkbmap us -variant colemak -option ctrl:swapcaps,menu:altwin & + # TODO: check if this is home if [ "$(hostname)" = "winter" ]; then ( @@ -7,8 +13,6 @@ if [ "$(hostname)" = "winter" ]; then fi picom -b & -feh --no-fehbg --bg-scale "$HOME"/pics/wallpaper & -setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win & # xautolock -locker slock & @@ -20,6 +24,7 @@ slstatus & unclutter --timeout 3 --jitter 50 -b & 202020 & +echo 4 if [ "$(hostname)" = "winter" ]; then signal-desktop & discord & diff --git a/config/home/.zshenv b/config/home/.zshenv index 4932584..4bb166c 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -1,9 +1,9 @@ #!/bin/zsh -export EDITOR="nvim" -export VISUAL="nvim" +export EDITOR="vis" +export VISUAL="vis" -export BROWSER="zen-browser" +export BROWSER="firefox" export VIEWER="zathura" export PLAYER="mpv" export MENUCMD="dmenu" @@ -47,7 +47,7 @@ alias irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HO alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc' export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc -export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority +export XAUTHORITY=$HOME/.Xauthority export ZDOTDIR="$XDG_CONFIG_HOME"/zsh export HISTFILE="$ZDOTDIR"/histfile @@ -64,7 +64,7 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 # export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java # export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on' -export PASSWORD_STORE_DIR="$HOME"/src/password-store +export PASSWORD_STORE_DIR="$HOME"/.password-store export PASSWORD_STORE_CLIP_TIME=5 # old diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..f7855a7 --- /dev/null +++ b/setup.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -ex + +git config --local include.path ../.gitconfig diff --git a/utils/gpgidentity b/utils/gpgidentity new file mode 100755 index 0000000..5a958b2 --- /dev/null +++ b/utils/gpgidentity @@ -0,0 +1,2 @@ +#!/bin/sh +sed '/#FILTERED$/s/[^ ]\+ #FILTERED$/IDENTITY #FILTERED/g' diff --git a/hooks/post-commit b/utils/post-commit index a6b419d..a6b419d 100755 --- a/hooks/post-commit +++ b/utils/post-commit diff --git a/hooks/post-merge b/utils/post-merge index a6b419d..a6b419d 100755 --- a/hooks/post-merge +++ b/utils/post-merge |