From 1e2f869bf329440d8e12657fca143070fab7e40e Mon Sep 17 00:00:00 2001
From: Alex Blank <alexblank@fastmail.com>
Date: Tue, 21 Jul 2026 20:29:28 +0200
Subject: [PATCH] laptop fixes

---
 .config/hypr/hyprland.lua                     |  4 +-
 .../90-machine.toml##class.arch_laptop        | 37 ++++++++++++++++---
 .../plugins/system-status/plugin.toml         |  8 ++++
 .tmux.conf                                    | 17 +++++----
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/.config/hypr/hyprland.lua b/.config/hypr/hyprland.lua
index 7f4d4c7..1ad1273 100644
--- a/.config/hypr/hyprland.lua
+++ b/.config/hypr/hyprland.lua
@@ -81,8 +81,8 @@ hl.bind(main_mod .. " + XF86AudioRaiseVolume", hl.dsp.exec_cmd("playerctl next")
 hl.bind(main_mod .. " + XF86AudioLowerVolume", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
 hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd('light -A 5'), { locked = true })
 hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd('light -U 5'), { locked = true })
-hl.bind(main_mod .. " + XF86MonBrightnessDown", hl.dsp.exec_cmd('light -S 0.1 && notify-send "Brightness set to min"'), { locked = true })
-hl.bind(main_mod .. " + XF86MonBrightnessUp", hl.dsp.exec_cmd('light -S 100 && notify-send "Brightness set to max"'), { locked = true })
+hl.bind(main_mod .. " + XF86MonBrightnessDown", hl.dsp.exec_cmd('light -S 0.0'), { locked = true })
+hl.bind(main_mod .. " + XF86MonBrightnessUp", hl.dsp.exec_cmd('light -S 100'), { locked = true })
 hl.bind("XF86Calculator", hl.dsp.exec_cmd("qalculate-qt"), { locked = true })
 
 -- Retain i3's hjkl and arrow-key directional workflow.
diff --git a/.config/noctalia/90-machine.toml##class.arch_laptop b/.config/noctalia/90-machine.toml##class.arch_laptop
index 8679416..c6dd3f5 100644
--- a/.config/noctalia/90-machine.toml##class.arch_laptop
+++ b/.config/noctalia/90-machine.toml##class.arch_laptop
@@ -1,10 +1,11 @@
 # Laptop-specific Noctalia layout. Shared privacy/theme defaults live in 10-base.toml.
 [bar.main]
 position = "top"
-layer = "overlay"
+layer = "top"
+scale = 0.95
 capsule_radius = 5
 center = ["group:g3", "notifications"]
-end = ["bluetooth", "volume", "control-center", "group:g1", "session"]
+end = ["group:g2", "group:g6", "group:g5", "group:g1", "session"]
 font_weight = 400
 margin_ends = 0
 padding = 0
@@ -14,8 +15,8 @@ shadow = false
 auto_hide = false
 smart_auto_hide = false
 reserve_space = true
-start = ["tray", "group:g4", "group:g2", "privacy"]
-thickness = 39
+start = ["tray", "group:g4", "privacy"]
+thickness = 28
 widget_spacing = 10
 
 [[bar.main.capsule_group]]
@@ -30,7 +31,7 @@ padding = 6.0
 enabled = true
 fill = "surface_variant"
 id = "g2"
-members = ["network_rx", "network_tx", "network"]
+members = ["network_rx", "network_tx", "network", "bluetooth"]
 opacity = 1.0
 padding = 6.0
 
@@ -47,10 +48,28 @@ radius = 5.0
 enabled = true
 fill = "surface_variant"
 id = "g4"
-members = ["cpu", "temp", "ram", "disk", "battery"]
+members = ["gpu-mode", "cpu", "temp", "ram", "disk"]
 opacity = 1.0
 padding = 6.0
 
+[[bar.main.capsule_group]]
+enabled = true
+fill = "surface_variant"
+id = "g5"
+members = ["battery-rate", "battery", "power_profile"]
+opacity = 1.0
+padding = 6.0
+radius = 5.0
+
+[[bar.main.capsule_group]]
+enabled = true
+fill = "surface_variant"
+id = "g6"
+members = ["input_volume", "volume"]
+opacity = 1.0
+padding = 6.0
+radius = 5.0
+
 [widget.cpu]
 type = "alex/system-status:cpu"
 
@@ -68,6 +87,12 @@ stat = "disk_pct"
 display = "text"
 path = "/"
 
+[widget.battery-rate]
+type = "alex/system-status:battery-rate"
+
+[widget.gpu-mode]
+type = "alex/system-status:gpu-mode"
+
 [control_center]
 sidebar = "full"
 sidebar_section = "full"
diff --git a/.local/share/noctalia/plugins/system-status/plugin.toml b/.local/share/noctalia/plugins/system-status/plugin.toml
index ec92f9d..c99af93 100644
--- a/.local/share/noctalia/plugins/system-status/plugin.toml
+++ b/.local/share/noctalia/plugins/system-status/plugin.toml
@@ -12,3 +12,11 @@ entry = "cpu.luau"
 [[widget]]
 id = "memory"
 entry = "memory.luau"
+
+[[widget]]
+id = "battery-rate"
+entry = "battery-rate.luau"
+
+[[widget]]
+id = "gpu-mode"
+entry = "gpu-mode.luau"
diff --git a/.tmux.conf b/.tmux.conf
index 0f1c154..4af05c4 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -32,9 +32,12 @@ bind e new-window -n tmux.conf "exec \${EDITOR:-nvim} ~/.tmux.conf"
 
 # --- Vim-style panes ----------------------------------------------------------
 # Keep the familiar split keys and always inherit the active pane's directory.
-bind - split-window -v -c "#{pane_current_path}"
-bind | split-window -h -c "#{pane_current_path}"
+bind m split-window -v -c "#{pane_current_path}"
+bind n split-window -h -c "#{pane_current_path}"
 bind c new-window -c "#{pane_current_path}"
+# Re-tile the current window using Ctrl-a, Ctrl-h / Ctrl-a, Ctrl-k.
+bind C-h select-layout even-vertical
+bind C-k select-layout even-horizontal
 
 bind -r h select-pane -L
 bind -r j select-pane -D
@@ -47,15 +50,15 @@ bind -r L resize-pane -R 5
 bind -r \{ swap-pane -U
 bind -r \} swap-pane -D
 bind z resize-pane -Z
-bind x confirm-before -p "kill pane #P? (y/n)" kill-pane
+bind w confirm-before -p "kill pane #P? (y/n)" kill-pane
 
 # --- Windows, sessions, and buffers ------------------------------------------
-bind -r n next-window
-bind -r p previous-window
+bind -r f next-window
+bind -r b previous-window
 bind Tab last-window
-bind w choose-tree -Zw
+bind d choose-tree -Zw
 bind s choose-tree -Zs
-bind f command-prompt -p "switch to session:" "switch-client -t '%%'"
+bind g command-prompt -p "switch to session:" "switch-client -t '%%'"
 bind [ choose-buffer
 bind P paste-buffer  # tmux buffer fallback; prefix + ] pastes the system clipboard
 bind C-l send-keys C-l \; clear-history