From e490b742a87d8849c7984583b9ac991913dc5430 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sat, 24 Aug 2024 21:23:18 -0500 Subject: [PATCH 1/8] cava: use SDL GLSL outout --- outerheaven.init3.home/.config/cava/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/outerheaven.init3.home/.config/cava/config b/outerheaven.init3.home/.config/cava/config index 80ac0fa..0a6f1cc 100644 --- a/outerheaven.init3.home/.config/cava/config +++ b/outerheaven.init3.home/.config/cava/config @@ -12,7 +12,8 @@ bar_spacing = 1 sample_bits = 32 [output] -method = sdl +; method = sdl +method = sdl_glsl channels = mono mono_option = average alacritty_sync = 1 From 38a7a6a4be81cda5efa3d5ea17e96587c4b97ae4 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sat, 24 Aug 2024 21:23:47 -0500 Subject: [PATCH 2/8] kitty: use standard (pro) color profile --- outerheaven.init3.home/.config/kitty/kitty.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/outerheaven.init3.home/.config/kitty/kitty.conf b/outerheaven.init3.home/.config/kitty/kitty.conf index 5f28145..8aa4edb 100644 --- a/outerheaven.init3.home/.config/kitty/kitty.conf +++ b/outerheaven.init3.home/.config/kitty/kitty.conf @@ -4,8 +4,8 @@ # include colors/.conf # include colors/dracula.conf # include colors/Material Dark.conf -include colors/mine-minimal.conf -# include colors/pro.conf +# include colors/mine-minimal.conf +include colors/pro.conf # include colors/Liquid Carbon Transparent.conf # include colors/GitHub Dark.conf # previous: From 780041411adc939ab4184ed31c137b68f8c6648f Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:13:50 -0500 Subject: [PATCH 3/8] trezor+GPG: init socket/service --- .../.config/systemd/user/trezor-gpg-agent.service | 9 +++++++++ .../.config/systemd/user/trezor-gpg-agent.socket | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service create mode 100644 outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket diff --git a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service new file mode 100644 index 0000000..e6a5d36 --- /dev/null +++ b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service @@ -0,0 +1,9 @@ +[Unit] +Description=trezor-gpg-agent +Requires=trezor-gpg-agent.socket + +[Service] +Type=simple +Environment="GNUPGHOME=%h/.gnupg/trezor" +Environment="PATH=/bin:/usr/bin:/usr/local/bin:%h/.local/bin" +ExecStart=%h/.local/bin/trezor-gpg-agent --pin-entry-binary=/usr/bin/pinentry-gnome3 --passphrase-entry-binary=/usr/bin/pinentry-gnome3 diff --git a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket new file mode 100644 index 0000000..9dce37a --- /dev/null +++ b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket @@ -0,0 +1,11 @@ +[Unit] +Description=trezor-gpg-agent socket + +[Socket] +ListenStream=%t/gnupg/S.gpg-agent +FileDescriptorName=std +SocketMode=0600 +DirectoryMode=0700 + +[Install] +WantedBy=sockets.target From 88a353fa555d2a1e2bbf4e9a6d98d7814f25d6dd Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:19:17 -0500 Subject: [PATCH 4/8] waybar: improve colors/transparency, +module settings --- .../.config/waybar/modules/settings.json | 127 ++++++++++++++++++ .../.config/waybar/styles/mine.css | 8 +- 2 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 outerheaven.init3.home/.config/waybar/modules/settings.json diff --git a/outerheaven.init3.home/.config/waybar/modules/settings.json b/outerheaven.init3.home/.config/waybar/modules/settings.json new file mode 100644 index 0000000..4660348 --- /dev/null +++ b/outerheaven.init3.home/.config/waybar/modules/settings.json @@ -0,0 +1,127 @@ +{ + "sway/mode": { + "format": "{}" + }, + "sway/workspaces": { + "format": "{name}", + "disable-scroll": true + }, + "sway/window": { + "max-length": 128, + "tooltip": false, + "icon": true, + "icon-size": 22, + "align": 0.5, + "all-outputs": true, + "rewrite": { + "(.*) — Mozilla Firefox": "$1", + "(.*) — LibreWolf": "$1" + } + }, + "clock": { + "format": " {:%H:%M} ", + "tooltip": true, + "tooltip-format": "{calendar}", + "calendar": { + "weeks-pos": "left", + "mode-mon-col" : 3, + "on-scroll" : 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + } + }, + "actions": { + "on-click-right": "mode", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + } + }, + "custom/advancedcpu": { + "exec": "$HOME/.config/waybar/modules/advancedcpu.py 2> /dev/null", + "return-type": "json", + "format": "{}", + "tooltip": "{tooltip}", + "on-click": "swaymsg '[title=\"stats\" app_id=\"kitty\"] focus' || kitty -o font_size=10 --detach --title stats --session ~/.config/kitty/session_monitoring.conf && sleep 0.75 ; swaymsg '[title=\"stats\" app_id=\"kitty\"] focus'" + }, + "custom/gpustats": { + "exec": "$HOME/.config/waybar/modules/gpustats_async.py -i 1 2> /dev/null", + "return-type": "json", + "format": "{}", + "tooltip": "{tooltip}", + "on-click": "swaymsg '[title=\"stats\" app_id=\"kitty\"] focus' || kitty -o font_size=10 --detach --title stats --session ~/.config/kitty/session_monitoring.conf && sleep 0.75 ; swaymsg '[title=\"stats\" app_id=\"kitty\"] focus'" + }, + "custom/media": { + "exec": "$HOME/.config/waybar/modules/mediaplayer.py 2> /dev/null", + "return-type": "json", + "format": "🎜 {}", + "tooltip": "{tooltip}", + "escape": true, + "max-length": 50 + }, + "custom/weather": { + "exec": "$HOME/.config/waybar/modules/weather.py 2> /dev/null", + "format": "{}", + "format-alt": "{alt}", + "escape": true, + "return-type": "json" + }, + "custom/arrayhealth": { + "exec": "$HOME/.config/waybar/modules/arrayhealth.py 2> /dev/null", + "format": "{}", + "escape": true, + "return-type": "json" + }, + "tray": { + "icon-size": 22, + "show-passive-items": true, + "spacing": 4 + }, + "cpu": { + "interval": 2, + "format": "cpu {usage}% | {avg_frequency:3}Ghz", + "states": { + "warning": 50, + "critical": 85 + }, + "on-click": "gnome-system-monitor --show-resources-tab" + }, + "memory": { + "interval": 15, + "format": "mem {percentage}% | {used:0.1f}/{total:0.1f}G", + "on-click": "gnome-system-monitor --show-resources-tab" + }, + "idle_inhibitor": { + "format": "{icon}", + "tooltip-format-activated": "idle inhibitor: {status}", + "tooltip-format-deactivated": "idle inhibitor: {status}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "cava": { + "framerate": 60, + "autosens": 1, + "sensitivity": 100, + "bars": 14, + "lower_cutoff_freq": 50, + "higher_cutoff_freq": 10000, + "method": "pulse", + "source": "auto", + "stereo": true, + "reverse": false, + "bar_delimiter": 0, + "monstercat": false, + "waves": false, + "noise_reduction": 0.77, + "input_delay": 2, + "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ], + "actions": { + "on-click-right": "mode" + } + } +} diff --git a/outerheaven.init3.home/.config/waybar/styles/mine.css b/outerheaven.init3.home/.config/waybar/styles/mine.css index 1a91dd2..8fbbfb9 100644 --- a/outerheaven.init3.home/.config/waybar/styles/mine.css +++ b/outerheaven.init3.home/.config/waybar/styles/mine.css @@ -24,7 +24,7 @@ * misc. GTK: https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss * */ window#waybar { - background: alpha(@theme_base_color, 0.85); + background: alpha(@theme_base_color, 0.69); /* nice */ border-top: 1px solid @unfocused_borders; color: @theme_text_color; } @@ -59,9 +59,9 @@ window#waybar { } #clock { -/*color: #a3be8c;*/ -/* color: #8fbcbb;*/ - color: #81a1c1; +/* color: #81a1c1; */ + color: @theme_text_color; + font-weight: bold; } #tray { From dc18ec83b91be04a5103bdcaf14353712876f0bb Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:20:12 -0500 Subject: [PATCH 5/8] gpg: add trezor config --- outerheaven.init3.home/.gnupg/trezor/gpg.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 outerheaven.init3.home/.gnupg/trezor/gpg.conf diff --git a/outerheaven.init3.home/.gnupg/trezor/gpg.conf b/outerheaven.init3.home/.gnupg/trezor/gpg.conf new file mode 100644 index 0000000..2405691 --- /dev/null +++ b/outerheaven.init3.home/.gnupg/trezor/gpg.conf @@ -0,0 +1,5 @@ +# Hardware-based GPG configuration +# agent-program /home/jlay/.gnupg/trezor/run-agent.sh +# above replaced w/ systemd service/socket +personal-digest-preferences SHA512 +default-key "Josh Lay (desktop) " From 1fa1c7d2171937ea9558eb30c4fc8d5e562f97f3 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:20:55 -0500 Subject: [PATCH 6/8] track more files --- update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/update.sh b/update.sh index 3b19417..966a377 100755 --- a/update.sh +++ b/update.sh @@ -31,8 +31,12 @@ DOTS=( '.vim/autoload/' # vim-plug, mainly # Until I find/make custom modules worthwhile, including *only* the config/styling '.config/waybar/config' + '.config/waybar/modules/settings.json' '.config/waybar/styles/' '.config/waybar/style.css' # symlink to the wanted stylesheet (in the 'styles' dir') + '.gnupg/trezor/gpg.conf' + '.config/systemd/user/trezor-gpg-agent.service' + '.config/systemd/user/trezor-gpg-agent.socket' ) # to avoid hacky pwd/dirname stuff w/ $0 [for now?], inline the path to the repo where copies are held From 19126c34f9346ccb1841362dc3c8dd0e54a93d03 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:21:22 -0500 Subject: [PATCH 7/8] kitty: very slightly less transparent --- outerheaven.init3.home/.config/kitty/kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outerheaven.init3.home/.config/kitty/kitty.conf b/outerheaven.init3.home/.config/kitty/kitty.conf index 8aa4edb..9d6f8cb 100644 --- a/outerheaven.init3.home/.config/kitty/kitty.conf +++ b/outerheaven.init3.home/.config/kitty/kitty.conf @@ -720,7 +720,7 @@ tab_powerline_style round #: The foreground and background colors -background_opacity 0.8 +background_opacity 0.82 #: The opacity of the background. A number between 0 and 1, where 1 is #: opaque and 0 is fully transparent. This will only work if From 6e717c7ce48c491b1dea7b927aceeda304795896 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 25 Aug 2024 10:22:22 -0500 Subject: [PATCH 8/8] rclone/sway env: get config password from 'pass'/GPG --- outerheaven.init3.home/.config/sway/environment | 3 +++ 1 file changed, 3 insertions(+) diff --git a/outerheaven.init3.home/.config/sway/environment b/outerheaven.init3.home/.config/sway/environment index 9b8e4fe..efb5d40 100644 --- a/outerheaven.init3.home/.config/sway/environment +++ b/outerheaven.init3.home/.config/sway/environment @@ -47,3 +47,6 @@ W_ELECTRON_ARGS="--silent --enable-gpu-rasterization --enable-sync --disable-fea # flatpak things get weird with this, commenting out # untested theory, may improve things - similar to how 'resolv.conf' links should be relative, not absolute: # TZ=:../usr/share/zoneinfo/America/Chicago + +# tell 'rclone' to get the config password from GPG; configured to use Trezor hardware wallet +RCLONE_PASSWORD_COMMAND="pass rclone/config"