From db734f614843997af139e374049c3b2095d2f949 Mon Sep 17 00:00:00 2001
From: Tyler Perkins <tyler@clortox.com>
Date: Thu, 20 Nov 2025 06:51:52 -0500
Subject: [PATCH] Merged

---
 .config/htop/htoprc      |  7 +++++--
 .config/niri/config.kdl  | 21 +++++++++++++++------
 .config/waybar/style.css |  5 +++++
 .gitconfig##default      |  3 ++-
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 8bf2205..be1cb3e 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,10 +1,10 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-htop_version=3.3.0
+htop_version=3.4.1-3.4.1
 config_reader_min_version=3
 fields=0 48 17 47 46 18 38 39 40 2 49 1
 hide_kernel_threads=1
-hide_userland_threads=0
+hide_userland_threads=1
 hide_running_in_container=0
 shadow_other_users=0
 show_thread_names=0
@@ -25,6 +25,9 @@ detailed_cpu_time=0
 cpu_count_from_one=0
 show_cpu_usage=1
 show_cpu_frequency=1
+show_cpu_temperature=0
+degree_fahrenheit=0
+show_cached_memory=1
 update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index 004f889..70f894f 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -24,7 +24,7 @@ switch-events {
 // --------- LAYOUT / LOOK ---------
 layout {
     gaps 7
-    default-column-width { proportion 0.8; }
+    default-column-width { proportion 0.5; }
     focus-ring {
       width 4
     }
@@ -36,12 +36,16 @@ layout {
     }
 }
 
+workspace "Browser"
+workspace "School"
+
 // --------- STARTUP DAEMONS ---------
 spawn-at-startup "waybar"          // bar
 spawn-at-startup "mako"            // notifications
 spawn-at-startup "blueman-applet"  // bluetooth tray
 spawn-at-startup "nm-applet"       // network tray
-spawn-at-startup "swaybg" "-i" "/home/tyler/.desktop/wallpaper/main.jpg" "-m" "fill"
+
+spawn-at-startup "swayidle" "-w" "timeout" "300" "bash -lc \"swaylock-effects --indicator --indicator-radius 120 --indicator-thickness 8 --effect-blur 7x5 --clock --fade-in 0.3 --grace 5 --image \\\"$HOME/.desktop/wallpaper/main.jpg\\\"\"" "timeout" "600" "systemctl suspend" "before-sleep" "bash -lc \"swaylock-effects --indicator --indicator-radius 120 --indicator-thickness 8 --effect-blur 7x5 --clock --fade-in 0.3 --grace 5 --image \\\"$HOME/.desktop/wallpaper/main.jpg\\\"\"";
 
 // Screenshots path used by niri’s built-in screenshot actions.
 screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
@@ -55,6 +59,10 @@ environment {
 binds {
     Mod+Shift+Return  { spawn "kitty"; }
     Mod+P { spawn "fuzzel"; }
+    // Mod+Alt+L { spawn "swaylock" "-f" "-c" "cccccc"; }
+
+    Mod+Alt+L { spawn "bash" "-lc" "swaylock-effects --indicator --indicator-radius 120 --indicator-thickness 8 --effect-blur 7x5 --clock --fade-in 0.3 --grace 5 --image \"$HOME/.desktop/wallpaper/main.jpg\""; }
+
 
     // Move around in the same column
     // Mod+J { focus-window-down; }   // next client in column
@@ -63,8 +71,8 @@ binds {
     // Mod+H { focus-column-left; }
     // Mod+L { focus-column-right; }
 
-    Mod+J { focus-window-down-or-column-right; }   // next client in column
-    Mod+K { focus-window-up-or-column-left; }     // prev client in column      // :contentReference[oaicite:3]{index=3}
+    Mod+K { focus-window-down-or-column-right; }   // next client in column
+    Mod+J { focus-window-up-or-column-left; }     // prev client in column      // :contentReference[oaicite:3]{index=3}
     // Move aroudn side by side
     // Mod+H { focus-column-left; }
     // Mod+L { focus-column-right; }
@@ -81,13 +89,14 @@ binds {
 
     // Master-ish resizing
     Mod+H { set-column-width "-10%"; }
+
     Mod+L { set-column-width "+10%"; }
 
     // Mod+I { set-window-height "+10%"; }
     // Mod+D { set-window-height "-10%"; }
 
     // “Zoom” feel (cycle preset column widths)
-    Mod+Return { switch-preset-column-width; }                 // builtin behavior in niri releases. :contentReference[oaicite:4]{index=4}
+    // Mod+Return { switch-preset-column-width; }                 // builtin behavior in niri releases. :contentReference[oaicite:4]{index=4}
 
     // DWM: Mod+Tab view previous
     Mod+Tab { focus-workspace-previous; }                      // workspace nav semantics here. :contentReference[oaicite:5]{index=5}
@@ -98,7 +107,7 @@ binds {
     // Layout-ish toggles
     Mod+F { toggle-window-floating; }                          // float
     Mod+M { fullscreen-window; }                               // monocle-like fullscreen
-    Mod+T { maximize-column; }                                 // tile-ish column maximize
+    Mod+Return { maximize-column; }                                 // tile-ish column maximize
 
     Mod+0 { toggle-overview; }                                 // overview feature in new niri. :contentReference[oaicite:7]{index=7}
 
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0a374c9..89871e5 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -206,6 +206,11 @@
 	color: @white;
 }
 
+#custom-docker {
+  background: @layout;
+  color: @black;
+}
+
 #clock.time {
 	background: @time;
 	color: @black;
diff --git a/.gitconfig##default b/.gitconfig##default
index 2e6c64e..9048ef8 100644
--- a/.gitconfig##default
+++ b/.gitconfig##default
@@ -12,7 +12,8 @@
 	required = true
 	clean = git-lfs clean -- %f
 [commit]
-	gpgsign = true
+	gpgSign = true
+	gpgSign = true
 [pull]
 	rebase = false
 [credential]