Add Obsidian to waybar, comment out nvidia-specific env vars

Add Obsidian as a waybar app launcher button alongside existing
launchers. Comment out nvidia-specific environment variables in
hypr/base.conf (LIBVA_DRIVER_NAME, GBM_BACKEND, etc.) so the
config works on all systems by default. Also includes prior
uncommitted changes: .gitignore updates, hyprpaper config,
package list updates, and various hypr config refinements.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.gitignore

@@ -1,3 +1,7 @@
 */colors.css
 */colors.conf
 backups/
+i3/config
+sway/config
+waybar/style.css
+wofi/style.css

hypr/base.conf

@@ -15,7 +15,7 @@ monitor=,preferred,auto,1
 
 $terminal = kitty
 $fileManager = kitty -e ranger
-$menu = wofi --show run
+$menu = wofi --show drun
 
 ###################
 ###   CURSOR    ###
@@ -29,18 +29,15 @@ env = HYPRCURSOR_SIZE,48
 ### AUTOSTART ###
 #################
 
-exec-once = fcitx5
+exec-once = dex -a
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = nm-applet
 exec-once = wl-paste --watch cliphist store
 exec-once = dunst
-exec-once = hypridle          # replaces xautolock; configure lock in hypridle.conf
+exec-once = hypridle
+exec-once = hyprpaper
+exec-once = hyprsunset
 exec-once = waterfox
-exec-once = steam
-exec-once = surfshark
 exec-once = waybar
-# exec-once = volctl           # may need a Wayland-compatible tray volume tool
-# exec-once = pamac-tray       # check for Wayland support
 # NOTE: ff-theme-util and fix_xcursor are X11-specific; drop or find Wayland equivalents
 # Caps<->Escape swap is handled below via input config
 
@@ -49,6 +46,12 @@ exec-once = waybar
 ### ENVIRONMENT VARIABLES ###
 #############################
 
+env = XDG_SESSION_TYPE,wayland
+# NVIDIA-specific env vars — uncomment if running on nvidia:
+# env = LIBVA_DRIVER_NAME,nvidia
+# env = GBM_BACKEND,nvidia-drm
+# env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+# env = WLR_NO_HARDWARE_CURSORS,1
 
 #####################
 ### LOOK AND FEEL ###
@@ -64,7 +67,11 @@ general {
 
     resize_on_border = true
     allow_tearing = false
-    layout = master       # closest to i3's stacking default; use dwindle for split
+    layout = dwindle
+}
+
+xwayland {
+    force_zero_scaling = true
 }
 
 decoration {
@@ -114,7 +121,7 @@ misc {
 
 input {
     kb_layout = gb
-    kb_options = caps:swapescape
+    kb_options = caps:swapescape,grp:alt_shift_toggle
     follow_mouse = 1
     sensitivity = 0
 }
@@ -132,11 +139,10 @@ bind = $mod, Return, exec, $terminal
 bind = $mod SHIFT, Q, killactive
 
 # Launcher (wofi replaces dmenu)
-bind = $mod, D, exec, wofi --show run --style ~/scripts/wofi/style.css
-# To approximate your dmenu colors, configure wofi's style.css
+bind = $mod, D, exec, $menu
 
 # Pavucontrol
-bind = $mod CTRL, M, exec, pavucontrol
+bind = $mod CTRL, M, exec, hyprpwcenter
 
 # Applications
 bind = $mod, F2, exec, waterfox
@@ -144,9 +150,8 @@ bind = $mod, F3, exec, $fileManager
 bind = $mod SHIFT, F3, exec, pcmanfm
 bind = $mod, F5, exec, kitty -e mocp
 
-# Compositor toggle (picom → hyprland manages its own compositor; these are no-ops)
-# bind = $mod, T, exec, pkill picom
-# bind = $mod CTRL, T, exec, picom -b
+# Toggle window layout between master and dwindle
+bind = $mod, T, exec, hyprctl keyword general:layout "$([ "$(hyprctl getoption general:layout -j | grep -o '"str": "[^"]*"' | cut -d'"' -f4)" = "master" ] && echo dwindle || echo master)"
 
 # Restart dunst
 bind = $mod SHIFT, D, exec, killall dunst && notify-send 'restart dunst'
@@ -169,10 +174,11 @@ bind = $mod, M, exec, pkill -SIGUSR1 waybar
 bind = $mod SHIFT, C, exec, hyprctl reload
 
 # Exit Hyprland
-bind = $mod SHIFT, E, exec, hyprctl dispatch exit
+bind = $mod SHIFT, E, exec, hyprshutdown
 
 # System mode (replaces i3's $mode_system)
 # Simple submap equivalent:
+bind = $mod, 0, exec, notify-send -t 5000 "System Mode" "(l)ock  (s)uspend  (h)ibernate\n(r)eboot  (Shift+s) shutdown  (e)xit\n\nReturn/Escape to cancel"
 bind = $mod, 0, submap, system
 submap = system
 bind = , L, exec, hyprlock
@@ -185,9 +191,11 @@ bind = , R, exec, systemctl reboot
 bind = , R, submap, reset
 bind = SHIFT, S, exec, systemctl poweroff
 bind = SHIFT, S, submap, reset
-bind = , E, exec, hyprctl dispatch exit
+bind = , E, exec, hyprshutdown
 bind = , E, submap, reset
+bind = , Return, exec, dunstctl close
 bind = , Return, submap, reset
+bind = , Escape, exec, dunstctl close
 bind = , Escape, submap, reset
 submap = reset
 
@@ -310,8 +318,8 @@ windowrule {
 }
 
 windowrule {
-    name = pavucontrol
-    match:class = ^(pavucontrol)$
+    name = hyprpwcenter
+    match:class = ^(hyprpwcenter)$
     float = on
 }
 

hypr/build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -euo pipefail
 cd "$(dirname "$0")"
-cat colors.conf base > hyprland.conf
+cat colors.conf base.conf >hyprland.conf

hypr/hyprland.conf

@@ -25,7 +25,7 @@ monitor=,preferred,auto,1
 
 $terminal = kitty
 $fileManager = kitty -e ranger
-$menu = wofi --show run
+$menu = wofi --show drun
 
 ###################
 ###   CURSOR    ###
@@ -39,18 +39,15 @@ env = HYPRCURSOR_SIZE,48
 ### AUTOSTART ###
 #################
 
-exec-once = fcitx5
+exec-once = dex -a
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = nm-applet
 exec-once = wl-paste --watch cliphist store
 exec-once = dunst
-exec-once = hypridle          # replaces xautolock; configure lock in hypridle.conf
+exec-once = hypridle
+exec-once = hyprpaper
+exec-once = hyprsunset
 exec-once = waterfox
-exec-once = steam
-exec-once = surfshark
 exec-once = waybar
-# exec-once = volctl           # may need a Wayland-compatible tray volume tool
-# exec-once = pamac-tray       # check for Wayland support
 # NOTE: ff-theme-util and fix_xcursor are X11-specific; drop or find Wayland equivalents
 # Caps<->Escape swap is handled below via input config
 
@@ -59,6 +56,12 @@ exec-once = waybar
 ### ENVIRONMENT VARIABLES ###
 #############################
 
+env = XDG_SESSION_TYPE,wayland
+# NVIDIA-specific env vars — uncomment if running on nvidia:
+# env = LIBVA_DRIVER_NAME,nvidia
+# env = GBM_BACKEND,nvidia-drm
+# env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+# env = WLR_NO_HARDWARE_CURSORS,1
 
 #####################
 ### LOOK AND FEEL ###
@@ -74,7 +77,11 @@ general {
 
     resize_on_border = true
     allow_tearing = false
-    layout = master       # closest to i3's stacking default; use dwindle for split
+    layout = dwindle
+}
+
+xwayland {
+    force_zero_scaling = true
 }
 
 decoration {
@@ -124,7 +131,7 @@ misc {
 
 input {
     kb_layout = gb
-    kb_options = caps:swapescape
+    kb_options = caps:swapescape,grp:alt_shift_toggle
     follow_mouse = 1
     sensitivity = 0
 }
@@ -142,11 +149,10 @@ bind = $mod, Return, exec, $terminal
 bind = $mod SHIFT, Q, killactive
 
 # Launcher (wofi replaces dmenu)
-bind = $mod, D, exec, wofi --show run --style ~/scripts/wofi/style.css
-# To approximate your dmenu colors, configure wofi's style.css
+bind = $mod, D, exec, $menu
 
 # Pavucontrol
-bind = $mod CTRL, M, exec, pavucontrol
+bind = $mod CTRL, M, exec, hyprpwcenter
 
 # Applications
 bind = $mod, F2, exec, waterfox
@@ -154,9 +160,8 @@ bind = $mod, F3, exec, $fileManager
 bind = $mod SHIFT, F3, exec, pcmanfm
 bind = $mod, F5, exec, kitty -e mocp
 
-# Compositor toggle (picom → hyprland manages its own compositor; these are no-ops)
-# bind = $mod, T, exec, pkill picom
-# bind = $mod CTRL, T, exec, picom -b
+# Toggle window layout between master and dwindle
+bind = $mod, T, exec, hyprctl keyword general:layout "$([ "$(hyprctl getoption general:layout -j | grep -o '"str": "[^"]*"' | cut -d'"' -f4)" = "master" ] && echo dwindle || echo master)"
 
 # Restart dunst
 bind = $mod SHIFT, D, exec, killall dunst && notify-send 'restart dunst'
@@ -179,10 +184,11 @@ bind = $mod, M, exec, pkill -SIGUSR1 waybar
 bind = $mod SHIFT, C, exec, hyprctl reload
 
 # Exit Hyprland
-bind = $mod SHIFT, E, exec, hyprctl dispatch exit
+bind = $mod SHIFT, E, exec, hyprshutdown
 
 # System mode (replaces i3's $mode_system)
 # Simple submap equivalent:
+bind = $mod, 0, exec, notify-send -t 5000 "System Mode" "(l)ock  (s)uspend  (h)ibernate\n(r)eboot  (Shift+s) shutdown  (e)xit\n\nReturn/Escape to cancel"
 bind = $mod, 0, submap, system
 submap = system
 bind = , L, exec, hyprlock
@@ -195,9 +201,11 @@ bind = , R, exec, systemctl reboot
 bind = , R, submap, reset
 bind = SHIFT, S, exec, systemctl poweroff
 bind = SHIFT, S, submap, reset
-bind = , E, exec, hyprctl dispatch exit
+bind = , E, exec, hyprshutdown
 bind = , E, submap, reset
+bind = , Return, exec, dunstctl close
 bind = , Return, submap, reset
+bind = , Escape, exec, dunstctl close
 bind = , Escape, submap, reset
 submap = reset
 
@@ -320,8 +328,8 @@ windowrule {
 }
 
 windowrule {
-    name = pavucontrol
-    match:class = ^(pavucontrol)$
+    name = hyprpwcenter
+    match:class = ^(hyprpwcenter)$
     float = on
 }
 

hypr/hyprpaper.conf

@@ -0,0 +1,3 @@
+preload = ~/scripts/background.png
+wallpaper = DP-1,~/scripts/background.png
+wallpaper = DP-2,~/scripts/background.png

i3/base

@@ -21,7 +21,7 @@ exec --no-startup-id nm-applet
 exec --no-startup-id pamac-tray
 exec --no-startup-id clipit
 exec --no-startup-id dunst
-exec --no-startup-id xautolock -time 30 -locker blurlock
+exec --no-startup-id xautolock -time 90 -locker blurlock
 # exec --no-startup-id nitrogen ~/scripts/background.jpg
 # exec --no-startup-id blueman-applet
 # exec_always --no-startup-id sbxkb

i3/config

@@ -31,7 +31,7 @@ exec --no-startup-id nm-applet
 exec --no-startup-id pamac-tray
 exec --no-startup-id clipit
 exec --no-startup-id dunst
-exec --no-startup-id xautolock -time 30 -locker blurlock
+exec --no-startup-id xautolock -time 90 -locker blurlock
 # exec --no-startup-id nitrogen ~/scripts/background.jpg
 # exec --no-startup-id blueman-applet
 # exec_always --no-startup-id sbxkb

packages.txt

@@ -16,9 +16,15 @@ hyprland
 hyprpaper
 hypridle
 hyprlock
+hyprsunset
+hyprshutdown
+hyprpwcenter
+hyprlauncher
+
+dex
+polkit-gnome
 
 waybar
-wofi
 
 grim
 slurp
@@ -56,7 +62,11 @@ dunst
 cliphist
 inotify-tools
 
-pavucontrol
+fcitx5
+fcitx5-chinese-addons
+fcitx5-gtk
+fcitx5-qt
+fcitx5-configtool
 pipewire
 pipewire-alsa
 pipewire-audio
@@ -72,6 +82,8 @@ zed
 vim
 neovim
 
+activitywatch-bin
+
 ranger
 thunar
 rar

sh/pull_all

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+for dir in */; do
+  if [ -d "$dir/.git" ]; then
+    echo "Pulling in $dir..."
+    git -C "$dir" pull
+    echo ""
+  fi
+done
+

waybar/base.css

@@ -108,6 +108,21 @@ window#waybar {
     color: @color_tertiary;
 }
 
+/* App launcher buttons */
+#custom-steam,
+#custom-waterfox,
+#custom-discord,
+#custom-spotify,
+#custom-obsidian {
+    padding: 0 10px;
+    color: @color_primary;
+}
+
+#custom-steam {
+    margin-left: 8px;
+    border-left: 1px solid @color_tertiary;
+}
+
 #tray {
     padding: 0 8px;
     border-left: 1px solid @color_tertiary;

waybar/config

@@ -4,7 +4,7 @@
     "height": 30,
     "spacing": 0,
 
-    "modules-left": ["hyprland/workspaces", "hyprland/submap"],
+    "modules-left": ["hyprland/workspaces", "hyprland/submap", "custom/steam", "custom/waterfox", "custom/discord", "custom/spotify", "custom/obsidian"],
     "modules-right": [
         "custom/greetings",
         "custom/history",
@@ -111,5 +111,35 @@
 
     "tray": {
         "spacing": 10
+    },
+
+    "custom/steam": {
+        "format": "Steam",
+        "on-click": "steam",
+        "tooltip-format": "Steam"
+    },
+
+    "custom/waterfox": {
+        "format": "Waterfox",
+        "on-click": "waterfox",
+        "tooltip-format": "Waterfox"
+    },
+
+    "custom/discord": {
+        "format": "Discord",
+        "on-click": "snap run discord",
+        "tooltip-format": "Discord"
+    },
+
+    "custom/spotify": {
+        "format": "Spotify",
+        "on-click": "snap run spotify",
+        "tooltip-format": "Spotify"
+    },
+
+    "custom/obsidian": {
+        "format": "Obsidian",
+        "on-click": "obsidian",
+        "tooltip-format": "Obsidian"
     }
 }

waybar/style.css

@@ -118,6 +118,21 @@ window#waybar {
     color: @color_tertiary;
 }
 
+/* App launcher buttons */
+#custom-steam,
+#custom-waterfox,
+#custom-discord,
+#custom-spotify,
+#custom-obsidian {
+    padding: 0 10px;
+    color: @color_primary;
+}
+
+#custom-steam {
+    margin-left: 8px;
+    border-left: 1px solid @color_tertiary;
+}
+
 #tray {
     padding: 0 8px;
     border-left: 1px solid @color_tertiary;