From 0b76d36b1b94d631616f165073b3284b277a74c6 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 26 Dec 2024 22:07:43 +0100 Subject: checkpoint --- config/wayland/hypr/hyprland.conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/wayland/hypr/hyprland.conf b/config/wayland/hypr/hyprland.conf index e793642..7d3cd9e 100644 --- a/config/wayland/hypr/hyprland.conf +++ b/config/wayland/hypr/hyprland.conf @@ -1,6 +1,7 @@ -monitor=HDMI-A-4, 1920x1080, 0x0, 1 -monitor=VGA-1, 1920x1080, 1920x0, 1 -monitor=,preferred,auto,1 +monitor=HDMI-A-1, 1920x1080, 0x0, 1 +monitor = , preferred, auto, 1, mirror, DP-1 +# monitor=HDMI-A-4, 1920x1080, 0x0, 1 +# monitor=VGA-1, 1920x1080, 1920x0, 1 source = ./env.conf @@ -52,11 +53,6 @@ decoration { active_opacity = 1.00 inactive_opacity = 0.97 - - drop_shadow = no - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) } animations { -- cgit v1.2.3 From d79faa9e1b36e99dcf8925fc3271f32950f00309 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 29 Dec 2024 07:09:24 +0100 Subject: checkpoint --- .gitattributes | 1 + .gitconfig | 2 ++ bin/menuscripts/keyadd | 4 ++-- bin/menuscripts/mpass | 2 +- bin/menuscripts/mpower | 9 +++++++-- config/essentials/zsh/.zprofile | 7 ------- config/essentials/zsh/.zshrc | 7 +++++++ config/home/.xprofile | 9 +++++++-- config/home/.zshenv | 10 +++++----- hooks/post-commit | 3 --- hooks/post-merge | 3 --- setup.sh | 5 +++++ utils/gpgidentity | 2 ++ utils/post-commit | 3 +++ utils/post-merge | 3 +++ 15 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitconfig delete mode 100755 config/essentials/zsh/.zprofile delete mode 100755 hooks/post-commit delete mode 100755 hooks/post-merge create mode 100755 setup.sh create mode 100755 utils/gpgidentity create mode 100755 utils/post-commit create mode 100755 utils/post-merge (limited to 'config') 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/hooks/post-commit b/hooks/post-commit deleted file mode 100755 index a6b419d..0000000 --- a/hooks/post-commit +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rm ~/bin/keyboards.txt ~/.config/user-dirs.dirs ~/bin/wd -stowdots d \ No newline at end of file diff --git a/hooks/post-merge b/hooks/post-merge deleted file mode 100755 index a6b419d..0000000 --- a/hooks/post-merge +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rm ~/bin/keyboards.txt ~/.config/user-dirs.dirs ~/bin/wd -stowdots d \ No newline at end of file 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/utils/post-commit b/utils/post-commit new file mode 100755 index 0000000..a6b419d --- /dev/null +++ b/utils/post-commit @@ -0,0 +1,3 @@ +#!/bin/sh +rm ~/bin/keyboards.txt ~/.config/user-dirs.dirs ~/bin/wd +stowdots d \ No newline at end of file diff --git a/utils/post-merge b/utils/post-merge new file mode 100755 index 0000000..a6b419d --- /dev/null +++ b/utils/post-merge @@ -0,0 +1,3 @@ +#!/bin/sh +rm ~/bin/keyboards.txt ~/.config/user-dirs.dirs ~/bin/wd +stowdots d \ No newline at end of file -- cgit v1.2.3 From 112449dd19eaae6769ef95a70b3e52234256400c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 29 Dec 2024 20:02:59 +0100 Subject: checkpoint --- bin/extra/notify-send | 81 ++++++++++++++++++++++++++++++++++++++++++++ bin/menuscripts/mpass | 2 +- config/essentials/git/config | 2 +- 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100755 bin/extra/notify-send (limited to 'config') diff --git a/bin/extra/notify-send b/bin/extra/notify-send new file mode 100755 index 0000000..3a3872b --- /dev/null +++ b/bin/extra/notify-send @@ -0,0 +1,81 @@ +#!/bin/sh +# Shell script to redirect notify-send calls to herbe. The purpose is to ignore +# options passed to notify-send. +# +# Option parser generated by getoptions +# URL: https://github.com/ko1nksm/getoptions +# LICENSE: Creative Commons Zero v1.0 Universal + +usage() { + printf '%s\n' "${0##*/}: notify-send replacement for herbe" "accepts but ignores all notify-send options." +} + +REST='' +parse() { + OPTIND=$(($#+1)) + while [ $# -gt 0 ] && OPTARG=; do + case $1 in + --?*=*) OPTARG=$1; shift + eval 'set -- "${OPTARG%%\=*}" "${OPTARG#*\=}"' ${1+'"$@"'} + ;; + -[utich]?*) OPTARG=$1; shift + eval 'set -- "${OPTARG%"${OPTARG#??}"}" "${OPTARG#??}"' ${1+'"$@"'} + ;; + -[!-]?*) OPTARG=$1; shift + eval 'set -- "${OPTARG%"${OPTARG#??}"}" "-${OPTARG#??}"' ${1+'"$@"'} + OPTARG= ;; + esac + case $1 in + -u | --urgency) + [ $# -le 1 ] && set -- "$1" required && break + OPTARG=$2 + _=$OPTARG + shift ;; + -t | --expire-time) + [ $# -le 1 ] && set -- "$1" required && break + OPTARG=$2 + _=$OPTARG + shift ;; + -i | --icon) + [ $# -le 1 ] && set -- "$1" required && break + OPTARG=$2 + _=$OPTARG + shift ;; + -c | --category) + [ $# -le 1 ] && set -- "$1" required && break + OPTARG=$2 + _=$OPTARG + shift ;; + -h | --hint) + [ $# -le 1 ] && set -- "$1" required && break + OPTARG=$2 + _=$OPTARG + shift ;; + -? | --help) + usage + exit 0 ;; + --) shift + while [ $# -gt 0 ]; do + REST="${REST} \"\${$(($OPTIND-$#))}\"" + shift + done + break ;; + [-]?*) set -- "$1" unknown && break ;; + *) REST="${REST} \"\${$(($OPTIND-$#))}\"" + esac + shift + done + [ $# -eq 0 ] && return 0 + case $2 in + unknown) echo "unrecognized option '$1'" ;; + noarg) echo "option '$1' doesn't allow an argument" ;; + required) echo "option '$1' requires an argument" ;; + pattern) echo "option '$1' does not match the pattern ($3)" ;; + *) echo "option '$1' validation error: $2" + esac >&2 + exit 1 +} + +parse "$@" +eval set -- "$REST" +herbe "$@" & diff --git a/bin/menuscripts/mpass b/bin/menuscripts/mpass index fb11091..5a09623 100755 --- a/bin/menuscripts/mpass +++ b/bin/menuscripts/mpass @@ -22,7 +22,7 @@ done [ "$file" ] || exit 1 pass show -c "$file" || exit 1 -herbe "*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/config/essentials/git/config b/config/essentials/git/config index 130b8a5..605d4b2 100644 --- a/config/essentials/git/config +++ b/config/essentials/git/config @@ -1,7 +1,7 @@ [init] defaultBranch = main [user] - email = raymaekers.luca@gmail.com + email = luca@spacehb.net name = Raymaekers Luca signingkey = 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D [push] -- cgit v1.2.3