diff --git a/outerheaven.init3.home/.config/cava/config b/outerheaven.init3.home/.config/cava/config
index 0a6f1cc..80ac0fa 100644
--- a/outerheaven.init3.home/.config/cava/config
+++ b/outerheaven.init3.home/.config/cava/config
@@ -12,8 +12,7 @@ bar_spacing = 1
sample_bits = 32
[output]
-; method = sdl
-method = sdl_glsl
+method = sdl
channels = mono
mono_option = average
alacritty_sync = 1
diff --git a/outerheaven.init3.home/.config/kitty/kitty.conf b/outerheaven.init3.home/.config/kitty/kitty.conf
index 9d6f8cb..5f28145 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:
@@ -720,7 +720,7 @@ tab_powerline_style round
#: The foreground and background colors
-background_opacity 0.82
+background_opacity 0.8
#: 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
diff --git a/outerheaven.init3.home/.config/sway/environment b/outerheaven.init3.home/.config/sway/environment
index efb5d40..9b8e4fe 100644
--- a/outerheaven.init3.home/.config/sway/environment
+++ b/outerheaven.init3.home/.config/sway/environment
@@ -47,6 +47,3 @@ 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"
diff --git a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service b/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service
deleted file mode 100644
index e6a5d36..0000000
--- a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index 9dce37a..0000000
--- a/outerheaven.init3.home/.config/systemd/user/trezor-gpg-agent.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=trezor-gpg-agent socket
-
-[Socket]
-ListenStream=%t/gnupg/S.gpg-agent
-FileDescriptorName=std
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target
diff --git a/outerheaven.init3.home/.config/waybar/modules/settings.json b/outerheaven.init3.home/.config/waybar/modules/settings.json
deleted file mode 100644
index 4660348..0000000
--- a/outerheaven.init3.home/.config/waybar/modules/settings.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "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 8fbbfb9..1a91dd2 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.69); /* nice */
+ background: alpha(@theme_base_color, 0.85);
border-top: 1px solid @unfocused_borders;
color: @theme_text_color;
}
@@ -59,9 +59,9 @@ window#waybar {
}
#clock {
-/* color: #81a1c1; */
- color: @theme_text_color;
- font-weight: bold;
+/*color: #a3be8c;*/
+/* color: #8fbcbb;*/
+ color: #81a1c1;
}
#tray {
diff --git a/outerheaven.init3.home/.gnupg/trezor/gpg.conf b/outerheaven.init3.home/.gnupg/trezor/gpg.conf
deleted file mode 100644
index 2405691..0000000
--- a/outerheaven.init3.home/.gnupg/trezor/gpg.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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) "
diff --git a/update.sh b/update.sh
index 966a377..3b19417 100755
--- a/update.sh
+++ b/update.sh
@@ -31,12 +31,8 @@ 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