From 1e64a7d670755d21ccda0de635e6d72b62fc066f Mon Sep 17 00:00:00 2001 From: fz0x1 Date: Sun, 24 Nov 2024 18:47:52 +0100 Subject: [PATCH] 20241124 --- .gitattributes | 1 + .gitignore | 1 + .../mutt/accounts/account.com.fz0x1_posteo | 2 +- global/.newsboat/config | 6 ++-- global/.newsboat/miniflux | Bin 0 -> 145 bytes global/.newsboat/urls | 5 --- global/.zshrc | 4 +++ global/.zshrc-secrets | Bin 331 -> 494 bytes global/scripts/bin/lock.sh | 5 --- global/scripts/bin/setup_displays | 12 ------- linux/.config/i3/autostart.sh | 9 ++++-- linux/.config/polybar/config.ini | 5 ++- linux/.config/polybar/launch.sh | 2 +- linux/.config/solaar/config.yaml | 30 ++++++++++++++++++ linux/.newsboat/config-os | 2 +- linux/.zshenv | 2 ++ 16 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 .gitignore create mode 100644 global/.newsboat/miniflux delete mode 100644 global/.newsboat/urls delete mode 100755 global/scripts/bin/lock.sh delete mode 100755 global/scripts/bin/setup_displays diff --git a/.gitattributes b/.gitattributes index 03e1999..c7a8e2b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ global/scripts/vimwiki_diary_template filter=git-crypt diff=git-crypt global/.zshrc-secrets filter=git-crypt diff=git-crypt global/.borgmatic/sensitive.yaml filter=git-crypt diff=git-crypt global/.borgmatic/pass.gpg filter=git-crypt diff=git-crypt +global/.newsboat/miniflux filter=git-crypt diff=git-crypt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..406f495 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +global/.config/nvim/lazy-lock.json diff --git a/global/.config/mutt/accounts/account.com.fz0x1_posteo b/global/.config/mutt/accounts/account.com.fz0x1_posteo index fda9c72..792388c 100644 --- a/global/.config/mutt/accounts/account.com.fz0x1_posteo +++ b/global/.config/mutt/accounts/account.com.fz0x1_posteo @@ -8,4 +8,4 @@ set postponed = "+Drafts" set record = "+Sent" set trash = "+Trash" -mailboxes =INBOX =Sent =Service =Hosting =Service =Keys =Drafts =Trash ='Receiving guarantee notifications' =Spam +mailboxes =INBOX =Sent =Umka =Service =Hosting =Service =Backup =Notes =Keys =Drafts =Trash ='Receiving guarantee notifications' =Spam diff --git a/global/.newsboat/config b/global/.newsboat/config index 843b103..1e8622a 100644 --- a/global/.newsboat/config +++ b/global/.newsboat/config @@ -1,9 +1,9 @@ # general settings auto-reload yes -max-items 50 -# external browser +# some settings include config-os +include miniflux # unbind keys unbind-key ENTER @@ -31,3 +31,5 @@ color article default default highlight article "^(Title):.*$" blue default highlight article "https?://[^ ]+" red default highlight article "\\[image\\ [0-9]+\\]" green default + +max-items 0 diff --git a/global/.newsboat/miniflux b/global/.newsboat/miniflux new file mode 100644 index 0000000000000000000000000000000000000000..c57a97d4f020cad9fbb2eb0ee91c9777b65154bc GIT binary patch literal 145 zcmV;C0B-*PM@dveQdv+`041)BHg8~+e6Zq)xt6g{4+UG_Y&!w2ZW1#7J6~j(N#KxV z9~Wya<{dXu5PK~|t;ku7GQVKSZkB_I88Ky}zT&4`tb>)ORH?R9JwFT26Ga-DsG;(1 zIq7;lIPFGeJG16A(Q-h8Iyr4eUkgnau#-m;{Q;QE`Z(>HEUr-N)wieCtOWR_X1hUm literal 0 HcmV?d00001 diff --git a/global/.newsboat/urls b/global/.newsboat/urls deleted file mode 100644 index b4854e2..0000000 --- a/global/.newsboat/urls +++ /dev/null @@ -1,5 +0,0 @@ -https://www.opennet.ru/opennews/opennews_all_utf.rss -https://www.linux.org.ru/section-rss.jsp?section=1 -https://xakep.ru/feed/ -https://www.securitylab.ru/_services/export/rss/ -https://www.cyberciti.com/atom/atom.xml diff --git a/global/.zshrc b/global/.zshrc index 0ae191e..280f655 100644 --- a/global/.zshrc +++ b/global/.zshrc @@ -124,6 +124,10 @@ alias s_diary="cd ~/PKM/diary/ && git commit -am \"\$(date +%Y%m%d)\" && git pus alias s_ledger="cd ~/PKM/ledger/ && git commit -am \"\$(date +%Y%m%d)\" && git push origin master ; cd ~" ## screenshots alias scrn="screenshot.sh" +## secure deletion files +alias rrmm="shred -n 7 -z -u" +## secure deletion files in directory +alias frmm="find . -type f -exec shred -n 7 -z -u {} +" # bindkeys ## autosuggest diff --git a/global/.zshrc-secrets b/global/.zshrc-secrets index 4559a48f44a7536d57f67f41ab00a13ce3eb0908..19c9d55d13acb9f39a5f89ea98eaefee4a67e2a9 100644 GIT binary patch literal 494 zcmVAzPl#Bpe48t=+GN@hn7=oCahKDB!Gx07F)7|QQSL@jVlzP?!n5F+x= zow(3jm2C0R zWLyDUXg(TcljnckA_6>Rrh6?YJ3tIotl)hRU(Y)FWdY^P4U<$!RuH)@dn^R=?axPC zE1YxFeqhkdcDf8L9f_dF_{X7NPPz3`>Y?ZdL3O#FGk%eByj5yiIev7 zbvqjkr%H?3`_H#Uk;>4*emxuPG-Xs+yud7(eTc@NjS2Y^-S{3_-N|IhYSOPu>|P6& zHz^EP@g5e)1ZSD-*eyzU51@_kDY5J9*DRGx0o=<%`@(|cptLCb6tiImHzmDghmA)G7bz=mzhu~&<8zIJ=-I2WUWga8vb?}f*dg;DLEGz6pQucDYxL?L2l(&hipbe^-5 dubzPO^b~&Kqwfn@r5Y`m(7eQH(GejN&^kmtr0xI! diff --git a/global/scripts/bin/lock.sh b/global/scripts/bin/lock.sh deleted file mode 100755 index 5887b99..0000000 --- a/global/scripts/bin/lock.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -pkill -u "$USER" -USR1 dunst -~/.config/i3/i3lock -pkill -u "$USER" -USR2 dunst diff --git a/global/scripts/bin/setup_displays b/global/scripts/bin/setup_displays deleted file mode 100755 index b9514c8..0000000 --- a/global/scripts/bin/setup_displays +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env sh - -connected_monitors=$(xrandr | grep " connected" | awk '{ print $1 }') -if echo "$connected_monitors" | grep -q "HDMI"; then - xrandr --output eDP-1 --off - xrandr --output HDMI-1-0 --mode 2560x1440 --rate 165.00 --dpi 120 - # xrandr --output eDP-1 --left-of HDMI-1-0 - xrandr --output HDMI-1-0 --primary -else - xrandr --output eDP-1 --mode 2560x1600 --rate 240.00 --dpi 160 -fi - diff --git a/linux/.config/i3/autostart.sh b/linux/.config/i3/autostart.sh index 1c734fe..a3daaa2 100755 --- a/linux/.config/i3/autostart.sh +++ b/linux/.config/i3/autostart.sh @@ -25,9 +25,6 @@ dunst & # vpn mullvad-vpn & -# logi settings -solaar --window=hide & - # caffeine caffeine start & @@ -50,6 +47,12 @@ dropbox & # firewall opensnitch-ui & +# logi settings +solaar --restart-on-wake-up --window=hide & + +# bauh +bauh-tray & + # keyboard layout switcher setxkbmap -layout us,ru -option 'grp:alt_space_toggle' & diff --git a/linux/.config/polybar/config.ini b/linux/.config/polybar/config.ini index 2f1c8f0..dab304c 100644 --- a/linux/.config/polybar/config.ini +++ b/linux/.config/polybar/config.ini @@ -50,7 +50,10 @@ black = #000 white = #FFF [bar/fz0x1] -monitor = ${env:MONITOR:HDMI-1-0} +wm-restack = i3 +; override-redirect = true +; monitor = ${env:MONITOR:HDMI-1-0} +monitor = ${env:MONITOR:HDMI-0} width = 100% height = 24pt radius = 6 diff --git a/linux/.config/polybar/launch.sh b/linux/.config/polybar/launch.sh index 637e5df..f482c48 100755 --- a/linux/.config/polybar/launch.sh +++ b/linux/.config/polybar/launch.sh @@ -2,4 +2,4 @@ killall -q polybar while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -MONITOR="HDMI-1-0" polybar --reload fz0x1 -c ~/.config/polybar/config.ini & +MONITOR="HDMI-0" polybar --reload fz0x1 -c ~/.config/polybar/config.ini & diff --git a/linux/.config/solaar/config.yaml b/linux/.config/solaar/config.yaml index f77b163..5b5d74e 100644 --- a/linux/.config/solaar/config.yaml +++ b/linux/.config/solaar/config.yaml @@ -60,3 +60,33 @@ pointer_speed: 180 reprogrammable-keys: {80: 80, 81: 81, 82: 82, 83: 83, 86: 86, 91: 91, 93: 93, 237: 237} speed-change: 0 +- _NAME: 'MX Ergo Multi-Device Trackball ' + _absent: [hi-res-scroll, hires-smooth-invert, hires-smooth-resolution, hires-scroll-mode, scroll-ratchet, smart-shift, thumb-scroll-invert, thumb-scroll-mode, + onboard_profiles, report_rate_extended, dpi, dpi_extended, backlight, backlight_level, backlight_duration_hands_out, backlight_duration_hands_in, backlight_duration_powered, + backlight-timed, led_control, led_zone_, rgb_control, rgb_zone_, brightness_control, per-key-lighting, fn-swap, disable-keyboard-keys, crown-smooth, + divert-crown, divert-gkeys, m-key-leds, mr-key-led, multiplatform, gesture2-gestures, gesture2-divert, gesture2-params, sidetone, equalizer, adc_power_management] + _battery: 4096 + _sensitive: {hires-scroll-mode: ignore, hires-smooth-invert: ignore, hires-smooth-resolution: ignore} + change-host: null + divert-keys: {82: 0, 83: 0, 86: 0, 91: 0, 93: 0, 237: 0} + lowres-scroll-mode: false + persistent-remappable-keys: null + pointer_speed: 190 + reprogrammable-keys: {80: 80, 81: 81, 82: 82, 83: 83, 86: 86, 91: 91, 93: 93, 237: 237} + speed-change: 0 +- _NAME: 'MX Ergo Multi-Device Trackball ' + _absent: [hi-res-scroll, hires-smooth-invert, hires-smooth-resolution, hires-scroll-mode, scroll-ratchet, smart-shift, thumb-scroll-invert, thumb-scroll-mode, + onboard_profiles, report_rate, report_rate_extended, dpi, dpi_extended, backlight, backlight_level, backlight_duration_hands_out, backlight_duration_hands_in, + backlight_duration_powered, backlight-timed, led_control, led_zone_, rgb_control, rgb_zone_, brightness_control, per-key-lighting, fn-swap, disable-keyboard-keys, + crown-smooth, divert-crown, divert-gkeys, m-key-leds, mr-key-led, multiplatform, gesture2-gestures, gesture2-divert, gesture2-params, sidetone, equalizer, + adc_power_management] + _battery: 4096 + _modelId: 'MX Ergo Multi-Device Trackball ' + _sensitive: {hires-scroll-mode: ignore, hires-smooth-invert: ignore, hires-smooth-resolution: ignore} + change-host: null + divert-keys: {82: 0, 83: 0, 86: 0, 91: 0, 93: 0, 237: 0} + lowres-scroll-mode: false + persistent-remappable-keys: null + pointer_speed: 190 + reprogrammable-keys: {80: 80, 81: 81, 82: 82, 83: 83, 86: 86, 91: 91, 93: 93, 237: 237} + speed-change: 0 diff --git a/linux/.newsboat/config-os b/linux/.newsboat/config-os index 854eaf6..3a320f0 100644 --- a/linux/.newsboat/config-os +++ b/linux/.newsboat/config-os @@ -1,2 +1,2 @@ -browser "/sbin/lynx %u" +browser "/sbin/librewolf %u" macro l set browser "/sbin/librewolf %u"; open-in-browser ; set browser "/sbin/lynx %u" diff --git a/linux/.zshenv b/linux/.zshenv index eaa7b21..dd536e2 100644 --- a/linux/.zshenv +++ b/linux/.zshenv @@ -38,5 +38,7 @@ export PATH="$CUSTOM_SCRIPTS/bin:$PATH" export USER_BIN="$HOME/bin" export PATH="$USER_BIN:$PATH" +export MANPAGER='nvim +Man!' + GPG_TTY=$(tty) export GPG_TTY