diff options
| -rw-r--r-- | .bashrc | 11 | ||||
| -rw-r--r-- | .config/dunst/dunstrc | 6 | ||||
| -rw-r--r-- | .config/zathura/zathurarc | 2 | ||||
| -rw-r--r-- | .repos/dwm/config.h | 4 | ||||
| -rw-r--r-- | .repos/slock/config.h | 33 | ||||
| -rw-r--r-- | .repos/slock/slock.c | 4 | ||||
| -rwxr-xr-x | .scripts/adblock | 18 | ||||
| -rwxr-xr-x | .scripts/beep | 11 | ||||
| -rwxr-xr-x | .scripts/decrypt | 6 | ||||
| -rwxr-xr-x | .scripts/encrypt | 7 | ||||
| -rwxr-xr-x | .scripts/panic | 2 | ||||
| -rwxr-xr-x | .scripts/whatamidoing | 7 | ||||
| -rw-r--r-- | .xinitrc | 4 |
13 files changed, 77 insertions, 38 deletions
@@ -19,6 +19,8 @@ export HISTCONTROL=ignoredups:erasedups:ignorespace export LESS='-iMRS -x8' export CLICOLOR=1 +export GPG_TTY=$(tty) + export UNCRUSTIFY_CONFIG=$HOME/.uncrustify.cfg #export ASAN_OPTIONS=verify_asan_link_order=0 @@ -39,6 +41,7 @@ alias gi='git init' alias gs='git status' alias gc='git commit' alias ga='git add' +alias gb='git branch' alias gp='git push' alias gd='git diff' alias gr='git reset' @@ -46,8 +49,8 @@ alias gl='git log' alias gm='git mv' alias gch='git checkout' -disasm() { objdump -drwC -Mintel "$1" | less; } -disasmc() { objdump -drwC -Mintel --visualize-jumps=color "$1" | less -r; } +disasm() { objdump -sdrwC -Mintel "$1" | less; } +disasmc() { objdump -sdrwC -Mintel --visualize-jumps=color "$1" | less -r; } vg() { valgrind --trace-children=yes --track-fds=yes --log-fd=2 --error-limit=no --leak-check=full --show-possibly-lost=yes --track-origins=yes --show-reachable=yes "$@"; } @@ -80,7 +83,7 @@ k() { } e() { - $EDITOR $(rg --files | fzf) + $EDITOR "$(rg --files | fzf)" } . ~/.scripts/z.sh @@ -94,4 +97,4 @@ bind -x '"\C-z":"fg"' #[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh #eval "$(atuin init bash)" -[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh +#[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 6725d9c..7e81f42 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -8,18 +8,20 @@ padding = 2 horizontal_padding = 2 font = Monospace 15 format = "<b>%s</b>\n%b" +mouse_middle_click = context +dmenu = "/usr/local/bin/dmenu -p dunst" [urgency_low] foreground = "#bbbbbb" background = "#222222" frame_color = "#005577" -timeout = 3 +timeout = 5 [urgency_normal] foreground = "#eeeeee" background = "#005577" frame_color = "#005577" -timeout = 5 +timeout = 7 [urgency_critical] background = "#00ff00" diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index f8cab34..bf4e003 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1 +1 @@ -map t exec "zathura-random-page $FILE" +map t exec "zathura-random-page \"$FILE\"" diff --git a/.repos/dwm/config.h b/.repos/dwm/config.h index 26e3439..dade1c5 100644 --- a/.repos/dwm/config.h +++ b/.repos/dwm/config.h @@ -3,7 +3,7 @@ /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ -static const int showbar = 1; /* 0 means no bar */ +static const int showbar = 0; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "Iosevka Term:pixelsize=14:antialias=true:autohint=true" }; static const char dmenufont[] = "Iosevka Term:pixelsize=14:antialias=true:autohint=true"; @@ -161,6 +161,7 @@ static Key keys[] = { { MODKEY|ControlMask|ShiftMask, XK_q, quit, {0} }, { MODKEY, XK_e, spawn, SHCMD("emoji") }, + { MODKEY, XK_n, spawn, SHCMD("firefox") }, { 0, XF86XK_AudioMute, spawn, SHCMD("amixer set Master toggle") }, { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer set Master 5%+") }, @@ -168,6 +169,7 @@ static Key keys[] = { { 0, XF86XK_AudioMicMute, spawn, SHCMD("amixer set Capture toggle") }, { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("brightnessctl s 20-") }, { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("brightnessctl s 20+") }, + { 0, XK_Cancel, spawn, SHCMD("dnd") }, { 0, XF86XK_WLAN, spawn, SHCMD("wifi off") }, //{ 0, XF86XK_WakeUp, spawn, SHCMD("scrot") }, { 0, XF86XK_Display, spawn, SHCMD("screen") }, diff --git a/.repos/slock/config.h b/.repos/slock/config.h index 66a2d9e..093582e 100644 --- a/.repos/slock/config.h +++ b/.repos/slock/config.h @@ -3,11 +3,11 @@ static const char *user = "melvin"; static const char *group = "melvin"; static const char *colorname[NUMCOLS] = { - [BACKGROUND] = "black", /* after initialization */ - [INIT] = "#2d2d2d", /* after initialization */ - [INPUT] = "#2d2d2d", /* during input */ - [FAILED] = "#cc3333", /* wrong password */ - [PAM] = "#9400D3", /* waiting for PAM */ + [BACKGROUND] = "black", /* after initialization */ + [INIT] = "black", /* after initialization */ + [INPUT] = "black", /* during input */ + [FAILED] = "red", /* wrong password */ + [PAM] = "green", /* waiting for PAM */ }; /* treat a cleared input like a wrong password (color) */ @@ -17,25 +17,16 @@ static const int failonclear = 1; static const char* pam_service = "login"; /* insert grid pattern with scale 1:1, the size can be changed with logosize */ -static const int logosize = 75; -static const int logow = 10; /* grid width and height for right center alignment*/ -static const int logoh = 5; +static const int logosize = 50; +static const int logow = 2; /* grid width and height for right center alignment*/ +static const int logoh = 2; -static XRectangle rectangles[11] = { +static XRectangle rectangles[4] = { /* x y w h */ - { 0, 0, 1, 5 }, + { 0, 0, 1, 1 }, + { 0, 1, 1, 1 }, + { 1, 0, 1, 1 }, { 1, 1, 1, 1 }, - { 2, 2, 1, 1 }, - { 3, 1, 1, 1 }, - { 4, 0, 1, 5 }, - - { 6, 0, 1, 5 }, - { 7, 0, 2, 1 }, - { 7, 2, 2, 1 }, - { 7, 4, 2, 1 }, - { 9, 1, 1, 1 }, - { 9, 3, 1, 1 }, - }; /* time in seconds before the monitor shuts down */ diff --git a/.repos/slock/slock.c b/.repos/slock/slock.c index 4bf2b36..8f09c7e 100644 --- a/.repos/slock/slock.c +++ b/.repos/slock/slock.c @@ -17,6 +17,7 @@ #include <sys/types.h> #include <X11/extensions/Xrandr.h> #include <X11/extensions/dpms.h> +#include <X11/XF86keysym.h> #ifdef XINERAMA #include <X11/extensions/Xinerama.h> #endif @@ -228,7 +229,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, IsPrivateKeypadKey(ksym)) continue; switch (ksym) { - case XK_Return: + //case XK_Return: + case XF86XK_Favorites: passwd[len] = '\0'; errno = 0; retval = pam_start(pam_service, hash, &pamc, &pamh); diff --git a/.scripts/adblock b/.scripts/adblock index 3fdbb97..a6d7c44 100755 --- a/.scripts/adblock +++ b/.scripts/adblock @@ -1,9 +1,21 @@ #!/bin/bash -if grep -Fxq "##START" /etc/hosts; then - sudo sed -i "/##START/,/##END/s/#\(.\)/\1/" /etc/hosts +if grep -xq "^##START" /etc/hosts; then + echo "enabling..." + sudo sed -i "/^##START/,/^##END/s/#\(.\)/\1/" /etc/hosts + sudo mv /etc/opensnitchd/adblock/stevenblack /etc/opensnitchd/adblock/stevenblack.txt + while true; do + sleep 0.5s + dig adservice.google.com &>/dev/null || break + done notify-send "Enabled adblock!" else - sudo sed -i "/#START/,/#END/s/./#&/" /etc/hosts + echo "disabling..." + sudo sed -i "/^#START/,/^#END/s/./#&/" /etc/hosts + sudo mv /etc/opensnitchd/adblock/stevenblack.txt /etc/opensnitchd/adblock/stevenblack + while true; do + sleep 0.5s + dig adservice.google.com &>/dev/null && break + done notify-send "Disabled adblock!" fi diff --git a/.scripts/beep b/.scripts/beep index c334bd9..60c93c1 100755 --- a/.scripts/beep +++ b/.scripts/beep @@ -1,4 +1,9 @@ -#!/bin/sh +#!/bin/bash -(amixer get Speaker | grep "off" &>/dev/null) || exit 0 # only beep on headphones -paplay $HOME/.scripts/beep.ogg & +# only beep on headphones +(amixer get Speaker | grep "off" &>/dev/null) && (paplay "$HOME/.scripts/beep.ogg" &) + +# ( +# sleep 0.5 +# dunstctl action +# ) & diff --git a/.scripts/decrypt b/.scripts/decrypt new file mode 100755 index 0000000..d509492 --- /dev/null +++ b/.scripts/decrypt @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +gpg -u "Master" --decrypt --armor -o "$1.dec" "$1" +mv "$1.dec" "$1" diff --git a/.scripts/encrypt b/.scripts/encrypt new file mode 100755 index 0000000..6b399d8 --- /dev/null +++ b/.scripts/encrypt @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +gpg --encrypt --armor --recipient "Master" -o "$1.enc" "$1" +shred "$1" +mv "$1.enc" "$1" diff --git a/.scripts/panic b/.scripts/panic index 1c3de63..da98fb5 100755 --- a/.scripts/panic +++ b/.scripts/panic @@ -2,6 +2,8 @@ # xdotool search "" windowkill %@ +(printf "yes" | dmenu -p "stop" && killall -9 panic) & + for i in $(seq 5); do printf "panic\npanic\npanic" | osd_cat -d 1 -A center -l 3 -p middle -c red -f '-*-*-*-*-*-*-*-240-*-*-*-*-*-*' sleep 0.1 diff --git a/.scripts/whatamidoing b/.scripts/whatamidoing index 3c65677..81612b1 100755 --- a/.scripts/whatamidoing +++ b/.scripts/whatamidoing @@ -1,8 +1,13 @@ #!/bin/sh # arbtt files have limited read access (good!) ==> write current tag to file using cronjob +if ! [ $(pgrep "arbtt-capture") ]; then + notify-send "arbtt" "arbtt-capture is not running!" +fi + if [ "$1" = "sync" ]; then - /home/melvin/.cabal/bin/arbtt-stats --logfile=/home/melvin/.arbtt/capture.log --categorizefile=/home/melvin/.arbtt/categorize.cfg -f '$sampleage < 0:01' | tail -n 1 | awk '{print $1}' >/home/melvin/.arbtt/current + /home/melvin/.cabal/bin/arbtt-stats --logfile=/home/melvin/.arbtt/capture.log --categorizefile=/home/melvin/.arbtt/categorize.cfg -f '$sampleage < 0:01' --also-inactive | tail -n 1 | awk '{print $1}' >/home/melvin/.arbtt/current.tmp + mv /home/melvin/.arbtt/current.tmp /home/melvin/.arbtt/current else cat /home/melvin/.arbtt/current fi @@ -35,8 +35,10 @@ xdotool search --onlyvisible --class Alacritty windowunmap %@ timer run & +#nextcloud --background & + #obsidian & -setsid -f arbtt-capture +#setsid -f arbtt-capture exec dbus-run-session dwm #exec dbus-launch dwm |