Feature: Provider logos in VPN notifications

vpn-notify picks the icon by VPN name: Papirus's Mullvad and ProtonVPN icons, plus Tailscale and UniFi logos shipped in .local/share/vpn-notify. Anything else keeps the generic lock icon. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Fix: Start vpn-notify straight away in bootstrap.sh
2026-10-22 11:14:46 +01:00 · 2026-10-22 11:14:46 +01:00 · 2026-10-22 11:14:46 +01:00 · 2026-10-22 11:14:46 +01:00 · 2026-10-22 11:04:35 +01:00 · 2026-10-22 09:24:49 +01:00
106 changed files with 3931 additions and 3115 deletions
--- a/README.md
+++ b/README.md
@@ -39,13 +39,29 @@ mkdir Projects
 git clone ssh://git@gitea.thomasleewilliams.co.uk:2222/thomas/dotfiles.git
 ```

-Once that is complete, run this command:
+On a fresh install, run the bootstrap script. It installs drivers (auto-detected),
+every package in `system/packages.txt`, yay, flatpaks, then links the dotfiles and
+system config below:
+```console
+~/Projects/dotfiles/bootstrap.sh            # asks about the optional SVT-AV1 + ffmpeg rebuild
+~/Projects/dotfiles/bootstrap.sh --svt-av1  # or --no-svt-av1 to skip the question
+```
+
+To only link the dotfiles, run this command:
 ```console
 stow -d ~/Projects/dotfiles/ -t ~/ dotfiles
 ```

 This will sync wallpapers/config files to where they are usually located

+System-level config (e.g. pacman options) lives in `system/` and is installed with sudo:
+```console
+~/Projects/dotfiles/system/install.sh
+```
+
+Full documentation (every config, keybinding and script) lives in the Outline wiki's
+**Dotfiles** collection: https://outline.twhomelab.co.uk/collection/dotfiles-frMIfJi2Hf
+
 ## 📦 Programs

 List of programs and tools I use.
@@ -54,12 +70,12 @@ List of programs and tools I use.
 | Component         | Program    |
 |-------------------|------------|
 |🪟 Windows Manager | [hyprland](https://github.com/hyprwm/Hyprland)  |
-|🖥️ Terminal        | [foot](https://codeberg.org/dnkl/foot)      |
-|🐚 Shell           | [zsh](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH) / [theme](https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/refined.zsh-theme) |
+|🖥️ Terminal        | [ghostty](https://ghostty.org/) / [foot](https://codeberg.org/dnkl/foot) (fallback) |
+|🐚 Shell           | [zsh](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH) + oh-my-zsh / [oh-my-posh](https://ohmyposh.dev/) prompt (`.config/ohmyposh/zen.toml`) |
 |📁 File Manager    | [thunar](https://wiki.archlinux.org/title/Thunar)     |
 |📝 Editor          | [vs code](https://github.com/microsoft/vscode) / [neovim (changing to soon)](https://github.com/neovim/neovim)    |
 |🌐 Browser         | [zen](https://github.com/zen-browser/desktop) / [firefox](https://github.com/topics/firefox-browser) / [startpage](https://blog-bucket-personal.s3.eu-west-2.amazonaws.com/Screenshot_02-May_08-44-23_6614.png) |
-|📊 Bar             | [waybar](https://github.com/Alexays/Waybar) / [quickshell](https://quickshell.org/)     | 
+|📊 Bar             | [quickshell](https://quickshell.org/) (waybar retired, config kept) |
 |🚀 Launcher        | [rofi](https://github.com/davatorium/rofi)          |
 |🔒 Lockscreen      | [hyprlock](https://github.com/hyprwm/hyprlock)  |
 |🚪 Login Menu      | [sddm](https://github.com/sddm/sddm)          |
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+# Sets up a fresh Arch install: drivers, packages, dotfiles and system config.
+# Safe to re-run; anything already installed is skipped.
+#
+# Usage: ./bootstrap.sh [--svt-av1 | --no-svt-av1]
+#   --svt-av1     also install svt-av1-essential-git and rebuild ffmpeg against it
+#   --no-svt-av1  skip that without asking
+#   (neither)     ask
+set -euo pipefail
+
+repo="$(cd "$(dirname "$0")" && pwd)"
+list="$repo/system/packages.txt"
+
+svt_av1=ask
+for arg in "$@"; do
+    case "$arg" in
+        --svt-av1) svt_av1=yes ;;
+        --no-svt-av1) svt_av1=no ;;
+        *) echo "Unknown option: $arg" >&2; exit 1 ;;
+    esac
+done
+
+if (( EUID == 0 )); then
+    echo "Run this as your normal user, not root (it uses sudo where needed)." >&2
+    exit 1
+fi
+
+step() { printf '\n\033[1;34m==> %s\033[0m\n' "$*"; }
+
+# Prints the packages under a [section] of packages.txt, skipping comments
+packages() {
+    awk -v want="[$1]" '
+        /^\[/ { section = $1; next }
+        section == want { sub(/#.*/, ""); if (NF) print $1 }
+    ' "$list"
+}
+
+# --- System config -----------------------------------------------------------
+
+step "System config (pacman options)"
+"$repo/system/install.sh"
+
+step "Enabling multilib (needed for Steam and 32-bit drivers)"
+if ! grep -q '^\[multilib\]' /etc/pacman.conf; then
+    sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
+fi
+sudo pacman -Syu --needed --noconfirm pciutils git base-devel
+
+# --- Hardware ----------------------------------------------------------------
+
+step "Detecting CPU and GPU"
+hw=()
+
+case "$(grep -m1 '^vendor_id' /proc/cpuinfo | awk '{print $3}')" in
+    AuthenticAMD) hw+=(amd-ucode); echo "CPU: AMD" ;;
+    GenuineIntel) hw+=(intel-ucode); echo "CPU: Intel" ;;
+    *) echo "CPU: unknown vendor, skipping microcode" ;;
+esac
+
+# Vendor column of every display controller, e.g. "NVIDIA Corporation"
+gpus="$(lspci -mm | awk -F'"' '$2 ~ /VGA|3D|Display/ { print $4 }')"
+if grep -q NVIDIA <<<"$gpus"; then
+    echo "GPU: NVIDIA"
+    # nvidia-open only ships modules for the stock `linux` kernel; any other
+    # kernel needs the DKMS build. Supports Turing (GTX 16xx / RTX 20xx) and newer.
+    if pacman -Qq linux-lts linux-zen linux-hardened >/dev/null 2>&1; then
+        hw+=(nvidia-open-dkms linux-headers)
+    else
+        hw+=(nvidia-open)
+    fi
+    hw+=(nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
+fi
+if grep -q 'Advanced Micro Devices' <<<"$gpus"; then
+    echo "GPU: AMD"
+    hw+=(mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon)
+fi
+if grep -q 'Intel Corporation' <<<"$gpus"; then
+    echo "GPU: Intel"
+    hw+=(mesa lib32-mesa vulkan-intel lib32-vulkan-intel intel-media-driver)
+fi
+
+# Installed before the main list so Steam's 32-bit Vulkan dependency is
+# already satisfied by the right driver
+if (( ${#hw[@]} )); then
+    sudo pacman -S --needed --noconfirm "${hw[@]}"
+fi
+
+# --- Packages ----------------------------------------------------------------
+
+step "Official repo packages"
+mapfile -t pkgs < <(packages pacman)
+sudo pacman -S --needed --noconfirm "${pkgs[@]}"
+
+step "yay (AUR helper)"
+if ! command -v yay >/dev/null; then
+    build="$(mktemp -d)"
+    git clone https://aur.archlinux.org/yay-bin.git "$build/yay-bin"
+    (cd "$build/yay-bin" && makepkg -si --noconfirm)
+    rm -rf "$build"
+else
+    echo "already installed"
+fi
+
+step "AUR packages"
+mapfile -t pkgs < <(packages aur)
+yay -S --needed --noconfirm "${pkgs[@]}"
+
+step "Flatpak apps"
+sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+mapfile -t pkgs < <(packages flatpak)
+sudo flatpak install -y --noninteractive flathub "${pkgs[@]}"
+
+step "Apps from official install scripts"
+mkdir -p "$HOME/.local/bin"
+for app in $(packages installer); do
+    if command -v "$app" >/dev/null || [[ -x "$HOME/.local/bin/$app" ]]; then
+        echo "$app: already installed"
+        continue
+    fi
+    case "$app" in
+        claude) curl -fsSL https://claude.ai/install.sh | bash ;;
+        oh-my-posh) curl -fsSL https://ohmyposh.dev/install.sh | bash -s -- -d "$HOME/.local/bin" ;;
+        *) echo "$app: no install recipe in bootstrap.sh, skipping" >&2 ;;
+    esac
+done
+
+step "oh-my-zsh and plugins"
+# .zshrc sources ~/.oh-my-zsh/oh-my-zsh.sh and loads two custom plugins from it.
+# A plain clone is all oh-my-zsh needs; its installer would also write a template
+# ~/.zshrc, which then conflicts with the stowed one.
+if [[ ! -d "$HOME/.oh-my-zsh" ]]; then
+    git clone --depth 1 https://github.com/ohmyzsh/ohmyzsh.git "$HOME/.oh-my-zsh"
+else
+    echo "oh-my-zsh: already installed"
+fi
+zsh_custom="$HOME/.oh-my-zsh/custom/plugins"
+for plugin in zsh-autosuggestions zsh-syntax-highlighting; do
+    if [[ -d "$zsh_custom/$plugin" ]]; then
+        echo "$plugin: already installed"
+    else
+        git clone --depth 1 "https://github.com/zsh-users/$plugin" "$zsh_custom/$plugin"
+    fi
+done
+
+# --- Optional: SVT-AV1 essential + ffmpeg rebuild ----------------------------
+
+if [[ $svt_av1 == ask ]]; then
+    read -rp $'\nInstall svt-av1-essential-git and rebuild ffmpeg against it? (slow) [y/N] ' reply
+    [[ $reply == [yY]* ]] && svt_av1=yes || svt_av1=no
+fi
+if [[ $svt_av1 == yes ]]; then
+    step "svt-av1-essential-git"
+    # Interactive on purpose: pacman asks to replace the conflicting svt-av1,
+    # and --noconfirm would answer no
+    yay -S --needed svt-av1-essential-git
+    step "Rebuilding ffmpeg against svt-av1-essential-git"
+    "$repo/system/rebuild-ffmpeg.sh"
+fi
+
+# --- Services ----------------------------------------------------------------
+
+step "Enabling services"
+# Not started now: sddm would take over the screen mid-script. They come up on reboot.
+mapfile -t units < <(packages services)
+sudo systemctl enable "${units[@]}"
+
+# --- Dotfiles ----------------------------------------------------------------
+
+step "Linking dotfiles with stow"
+# Create real parent dirs first, otherwise stow symlinks the whole directory
+# (e.g. ~/.config) into the repo and every app's files end up in git
+mkdir -p "$HOME/.config" "$HOME/.local/bin" "$HOME/.local/share/fonts" "$HOME/Pictures"
+# Sunshine keeps credentials and logs beside its config; those must stay out of git
+mkdir -p "$HOME/.config/sunshine"
+# systemd keeps its own wants/ symlinks beside the stowed user units
+mkdir -p "$HOME/.config/systemd/user"
+mkdir -p -m 700 "$HOME/.ssh"
+if ! stow -d "$repo" -t "$HOME" --restow dotfiles; then
+    echo "stow hit conflicts (listed above). Move those files aside, then run:" >&2
+    echo "  stow -d \"$repo\" -t \"\$HOME\" dotfiles" >&2
+fi
+
+step "Enabling user services"
+systemctl --user daemon-reload
+systemctl --user enable --now vpn-notify.service
+
+if [[ "$(getent passwd "$USER" | cut -d: -f7)" != */zsh ]]; then
+    step "Setting zsh as login shell"
+    chsh -s /usr/bin/zsh
+fi
+
+# Picks up the stowed fonts in ~/.local/share/fonts (SF Pro Display for hyprlock)
+fc-cache -f "$HOME/.local/share/fonts" >/dev/null
+
+step "Done — reboot to load drivers and start Hyprland"
--- a/dotfiles/.config/fastfetch/config-v2.jsonc
+++ b/dotfiles/.config/fastfetch/config-v2.jsonc
@@ -1,7 +1,7 @@
 {
 "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
 "logo": {
-  //"source": "~/.config/fastfetch/nixos.png",
+  //"source": "~/.config/fastfetch/arch.png",
  //"type": "kitty-direct",
  "height": 15,
  "width": 30,
--- a/dotfiles/.config/foot/foot.ini
+++ b/dotfiles/.config/foot/foot.ini
@@ -47,3 +47,11 @@ regular4=53BDFA  # blue
 regular5=FAE994  # magenta
 regular6=99faf2  # cyan
 regular7=C7C7C7  # white
+
+[key-bindings]
+clipboard-copy=Control+c XF86Copy
+clipboard-paste=Control+Shift+v XF86Paste
+
+[text-bindings]
+# Ctrl+C now copies, so send the interrupt signal (^C) from Ctrl+Shift+C instead
+\x03=Control+Shift+c
--- a/dotfiles/.config/ghostty/config
+++ b/dotfiles/.config/ghostty/config
@@ -0,0 +1,67 @@
+# Ported from foot/foot.ini — same look and bindings, so the two can be
+# tried side by side. Ghostty is now the default terminal ($term in
+# hypr/input/keybinds.lua). Check edits with `ghostty +validate-config`.
+
+# --- Font / window ---
+font-family = JetBrainsMono Nerd Font
+font-size = 9
+
+# foot: pad=12x12 center
+window-padding-x = 12
+window-padding-y = 12
+window-padding-balance = true
+
+# foot: initial-window-size-pixels=1000x520. Ghostty sizes in cells, not
+# pixels — this is roughly the same at this font size. Only matters for
+# floating windows; tiled ones fill their slot either way.
+window-width = 135
+window-height = 31
+
+# No title bar or tab strip — Hyprland draws the borders. (window-show-tab-bar
+# replaces the deprecated gtk-tabs-location = hidden.)
+window-decoration = none
+window-show-tab-bar = never
+
+# --- Terminal type ---
+# foot forced TERM=xterm-256color everywhere so SSH'd hosts wouldn't lack
+# terminfo. Ghostty keeps its own richer TERM locally and only falls back
+# to xterm-256color (or installs its terminfo) when you ssh somewhere.
+shell-integration-features = ssh-env,ssh-terminfo
+
+# --- Scrollback / mouse ---
+# foot kept 5000 lines; Ghostty's limit is in bytes and its 10MB default
+# is already well beyond that, so it's left alone.
+mouse-scroll-multiplier = 2
+mouse-hide-while-typing = false
+
+# URLs: Ctrl+click opens them with xdg-open by default, like foot's url-mode.
+
+# --- Cursor ---
+cursor-style = bar
+cursor-style-blink = true
+adjust-cursor-thickness = 1
+
+# --- Colours ---
+background-opacity = 0.80
+background = #0a0e14
+foreground = #fffbf6
+selection-foreground = #b3b1ad
+selection-background = #b3b1ad
+
+palette = 0=#01060e
+palette = 1=#eb4129
+palette = 2=#abe047
+palette = 3=#f9af4f
+palette = 4=#53bdfa
+palette = 5=#fae994
+palette = 6=#99faf2
+palette = 7=#c7c7c7
+
+# --- Keybindings ---
+# foot: Ctrl+C copies, Ctrl+Shift+C sends the interrupt. "performable:"
+# makes Ctrl+C copy only when there's a selection — with nothing selected
+# it falls through and interrupts as normal. Ctrl+Shift+C still sends ^C
+# too, for muscle memory.
+keybind = performable:ctrl+c=copy_to_clipboard
+keybind = ctrl+shift+c=text:\x03
+# Ctrl+Shift+V paste is Ghostty's default already.
--- a/dotfiles/.config/gtk-3.0/settings.ini
+++ b/dotfiles/.config/gtk-3.0/settings.ini
@@ -2,7 +2,7 @@
 gtk-theme-name=HyprFlux-Compact
 gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Adwaita Sans 11
-gtk-cursor-theme-name=Future-black Cursors
+gtk-cursor-theme-name=Bibata-Modern-Classic
 gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
--- a/dotfiles/.config/gtk-4.0/settings.ini
+++ b/dotfiles/.config/gtk-4.0/settings.ini
@@ -2,6 +2,6 @@
 gtk-theme-name=HyprFlux-Compact
 gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Adwaita Sans 11
-gtk-cursor-theme-name=Future-black Cursors
+gtk-cursor-theme-name=Bibata-Modern-Classic
 gtk-cursor-theme-size=24
 gtk-application-prefer-dark-theme=1
--- a/dotfiles/.config/hypr/UserConfigs/00-Readme
+++ b/dotfiles/.config/hypr/UserConfigs/00-Readme
@@ -1,6 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# HyprFlux Dots
-
-Settings have been massivily modified as to work in a more simple mannor 
-
-I will update the Hyprland-Dots wiki for guidance. Make sure to check out changelogs as well
--- a/dotfiles/.config/hypr/UserConfigs/ENVariables.conf
+++ b/dotfiles/.config/hypr/UserConfigs/ENVariables.conf
@@ -1,92 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# Environment variables. See https://wiki.hyprland.org/Configuring/Environment-variables/
-
-# Set your defaults editor through ENV in ~/.config/hypr/UserConfigs/01-UserDefaults.conf
-
-# environment-variables
-# Toolkit Backend Variables
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
-env = CLUTTER_BACKEND,wayland
-
-#Run SDL2 applications on Wayland.
-#Remove or set to x11 if games that provide older versions of SDL cause compatibility issues
-#env = SDL_VIDEODRIVER,wayland
-
-# xdg Specifications
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-
-# QT Variables
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_QPA_PLATFORMTHEME,qt5ct
-env = QT_QPA_PLATFORMTHEME,qt6ct
-
-# hyprland-qt-support
-env = QT_QUICK_CONTROLS_STYLE,org.hyprland.style
-
-# xwayland apps scale fix (useful if you are use monitor scaling).
-# Set same value if you use scaling in Monitors.conf
-# 1 is 100% 1.5 is 150%
-# see https://wiki.hyprland.org/Configuring/XWayland/
-env = GDK_SCALE,1
-env = QT_SCALE_FACTOR,1
-
-# Bibata-Modern-Ice-Cursor
-# NOTE! You must have the hyprcursor version to activate this.
-# https://wiki.hyprland.org/Hypr-Ecosystem/hyprcursor/
-env = HYPRCURSOR_THEME,Bibata-Modern-Classic
-env = HYPRCURSOR_SIZE,24
-
-# firefox
-env = MOZ_ENABLE_WAYLAND,1
-
-# electron >28 apps (may help) ##
-# https://www.electronjs.org/docs/latest/api/environment-variables
-env = ELECTRON_OZONE_PLATFORM_HINT,auto # auto selects Wayland if possible, X11 otherwise
-
-# NVIDIA
-# This is from Hyprland Wiki. Below will be activated nvidia gpu detected
-# See hyprland wiki https://wiki.hyprland.org/Nvidia/#environment-variables
-
-env = LIBVA_DRIVER_NAME,nvidia
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = NVD_BACKEND,direct
-env = GSK_RENDERER,ngl
-
-# additional ENV's for nvidia. Caution, activate with care
-#env = GBM_BACKEND,nvidia-drm
-
-#env = __GL_GSYNC_ALLOWED,1 #adaptive Vsync
-#env = __NV_PRIME_RENDER_OFFLOAD,1
-#env = __VK_LAYER_NV_optimus,NVIDIA_only
-#env = WLR_DRM_NO_ATOMIC,1
-
-# FOR VM and POSSIBLY NVIDIA
-# LIBGL_ALWAYS_SOFTWARE software mesa rendering
-#env = LIBGL_ALWAYS_SOFTWARE,1 # Warning. May cause hyprland to crash
-#env = WLR_RENDERER_ALLOW_SOFTWARE,1
-
-# nvidia firefox (for hardware acceleration on FF)?
-# check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration
-#env = MOZ_DISABLE_RDD_SANDBOX,1
-#env = EGL_PLATFORM,wayland
-
-#### Aquamarine Environment Variables #### ( Hyprland > 0.45 )
-# https://wiki.hyprland.org/Configuring/Environment-variables/#aquamarine-environment-variables----ref-httpsgithubcomhyprwmaquamarineblobmaindocsenvmd---
-# env = AQ_TRACE,1 # Enables more verbose logging.
-# env = AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0 # Set an explicit list of DRM devices (GPUs) to use. It’s a colon-separated list of paths, with the first being the primary. E.g. /dev/dri/card1:/dev/dri/card0
-# env = AQ_MGPU_NO_EXPLICIT,1 # Disables explicit syncing on mgpu buffers
-# env = AQ_NO_MODIFIERS,1 # Disables modifiers for DRM buffers
-
-#### Hyprland Environment Variables ####
-# https://wiki.hyprland.org/Configuring/Environment-variables/#hyprland-environment-variables
-# env = HYPRLAND_TRACE,1 # Enables more verbose logging.
-# env = HYPRLAND_NO_RT,1 # Disables realtime priority setting by Hyprland.
-# env = HYPRLAND_NO_SD_NOTIFY,1 # If systemd, disables the 'sd_notify' calls.
-# env = HYPRLAND_NO_SD_VARS,1 # Disables management of variables in systemd and dbus activation environments.
-
-# Bitwarden SSH agent (so GUI apps like VS Code see it, not just shells)
-env = SSH_AUTH_SOCK,/home/thomas/.bitwarden-ssh-agent.sock
--- a/dotfiles/.config/hypr/UserConfigs/Keybinds.conf
+++ b/dotfiles/.config/hypr/UserConfigs/Keybinds.conf
@@ -1,209 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# This is where you put your own keybinds. Be Mindful to check as well ~/.config/hypr/configs/Keybinds.conf to avoid conflict
-# if you think I should replace the Pre-defined Keybinds in ~/.config/hypr/configs/Keybinds.conf , submit an issue or let me know in DC and present me a valid reason as to why, such as conflicting with global shortcuts, etc etc
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables
-# See also Laptops.conf for laptops keybinds
-
-# /* ---- ✴️ Variables ✴️ ---- */  #
-$mainMod = SUPER
-$scriptsDir = $HOME/.config/hypr/scripts
-$UserScripts = $HOME/.config/hypr/UserScripts
-
-# settings for User defaults apps - set your default terminal and file manager on this file
-$edit=${EDITOR:-nvim}
-
-# These two are for UserKeybinds.conf & Waybar Modules
-$term = foot # Terminal
-$files = thunar # File Manager
-
-# Default Search Engine for ROFI Search (SUPER S)
-$Search_Engine = "https://www.google.com/search?q={}"
-
-# common shortcuts
-bind = $mainMod, SPACE, exec, .config/rofi/launchers/type-4/launcher.sh # desktop overview (if installed)
-bind = $mainMod, Q, killactive, # close active (not kill)
-bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh # Kill active process
-bind = $mainMod, Return, exec, $term  #terminal
-bind = $mainMod, F, exec, $files #file manager
-bind = $mainMod, B, exec, zen-browser # Launch Zen Browser New Everytime
-bind = $mainMod, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
-bind = $mainMod, C, exec, code --ozone-platform=x11 # Visual Studio Code
-bind = $mainMod, O, exec, obsidian --ozone-platform=x11 # Obsidian
-bind = $mainMod, X, exec, vesktop # Vesktop(Discord)
-bind = $mainMod, M, exec, fdm # Free Downlaod Manager
-bind = $mainMod, W, exec, waypaper # Wayland Wallpaper Setter
-bind = $mainMod, L, exec, hyprlock # Screen Locker
-bind = $mainMod, DELETE, exec, ~/.config/rofi/powermenu/type-2/powermenu.sh # Power Menu
-bind = $mainMod, S, exec, cd /home/thomas/hyprmod && uv run hyprmod # Hyprmod - A Hyprland settings manager (if installed)
-bind = $mainMod SHIFT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofirrr
-bind = $mainMod, N, exec, swaync-client -t -sw # swayNC notification panel
-
-# FEATURES / EXTRAS
-bind = $mainMod SHIFT, F, fullscreen # whole full screen
-bind = $mainMod SHIFT, SPACE, togglefloating, #Float Mode
-
-
-# Desktop zooming or magnifier
-bind = $mainMod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
-bind = $mainMod ALT, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')"
-
-## NOTES for ja (Hyprland version 0.39 (Ubuntu 24.04))
-#bind = $mainMod ALT, mouse_down, exec, hyprctl keyword misc:cursor_zoom_factor "$(hyprctl getoption misc:cursor_zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
-#bind = $mainMod ALT, mouse_up, exec, hyprctl keyword misc:cursor_zoom_factor "$(hyprctl getoption misc:cursor_zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')"
-
-# Waybar / Bar related
-bind = $mainMod CTRL ALT, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar
-
-# FEATURES / EXTRAS (UserScripts)
-bind = $mainMod SHIFT, A, exec, $scriptsDir/Animations.sh #hyprland animations menu
-bind = $mainMod SHIFT, Z, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
-
-#######################################################################################################################################
-#Default Keybinds#
-#######################################################################################################################################
-
-
-bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 # exit Hyprland
-
-# Master Layout
-bind = $mainMod CTRL, D, layoutmsg, removemaster
-bind = $mainMod, I, layoutmsg, addmaster
-bind = $mainMod, J, layoutmsg, cyclenext
-bind = $mainMod, K, layoutmsg, cycleprev
-bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-
-# Dwindle Layout
-bind = $mainMod, P, pseudo, # dwindle
-
-# Special Keys / Hot Keys
-bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc # volume up
-bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec # volume down
-bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic # mic mute
-bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle # mute
-bindl = , xf86Sleep, exec, systemctl suspend  # sleep button
-bindl = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh # Airplane mode
-
-# media controls using keyboards
-bindl = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
-bindl = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
-bindl = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
-
-# Resize windows
-binde = $mainMod SHIFT, left, resizeactive,-50 0
-binde = $mainMod SHIFT, right, resizeactive,50 0
-binde = $mainMod SHIFT, up, resizeactive,0 -50
-binde = $mainMod SHIFT, down, resizeactive,0 50
-
-# Move windows
-bind = $mainMod CTRL, left, movewindow, l
-bind = $mainMod CTRL, right, movewindow, r
-bind = $mainMod CTRL, up, movewindow, u
-bind = $mainMod CTRL, down, movewindow, d
-
-# Swap windows
-bind = $mainMod ALT, left, swapwindow, l
-bind = $mainMod ALT, right, swapwindow, r
-bind = $mainMod ALT, up, swapwindow, u
-bind = $mainMod ALT, down, swapwindow, d
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Workspaces related
-bind = $mainMod, tab, workspace, m+1
-bind = $mainMod SHIFT, tab, workspace, m-1
-
-# Special workspace
-# bind = $mainMod SHIFT, U, movetoworkspace, special
-# bind = $mainMod, U, togglespecialworkspace,
-bind = $mainMod, U, togglespecialworkspace, nyx
-bind = $mainMod SHIFT, U, movetoworkspace, special:nyx
-
-
-# The following mappings use the key codes to better support various keyboard layouts
-# 1 is code:10, 2 is code 11, etc
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, code:10, workspace, 1 # NOTE: code:10 = key 1
-bind = $mainMod, code:11, workspace, 2 # NOTE: code:11 = key 2
-bind = $mainMod, code:12, workspace, 3 # NOTE: code:12 = key 3
-bind = $mainMod, code:13, workspace, 4 # NOTE: code:13 = key 4
-bind = $mainMod, code:14, workspace, 5 # NOTE: code:14 = key 5
-bind = $mainMod, code:15, workspace, 6 # NOTE: code:15 = key 6
-bind = $mainMod, code:16, workspace, 7 # NOTE: code:16 = key 7
-bind = $mainMod, code:17, workspace, 8 # NOTE: code:17 = key 8
-bind = $mainMod, code:18, workspace, 9 # NOTE: code:18 = key 9
-bind = $mainMod, code:19, workspace, 10 # NOTE: code:19 = key 0
-
-# Move active window and follow to workspace mainMod + SHIFT [0-9]
-bind = $mainMod SHIFT, code:10, movetoworkspace, 1 # NOTE: code:10 = key 1
-bind = $mainMod SHIFT, code:11, movetoworkspace, 2 # NOTE: code:11 = key 2
-bind = $mainMod SHIFT, code:12, movetoworkspace, 3 # NOTE: code:12 = key 3
-bind = $mainMod SHIFT, code:13, movetoworkspace, 4 # NOTE: code:13 = key 4
-bind = $mainMod SHIFT, code:14, movetoworkspace, 5 # NOTE: code:14 = key 5
-bind = $mainMod SHIFT, code:15, movetoworkspace, 6 # NOTE: code:15 = key 6
-bind = $mainMod SHIFT, code:16, movetoworkspace, 7 # NOTE: code:16 = key 7
-bind = $mainMod SHIFT, code:17, movetoworkspace, 8 # NOTE: code:17 = key 8
-bind = $mainMod SHIFT, code:18, movetoworkspace, 9 # NOTE: code:18 = key 9
-bind = $mainMod SHIFT, code:19, movetoworkspace, 10 # NOTE: code:19 = key 0
-bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [
-bind = $mainMod SHIFT, bracketright, movetoworkspace, +1 # brackets ]
-
-# Move active window to a workspace silently mainMod + CTRL [0-9]
-bind = $mainMod CTRL, code:10, movetoworkspacesilent, 1 # NOTE: code:10 = key 1
-bind = $mainMod CTRL, code:11, movetoworkspacesilent, 2 # NOTE: code:11 = key 2
-bind = $mainMod CTRL, code:12, movetoworkspacesilent, 3 # NOTE: code:12 = key 3
-bind = $mainMod CTRL, code:13, movetoworkspacesilent, 4 # NOTE: code:13 = key 4
-bind = $mainMod CTRL, code:14, movetoworkspacesilent, 5 # NOTE: code:14 = key 5
-bind = $mainMod CTRL, code:15, movetoworkspacesilent, 6 # NOTE: code:15 = key 6
-bind = $mainMod CTRL, code:16, movetoworkspacesilent, 7 # NOTE: code:16 = key 7
-bind = $mainMod CTRL, code:17, movetoworkspacesilent, 8 # NOTE: code:17 = key 8
-bind = $mainMod CTRL, code:18, movetoworkspacesilent, 9 # NOTE: code:18 = key 9
-bind = $mainMod CTRL, code:19, movetoworkspacesilent, 10 # NOTE: code:19 = key 0
-bind = $mainMod CTRL, bracketleft, movetoworkspacesilent, -1 # brackets [
-bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1 # brackets ]
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod, period, workspace, e+1
-bind = $mainMod, comma, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow # NOTE: mouse:272 = left click
-bindm = $mainMod, mouse:273, resizewindow # NOTE: mouse:272 = right click
-
-#########################################################################################################
-# Laptop specific keybinds
-#########################################################################################################
-
-# for disabling Touchpad. hyprctl devices to get device name.
-$Touchpad_Device=asue1209:00-04f3:319f-touchpad
-
-binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec # decrease keyboard brightness
-binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc # increase keyboard brightness
-bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button
-bind = , xf86Launch3, exec, asusctl led-mode -n # FN+F4 Switch keyboard RGB profile
-bind = , xf86Launch4, exec, asusctl profile -n  # FN+F5 change of fan profiles (Quite, Balance, Performance)
-binde = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec # decrease monitor brightness
-binde = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc # increase monitor brightness
-bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh # disable touchpad
-
-# Screenshot keybindings using F6 (no PrinSrc button)
-#bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # screenshot
-#bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area # screenshot (area)
-#bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # # screenshot (5 secs delay)
-#bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # screenshot (10 secs delay)
-#bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # screenshot (active window only)
-
-$TOUCHPAD_ENABLED = true
-device {
-  name = $Touchpad_Device
-  enabled = $TOUCHPAD_ENABLED
-}
--- a/dotfiles/.config/hypr/UserConfigs/LaptopDisplay.conf
+++ b/dotfiles/.config/hypr/UserConfigs/LaptopDisplay.conf
@@ -1,4 +0,0 @@
-# NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
-# See notes on Laptops.conf
-
-#monitor = eDP-1, preferred, auto, 1
--- a/dotfiles/.config/hypr/UserConfigs/Laptops.conf
+++ b/dotfiles/.config/hypr/UserConfigs/Laptops.conf
@@ -1,31 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
-# These configs are mostly for laptops. This is addemdum to Keybinds.conf
-
-$mainMod = SUPER
-$scriptsDir = $HOME/.config/hypr/scripts
-$UserConfigs = $HOME/.config/hypr/UserConfigs
-
-
-# Below are useful when you are connecting your laptop in external display
-# Suggest you edit below for your laptop display
-# From WIKI This is to disable laptop monitor when lid is closed.
-# consult https://wiki.hyprland.org/hyprland-wiki/pages/Configuring/Binds/#switches
-#bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1"
-#bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
-
-
-# WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
-# CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper.
-# CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor
-# One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!!
-# Make sure to comment (put # on the both the bindl = , switch ......) above
-# NOTE: Display for laptop are being generated into LaptopDisplay.conf
-# This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc
-
-#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $UserConfigs/LaptopDisplay.conf
-#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $UserConfigs/LaptopDisplay.conf
-
-# for laptop-lid action (to erase the last entry)
-#exec-once = echo "monitor = eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
-#
--- a/dotfiles/.config/hypr/UserConfigs/Startup_Apps.conf
+++ b/dotfiles/.config/hypr/UserConfigs/Startup_Apps.conf
@@ -1,43 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# Commands and Apps to be executed at launch
-
-$scriptsDir = $HOME/.config/hypr/scripts
-
-# wallpaper stuff 
-exec-once = awww-daemon --format xrgb
-#exec-once = mpvpaper '*' -o "load-scripts=no no-audio --loop" $livewallpaper
-
-# Startup
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-
-# Polkit (Polkit Gnome / KDE)
-exec-once = $scriptsDir/Polkit.sh
-
-# starup apps
-exec-once = nm-applet --indicator
-exec-once = swaync
-#exec-once = ags
-#exec-once = blueman-applet
-#exec-once = rog-control-center
-exec-once = waybar
-exec-once = qs # quickshell AGS Desktop Overview alternative
-
-#clipboard manager
-exec-once = wl-paste --type text --watch cliphist store
-exec-once = wl-paste --type image --watch cliphist store
-
-# Starting hypridle to start hyprlock
-exec-once = hypridle
-
-exec-once = hyprctl dispatch workspace 3
-exec-once = /usr/bin/Plexamp.AppImage && 
-exec-once = sleep 3 && vesktop
-exec-once = hyprctl dispatch workspace 1
-exec-once = bitwarden-desktop --ozone-platform-hint=auto --silent
-
-# Here are list of features available but disabled by default
-# exec-once = awww-daemon --format xrgb && awww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
-
-# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
-#exec-once = $scriptsDir/PortalHyprland.sh
--- a/dotfiles/.config/hypr/UserConfigs/UserAnimations.conf
+++ b/dotfiles/.config/hypr/UserConfigs/UserAnimations.conf
@@ -1,26 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-
-animations {
-  enabled = yes
-
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
-  bezier = overshot, 0.05, 0.9, 0.1, 1.05
-  bezier = smoothOut, 0.5, 0, 0.99, 0.99
-  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
-  
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 5, winIn, slide
-  animation = windowsOut, 1, 3, smoothOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 3, smoothOut
-  animation = workspaces, 1, 5, overshot
-  
-  # animations for -git or version >0.42.0
-  animation = workspacesIn, 1, 5, winIn, slide
-  animation = workspacesOut, 1, 5, winOut, slide
-}
--- a/dotfiles/.config/hypr/UserConfigs/UserDecorations.conf
+++ b/dotfiles/.config/hypr/UserConfigs/UserDecorations.conf
@@ -1,58 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# Decoration Settings
-
-# Hyprland Wiki Links
-# Animation - https://wiki.hyprland.org/Configuring/Animations/
-# Decoration - https://wiki.hyprland.org/Configuring/Variables/#decoration
-
-# HyprFlux static color palette
-source = $HOME/.config/hypr/colours/hyprflux-colors.conf
-
-general {
-  border_size = 0
-  gaps_in = 2
-  gaps_out = 4
-  
-  # col.active_border = $color12 
-  # col.inactive_border = $color10
-}
-
-decoration {
-  rounding = 10
-         
-  active_opacity = 1.0
-  inactive_opacity = 1.0
-  fullscreen_opacity = 1.0
-
-  dim_inactive = true
-  dim_strength = 0.1
-  dim_special = 0.8
-
-  shadow {
-    enabled = false
-    range = 3
-    render_power = 1
-
-    color =  $color12
-    color_inactive = $color10
-  }
-
-
-  blur {
-    enabled = true	
-    size = 6
-    passes = 2
-    ignore_opacity = true
-    new_optimizations = true
-    special = true
-    popups = true
-  }
-}
-
-group {
-  col.border_active = $color15
-
-	groupbar {
-		col.active = $color0
-  }
-}
--- a/dotfiles/.config/hypr/UserConfigs/UserSettings.conf
+++ b/dotfiles/.config/hypr/UserConfigs/UserSettings.conf
@@ -1,116 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# User Settings
-# This is where you put your own settings as this will not be touched during update
-# if the upgrade.sh is used.
-
-# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables/
-
-# NOTE: some settings are in ~/.config/hypr/UserConfigs/UserDecorAnimations.conf
-
-dwindle {
-  preserve_split = true
-  #smart_split = true
-  special_scale_factor = 1
-}
-
-master {
-  new_status = master
-  new_on_top = 1
-  mfact = 0.5
-}
-
-general {
-  resize_on_border = true
-
-  layout = dwindle
-}
-
-input {
-  kb_layout = gb
-  kb_variant =
-  kb_model =
-  kb_options =
-  kb_rules =
-  repeat_rate = 50
-  repeat_delay = 300
-  sensitivity = 0.6 #mouse sensitivity
-  #accel_profile =     # flat or adaptive or blank or EMPTY means libinput’s default mode
-  numlock_by_default = true
-  left_handed = false
-  follow_mouse = 1
-  float_switch_override_focus = false
-
-  touchpad {
-    disable_while_typing = true
-    natural_scroll = true
-    clickfinger_behavior = false
-    middle_button_emulation = false
-    tap-to-click = true
-    drag_lock = false
-  }
-
-  # below for devices with touchdevice ie. touchscreen
-	touchdevice {
-		enabled = true
-	}
-
-	# below is for table see link above for proper variables
-	tablet {
-		transform = 0
-		left_handed = 0
-	}
-}
-
-gestures {
-  # workspace_swipe = true
-  # workspace_swipe_fingers = 3
-  workspace_swipe_distance = 500
-  workspace_swipe_invert = true
-  workspace_swipe_min_speed_to_force = 30
-  workspace_swipe_cancel_ratio = 0.5
-  workspace_swipe_create_new = true
-  workspace_swipe_forever = true
-  #workspace_swipe_use_r = true #uncomment if wanted a forever create a new workspace with swipe right
-}
-
-misc {
-  disable_hyprland_logo = true
-  disable_splash_rendering = true
-  vrr = 2
-  mouse_move_enables_dpms = true
-  enable_swallow = off
-  swallow_regex = ^(kitty)$
-  focus_on_activate = false
-  initial_workspace_tracking = 0
-  middle_click_paste = false
-  enable_anr_dialog = true    # Application not Responding (ANR)
-  anr_missed_pings = 15       # ANR Threshold default 1 is too low
-}
-
-#opengl {
-#  nvidia_anti_flicker = true
-#}
-
-binds {
-  workspace_back_and_forth = true
-  allow_workspace_cycles = true
-  pass_mouse_when_bound = false
-}
-
-#Could help when scaling and not pixelating
-xwayland {
-  enabled = true
-  force_zero_scaling = true
-}
-
-render {
-  direct_scanout = 0
-}
-
-cursor {
-  sync_gsettings_theme = true
-  no_hardware_cursors = 2 # change to 1 if want to disable
-  enable_hyprcursor = true
-  warp_on_change_workspace = 2
-  no_warps = true
-}
--- a/dotfiles/.config/hypr/UserConfigs/WindowRules-copy.conf
+++ b/dotfiles/.config/hypr/UserConfigs/WindowRules-copy.conf
@@ -1,744 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# For window rules and layerrules
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
-# NOTES: This is only for Hyprland > 0.48
-
-# note for ja: This should NOT be implemented on Debian and Ubuntu
-
-# windowrule - tags - add apps under appropriate tag to use the same settings
-# browser tags
-windowrule {
-  name = windowrule-1
-  tag = +browser
-  match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr|[Ff]irefox-bin)$
-}
-
-windowrule {
-  name = windowrule-2
-  tag = +browser
-  match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
-}
-
-windowrule {
-  name = windowrule-3
-  tag = +browser
-  match:class = ^(chrome-.+-Default)$ # Chrome PWAs
-}
-
-# windowrule = tag +browser, class:^([Cc]hromium)$
-windowrule {
-  name = windowrule-4
-  tag = +browser
-  match:class = ^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable))$
-}
-
-windowrule {
-  name = windowrule-5
-  tag = +browser
-  match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$
-}
-
-windowrule {
-  name = windowrule-6
-  tag = +browser
-  match:class = ^([Tt]horium-browser|[Cc]achy-browser)$
-}
-
-windowrule {
-  name = windowrule-7
-  tag = +browser
-  match:class = ^(zen-alpha|zen)$
-}
-
-
-# notif tags
-windowrule {
-  name = windowrule-8
-  tag = +notif
-  match:class = ^(swaync-control-center|swaync-notification-window|swaync-client|class)$
-}
-
-
-# HyprFlux settings tag
-windowrule {
-  name = windowrule-9
-  tag = +HyprFlux_Cheat
-  match:title = ^(HyprFlux Quick Cheat Sheet)$
-}
-
-windowrule {
-  name = windowrule-10
-  tag = +HyprFlux_Settings
-  match:title = ^(HyprFlux Settings)$
-}
-
-windowrule {
-  name = windowrule-11
-  tag = +HyprFlux-Settings
-  match:class = ^(nwg-displays|nwg-look)$
-}
-
-
-# terminal tags
-windowrule {
-  name = windowrule-12
-  tag = +terminal
-  match:class = ^(Alacritty|kitty|kitty-dropterm)$
-}
-
-
-# email tags
-windowrule {
-  name = windowrule-13
-  tag = +email
-  match:class = ^([Tt]hunderbird|org.gnome.Evolution)$
-}
-
-windowrule {
-  name = windowrule-14
-  tag = +email
-  match:class = ^(eu.betterbird.Betterbird)$
-}
-
-
-# project tags
-windowrule {
-  name = windowrule-15
-  tag = +projects
-  match:class = ^(codium|codium-url-handler|VSCodium)$
-}
-
-windowrule {
-  name = windowrule-16
-  tag = +projects
-  match:class = ^(VSCode|code-url-handler)$
-}
-
-windowrule {
-  name = windowrule-17
-  tag = +projects
-  match:class = ^(jetbrains-.+)$ # JetBrains IDEs
-}
-
-
-# screenshare tags
-windowrule {
-  name = windowrule-18
-  tag = +screenshare
-  match:class = ^(com.obsproject.Studio)$
-}
-
-
-# IM tags
-# windowrule = tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
-windowrule {
-  name = windowrule-19
-  tag = +im
-  center = on
-  float = on
-  size = (monitor_w*0.6) (monitor_h*0.7)
-  match:class = ^([Ff]erdium)$
-}
-
-windowrule {
-  name = windowrule-20
-  tag = +im
-  match:class = ^([Ww]hatsapp-for-linux)$
-}
-
-windowrule {
-  name = windowrule-21
-  tag = +im
-  match:class = ^(ZapZap|com.rtosta.zapzap)$
-}
-
-windowrule {
-  name = windowrule-22
-  tag = +im
-  match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
-}
-
-windowrule {
-  name = windowrule-23
-  tag = +im
-  match:class = ^(teams-for-linux)$
-}
-
-windowrule {
-  name = windowrule-24
-  tag = +im
-  match:class = ^(im.riot.Riot|Element)$ # Element Matrix client
-}
-
-
-# game tags
-windowrule {
-  name = windowrule-25
-  tag = +games
-  match:class = ^(gamescope)$
-}
-
-windowrule {
-  name = windowrule-26
-  tag = +games
-  match:class = ^(steam_app_\d+)$
-}
-
-
-# gamestore tags
-windowrule {
-  name = windowrule-27
-  tag = +gamestore
-  match:class = ^([Ss]team)$
-}
-
-windowrule {
-  name = windowrule-28
-  tag = +gamestore
-  match:title = ^([Ll]utris)$
-}
-
-windowrule {
-  name = windowrule-29
-  tag = +gamestore
-  match:class = ^(com.heroicgameslauncher.hgl)$
-}
-
-
-# file-manager tags
-windowrule {
-  name = windowrule-30
-  tag = +file-manager
-  match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
-}
-
-windowrule {
-  name = windowrule-31
-  tag = +file-manager
-  match:class = ^(app.drey.Warp)$
-}
-
-
-# wallpaper tags
-windowrule {
-  name = windowrule-32
-  tag = +wallpaper
-  match:class = ^([Ww]aytrogen)$
-}
-
-
-# multimedia tags
-windowrule {
-  name = windowrule-33
-  tag = +multimedia
-  match:class = ^([Aa]udacious)$
-}
-
-
-# multimedia-video tags
-windowrule {
-  name = windowrule-34
-  tag = +multimedia_video
-  match:class = ^([Mm]pv|vlc)$
-}
-
-
-# settings tags
-windowrule {
-  name = windowrule-35
-  tag = +settings
-  center = on
-  match:title = ^(ROG Control)$
-}
-
-windowrule {
-  name = windowrule-36
-  tag = +settings
-  match:class = ^(wihotspot(-gui)?)$ # wifi hotspot
-}
-
-windowrule {
-  name = windowrule-37
-  tag = +settings
-  match:class = ^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
-}
-
-windowrule {
-  name = windowrule-38
-  tag = +settings
-  match:class = ^(gnome-disks|wihotspot(-gui)?)$
-}
-
-windowrule {
-  name = windowrule-39
-  tag = +settings
-  match:title = (Kvantum Manager)
-}
-
-windowrule {
-  name = windowrule-40
-  tag = +settings
-  match:class = ^(file-roller|org.gnome.FileRoller)$ # archive manager
-}
-
-windowrule {
-  name = windowrule-41
-  tag = +settings
-  match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$
-}
-
-windowrule {
-  name = windowrule-42
-  tag = +settings
-  center = on
-  match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
-}
-
-windowrule {
-  name = windowrule-43
-  tag = +settings
-  match:class = ^(qt5ct|qt6ct|[Yy]ad)$
-}
-
-windowrule {
-  name = windowrule-44
-  tag = +settings
-  match:class = (xdg-desktop-portal-gtk)
-}
-
-windowrule {
-  name = windowrule-45
-  tag = +settings
-  match:class = ^(org.kde.polkit-kde-authentication-agent-1)$
-}
-
-windowrule {
-  name = windowrule-46
-  tag = +settings
-  match:class = ^([Rr]ofi)$
-}
-
-
-
-# Custom rule
-windowrule {
-  name = windowrule-47
-  tile = on
-  match:class = ^([Cc]hromium)$
-}
-
-windowrule {
-  name = windowrule-48
-  size = (monitor_w*0.25) (monitor_h*0.55)
-  float = on
-  match:class = ^(com.network.manager)$
-}
-
-windowrule {
-  name = windowrule-49
-  workspace = special:nyx
-  match:class = ^([Vv]esktop|[Dd]iscord|[Ss]potify)$
-}
-
-
-# viewer tags
-windowrule {
-  name = windowrule-50
-  tag = +viewer
-  match:class = ^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
-}
-
-windowrule {
-  name = windowrule-51
-  tag = +viewer
-  match:class = ^(evince)$ # document viewer
-}
-
-windowrule {
-  name = windowrule-52
-  tag = +viewer
-  match:class = ^(eog|org.gnome.Loupe)$ # image viewer
-}
-
-
-# Some special override rules
-windowrule {
-  name = windowrule-53
-  no_blur = on
-  opacity = 1.0
-  match:tag = multimedia_video*
-}
-
- 
-
-
-# POSITION
-# windowrule = center,floating:1 # warning, it cause even the menu to float and center.
-windowrule {
-  name = windowrule-54
-  center = on
-  float = on
-  size = (monitor_w*0.65) (monitor_h*0.9)
-  match:tag = HyprFlux_Cheat*
-}
-
-windowrule {
-  name = windowrule-55
-  center = on
-  float = on
-  match:class = ([Tt]hunar)
-  match:title = negative:(.*[Tt]hunar.*)
-}
-
-windowrule {
-  name = windowrule-56
-  center = on
-  float = on
-  match:tag = HyprFlux-Settings*
-}
-
-windowrule {
-  name = windowrule-57
-  center = on
-  match:title = ^(Keybindings)$
-}
-
-windowrule {
-  name = windowrule-58
-  center = on
-  size = (monitor_w*0.6) (monitor_h*0.7)
-  match:class = ^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
-}
-
-windowrule {
-  name = windowrule-59
-  move = ((monitor_w*0.61)) ((monitor_h*0.07))
-  float = on
-  size = (monitor_w*0.38) (monitor_h*0.38)
-  pin = on
-  keep_aspect_ratio = on
-  match:title = ^(Picture-in-Picture)$
-}
-
-#windowrule = move 72% 7%,title:^(Firefox)$ 
-
-# windowrule to avoid idle for fullscreen apps
-#windowrule = idleinhibit fullscreen, class:^(*)$
-#windowrule = idleinhibit fullscreen, title:^(*)$
-windowrule {
-  name = windowrule-60
-  idle_inhibit = fullscreen
-  match:fullscreen = 1
-}
-
-
-# windowrule move to workspace
-windowrule {
-  name = windowrule-61
-  workspace = 1
-  match:tag = projects*
-}
-
-windowrule {
-  name = windowrule-62
-  workspace = 1
-  match:tag = email*
-}
-
-windowrule {
-  name = windowrule-63
-  workspace = 2
-  match:tag = browser*
-}
-
-windowrule {
-  name = windowrule-64
-  workspace = 3
-  match:class = ^([Tt]hunar)$
-}
-
-windowrule {
-  name = windowrule-65
-  workspace = 4
-  match:tag = im*
-}
-
-windowrule {
-  name = windowrule-66
-  workspace = 5
-  match:tag = gamestore*
-}
-
-windowrule {
-  name = windowrule-67
-  workspace = 8
-  no_blur = on
-  fullscreen = on
-  match:tag = games*
-}
-
-windowrule {
-  name = windowrule-68
-  workspace = 1
-  match:class = ^(kitty)$
-  match:title = ^(tmuxifier)$
-}
-
-windowrule {
-  name = windowrule-69
-  workspace = 9
-  match:class = ^(virt-viewer)$
-}
-
-windowrule {
-  name = windowrule-70
-  workspace = 10
-  match:class = ^([Oo]bsidian)$
-}
-
-
-# windowrule move to workspace (silent)
-windowrule {
-  name = windowrule-71
-  workspace = 4 silent
-  match:tag = screenshare*
-}
-
-windowrule {
-  name = windowrule-72
-  workspace = 9 silent
-  match:class = ^(virt-manager)$
-}
-
-windowrule {
-  name = windowrule-73
-  workspace = 9 silent
-  match:class = ^(.virt-manager-wrapped)$
-}
-
-windowrule {
-  name = windowrule-74
-  workspace = 9 silent
-  match:tag = multimedia*
-}
-
-
-# FLOAT
-windowrule {
-  name = windowrule-75
-  float = on
-  opacity = 0.9 0.7
-  size = (monitor_w*0.7) (monitor_h*0.7)
-  match:tag = wallpaper*
-}
-
-windowrule {
-  name = windowrule-76
-  float = on
-  opacity = 0.8 0.7
-  size = (monitor_w*0.7) (monitor_h*0.7)
-  match:tag = settings*
-}
-
-windowrule {
-  name = windowrule-77
-  float = on
-  match:tag = viewer*
-}
-
-windowrule {
-  name = windowrule-78
-  float = on
-  match:class = ([Zz]oom|onedriver|onedriver-launcher)$
-}
-
-windowrule {
-  name = windowrule-79
-  float = on
-  match:class = (org.gnome.Calculator)
-  match:title = (Calculator)
-}
-
-windowrule {
-  name = windowrule-80
-  float = on
-  match:class = ^(mpv|com.github.rafostar.Clapper)$
-}
-
-windowrule {
-  name = windowrule-81
-  float = on
-  match:class = ^([Qq]alculate-gtk)$
-}
-
-#windowrule = float, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
-#windowrule = float, title:^(Firefox)$
-windowrule {
-  name = windowrule-82
-  float = on
-  match:class = ^(fdm|freedownloadmanager)$
-}
-
-windowrule {
-  name = windowrule-83
-  float = on
-  match:class = ^(proton-authenticator)$
-}
-
-windowrule {
-  name = windowrule-84
-  float = on
-  match:class = ^([Ww]indscribe)$
-}
-
-
-
-# windowrule - ######### float popups and dialogue #######
-windowrule {
-  name = windowrule-85
-  float = on
-  center = on
-  match:title = ^(Authentication Required)$
-}
-
-windowrule {
-  name = windowrule-86
-  float = on
-  match:class = (codium|codium-url-handler|VSCodium)
-  match:title = negative:(.*codium.*|.*VSCodium.*)
-}
-
-windowrule {
-  name = windowrule-87
-  float = on
-  match:class = ^(com.heroicgameslauncher.hgl)$
-  match:title = negative:(Heroic Games Launcher)
-}
-
-windowrule {
-  name = windowrule-88
-  float = on
-  match:class = ^([Ss]team)$
-  match:title = negative:^([Ss]team)$
-}
-
-
-windowrule {
-  name = windowrule-89
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  center = on
-  match:title = ^(Add Folder to Workspace)$
-}
-
-
-windowrule {
-  name = windowrule-90
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  center = on
-  match:title = ^(Save As)$
-}
-
-
-windowrule {
-  name = windowrule-91
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  match:initial_title = (Open Files)
-}
-
-
-windowrule {
-  name = windowrule-92
-  float = on
-  center = on
-  size = (monitor_w*0.16) (monitor_h*0.12)
-  match:title = ^(SDDM Background)$ #HyprFlux YAD for setting SDDM background
-}
-
-# END of float popups and dialogue #######
-
-# OPACITY
-# windowrule = opacity 0.9 0.7, tag:browser*
-# windowrule = opacity 0.9 0.8, tag:projects*
-# windowrule = opacity 0.94 0.86, tag:im*
-# windowrule = opacity 0.94 0.86, tag:multimedia*
-# windowrule = opacity 0.9 0.8, tag:file-manager*
-windowrule {
-  name = windowrule-93
-  opacity = 0.8 0.7
-  match:tag = terminal*
-}
-
-# windowrule = opacity 0.82 0.75, tag:viewer*
-windowrule {
-  name = windowrule-94
-  opacity = 0.8 0.7
-  match:class = ^(gedit|org.gnome.TextEditor|mousepad)$
-}
-
-windowrule {
-  name = windowrule-95
-  opacity = 0.9 0.8
-  match:class = ^(deluge)$
-}
-
-windowrule {
-  name = windowrule-96
-  opacity = 0.9 0.8
-  match:class = ^(seahorse)$ # gnome-keyring gui
-}
-
-# windowrule = opacity 0.95 0.75, title:^(Picture-in-Picture)$
-
-# SIZE
-
-#windowrule = size 25% 25%, title:^(Firefox)$ 
-
-# PINNING
-#windowrule = pin,title:^(Firefox)$ 
-
-# windowrule - extras
-
-# BLUR & FULLSCREEN
-
-#windowrule = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
-#windowrule = bordercolor rgb(282737) rgb(1E1D2D), floating:1
-#windowrule = opacity 0.8 0.8, pinned:1
-
-
-
-# LAYER RULES
-layerrule {
-  name = layerrule-1
-  blur = on
-  ignore_alpha = 0
-  match:namespace = rofi
-}
-
-layerrule {
-  name = layerrule-2
-  blur = on
-  ignore_alpha = 0
-  match:namespace = notifications
-}
-
-layerrule {
-  name = layerrule-3
-  blur = on
-  ignore_alpha = 0.5
-  match:namespace = quickshell:overview
-}
-
-
-#layerrule = ignorealpha 0.5, tag:notif*
-
-#layerrule = ignorezero, class:^([Rr]ofi)$
-#layerrule = blur, class:^([Rr]ofi)$
-#layerrule = unset,class:^([Rr]ofi)$
-#layerrule = ignorezero, <rofi>
-
-#layerrule = ignorezero, overview
-#layerrule = blur, overview
--- a/dotfiles/.config/hypr/UserConfigs/WindowRules.conf
+++ b/dotfiles/.config/hypr/UserConfigs/WindowRules.conf
@@ -1,666 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# For window rules and layerrules
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
-# NOTES: This is only for Hyprland > 0.48
-
-# note for ja: This should NOT be implemented on Debian and Ubuntu
-
-# windowrule - tags - add apps under appropriate tag to use the same settings
-# browser tags
-windowrule {
-  name = windowrule-1
-  tag = +browser
-  match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr|[Ff]irefox-bin)$
-}
-
-windowrule {
-  name = rustdesk
-  tag = +rustdesk
-  match:class = ^(rustdesk)$, xwayland
-}
-
-windowrule {
-  name = windowrule-2
-  tag = +browser
-  match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
-}
-
-windowrule {
-  name = windowrule-3
-  tag = +browser
-  match:class = ^(chrome-.+-Default)$ # Chrome PWAs
-}
-
-# windowrule = tag +browser, class:^([Cc]hromium)$
-windowrule {
-  name = windowrule-4
-  tag = +browser
-  match:class = ^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable))$
-}
-
-windowrule {
-  name = windowrule-5
-  tag = +browser
-  match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$
-}
-
-windowrule {
-  name = windowrule-6
-  tag = +browser
-  match:class = ^([Tt]horium-browser|[Cc]achy-browser)$
-}
-
-windowrule {
-  name = windowrule-7
-  tag = +browser
-  match:class = ^(zen-alpha|zen)$
-}
-
-
-# notif tags
-windowrule {
-  name = windowrule-8
-  tag = +notif
-  match:class = ^(swaync-control-center|swaync-notification-window|swaync-client|class)$
-}
-
-
-# HyprFlux settings tag
-windowrule {
-  name = windowrule-9
-  tag = +HyprFlux_Cheat
-  match:title = ^(HyprFlux Quick Cheat Sheet)$
-}
-
-windowrule {
-  name = windowrule-10
-  tag = +HyprFlux_Settings
-  match:title = ^(HyprFlux Settings)$
-}
-
-windowrule {
-  name = windowrule-11
-  tag = +HyprFlux-Settings
-  match:class = ^(nwg-displays|nwg-look)$
-}
-
-
-# terminal tags
-windowrule {
-  name = windowrule-12
-  tag = +terminal
-  match:class = ^(Alacritty|kitty|kitty-dropterm)$
-}
-
-
-# email tags
-windowrule {
-  name = windowrule-13
-  tag = +email
-  match:class = ^([Tt]hunderbird|org.gnome.Evolution)$
-}
-
-windowrule {
-  name = windowrule-14
-  tag = +email
-  match:class = ^(eu.betterbird.Betterbird)$
-}
-
-
-# project tags
-windowrule {
-  name = windowrule-15
-  tag = +projects
-  match:class = ^(codium|codium-url-handler|VSCodium)$
-}
-
-windowrule {
-  name = windowrule-16
-  tag = +projects
-  match:class = ^(VSCode|code-url-handler)$
-}
-
-windowrule {
-  name = windowrule-17
-  tag = +projects
-  match:class = ^(jetbrains-.+)$ # JetBrains IDEs
-}
-
-
-# screenshare tags
-windowrule {
-  name = windowrule-18
-  tag = +screenshare
-  match:class = ^(com.obsproject.Studio)$
-}
-
-
-# IM tags
-# windowrule = tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
-windowrule {
-  name = windowrule-19
-  tag = +im
-  center = on
-  float = on
-  size = (monitor_w*0.6) (monitor_h*0.7)
-  match:class = ^([Ff]erdium)$
-}
-
-windowrule {
-  name = windowrule-20
-  tag = +im
-  match:class = ^([Ww]hatsapp-for-linux)$
-}
-
-windowrule {
-  name = windowrule-21
-  tag = +im
-  match:class = ^(ZapZap|com.rtosta.zapzap)$
-}
-
-windowrule {
-  name = windowrule-22
-  tag = +im
-  match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
-}
-
-windowrule {
-  name = windowrule-23
-  tag = +im
-  match:class = ^(teams-for-linux)$
-}
-
-windowrule {
-  name = windowrule-24
-  tag = +im
-  match:class = ^(im.riot.Riot|Element)$ # Element Matrix client
-}
-
-
-# game tags
-windowrule {
-  name = windowrule-25
-  tag = +games
-  match:class = ^(gamescope)$
-}
-
-windowrule {
-  name = windowrule-26
-  tag = +games
-  match:class = ^(steam_app_\d+)$
-}
-
-
-# gamestore tags
-windowrule {
-  name = windowrule-27
-  tag = +gamestore
-  match:class = ^([Ss]team)$
-}
-
-windowrule {
-  name = windowrule-28
-  tag = +gamestore
-  match:title = ^([Ll]utris)$
-}
-
-windowrule {
-  name = windowrule-29
-  tag = +gamestore
-  match:class = ^(com.heroicgameslauncher.hgl)$
-}
-
-
-# file-manager tags
-windowrule {
-  name = windowrule-30
-  tag = +file-manager
-  match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
-}
-
-windowrule {
-  name = windowrule-31
-  tag = +file-manager
-  match:class = ^(app.drey.Warp)$
-}
-
-
-# wallpaper tags
-windowrule {
-  name = windowrule-32
-  tag = +wallpaper
-  match:class = ^([Ww]aytrogen)$
-}
-
-
-# multimedia tags
-windowrule {
-  name = windowrule-33
-  tag = +multimedia
-  match:class = ^([Aa]udacious)$
-}
-
-
-# multimedia-video tags
-windowrule {
-  name = windowrule-34
-  tag = +multimedia_video
-  match:class = ^([Mm]pv|vlc)$
-}
-
-
-# settings tags
-windowrule {
-  name = windowrule-35
-  tag = +settings
-  center = on
-  match:title = ^(ROG Control)$
-}
-
-windowrule {
-  name = windowrule-36
-  tag = +settings
-  match:class = ^(wihotspot(-gui)?)$ # wifi hotspot
-}
-
-windowrule {
-  name = windowrule-37
-  tag = +settings
-  match:class = ^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
-}
-
-windowrule {
-  name = windowrule-38
-  tag = +settings
-  match:class = ^(gnome-disks|wihotspot(-gui)?)$
-}
-
-windowrule {
-  name = windowrule-39
-  tag = +settings
-  match:title = (Kvantum Manager)
-}
-
-windowrule {
-  name = windowrule-40
-  tag = +settings
-  match:class = ^(file-roller|org.gnome.FileRoller)$ # archive manager
-}
-
-windowrule {
-  name = windowrule-41
-  tag = +settings
-  match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$
-}
-
-windowrule {
-  name = windowrule-42
-  tag = +settings
-  center = on
-  match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
-}
-
-windowrule {
-  name = windowrule-43
-  tag = +settings
-  match:class = ^(qt5ct|qt6ct|[Yy]ad)$
-}
-
-windowrule {
-  name = windowrule-44
-  tag = +settings
-  match:class = (xdg-desktop-portal-gtk)
-}
-
-windowrule {
-  name = windowrule-45
-  tag = +settings
-  match:class = ^(org.kde.polkit-kde-authentication-agent-1)$
-}
-
-windowrule {
-  name = windowrule-46
-  tag = +settings
-  match:class = ^([Rr]ofi)$
-}
-
-# Custom rule
-windowrule {
-  name = windowrule-47
-  tile = on
-  match:class = ^([Cc]hromium)$
-}
-
-windowrule {
-  name = windowrule-48
-  size = (monitor_w*0.25) (monitor_h*0.55)
-  float = on
-  match:class = ^(com.network.manager)$
-}
-
-windowrule {
-  name = windowrule-49
-  workspace = special:nyx
-  match:class = ^([Vv]esktop|[Dd]iscord|[Ss]potify)$
-}
-
-windowrule {
-  name = windowrule-255
-  size = (monitor_w*0.75) (monitor_h*0.80)
-  float = on
-  match:class = ^([Bb]itwarden)$
-}
-
-# viewer tags
-windowrule {
-  name = windowrule-50
-  tag = +viewer
-  match:class = ^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
-}
-
-windowrule {
-  name = windowrule-51
-  tag = +viewer
-  match:class = ^(evince)$ # document viewer
-}
-
-windowrule {
-  name = windowrule-52
-  tag = +viewer
-  match:class = ^(eog|org.gnome.Loupe)$ # image viewer
-}
-
-
-# Some special override rules
-windowrule {
-  name = windowrule-53
-  no_blur = on
-  opacity = 1.0
-  match:tag = multimedia_video*
-}
-
- 
-
-
-# POSITION
-# windowrule = center,floating:1 # warning, it cause even the menu to float and center.
-windowrule {
-  name = windowrule-54
-  center = on
-  float = on
-  size = (monitor_w*0.65) (monitor_h*0.9)
-  match:tag = HyprFlux_Cheat*
-}
-
-windowrule {
-  name = windowrule-55
-  center = on
-  float = on
-  match:class = ([Tt]hunar)
-  match:title = negative:(.*[Tt]hunar.*)
-}
-
-windowrule {
-  name = windowrule-56
-  center = on
-  float = on
-  match:tag = HyprFlux-Settings*
-}
-
-windowrule {
-  name = windowrule-57
-  center = on
-  match:title = ^(Keybindings)$
-}
-
-windowrule {
-  name = windowrule-58
-  center = on
-  size = (monitor_w*0.6) (monitor_h*0.7)
-  match:class = ^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
-}
-
-windowrule {
-  name = windowrule-59
-  move = ((monitor_w*0.61)) ((monitor_h*0.07))
-  float = on
-  size = (monitor_w*0.38) (monitor_h*0.38)
-  pin = on
-  keep_aspect_ratio = on
-  match:title = ^(Picture-in-Picture)$
-}
-
-#windowrule = move 72% 7%,title:^(Firefox)$ 
-
-# windowrule to avoid idle for fullscreen apps
-#windowrule = idleinhibit fullscreen, class:^(*)$
-#windowrule = idleinhibit fullscreen, title:^(*)$
-windowrule {
-  name = windowrule-60
-  idle_inhibit = fullscreen
-  match:fullscreen = 1
-}
-
-# Discord to workspace 3
-windowrule = match:class ^([Vv]esktop|[Dd]iscord|[Ss]potify|[Pp]lexamp)$, workspace 3
-windowrule = match:class ^([Pp]lexamp), size 20% 20%
-
-# FLOAT
-windowrule {
-  name = windowrule-75
-  float = on
-  opacity = 0.9 0.7
-  size = (monitor_w*0.7) (monitor_h*0.7)
-  match:tag = wallpaper*
-}
-
-windowrule {
-  name = windowrule-76
-  float = on
-  opacity = 0.8 0.7
-  size = (monitor_w*0.7) (monitor_h*0.7)
-  match:tag = settings*
-}
-
-windowrule {
-  name = windowrule-77
-  float = on
-  match:tag = viewer*
-}
-
-windowrule {
-  name = windowrule-78
-  float = on
-  match:class = ([Zz]oom|onedriver|onedriver-launcher)$
-}
-
-windowrule {
-  name = windowrule-79
-  float = on
-  match:class = (org.gnome.Calculator)
-  match:title = (Calculator)
-}
-
-windowrule {
-  name = windowrule-80
-  float = on
-  match:class = ^(mpv|com.github.rafostar.Clapper)$
-}
-
-windowrule {
-  name = windowrule-81
-  float = on
-  match:class = ^([Qq]alculate-gtk)$
-}
-
-#windowrule = float, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
-#windowrule = float, title:^(Firefox)$
-windowrule {
-  name = windowrule-82
-  float = on
-  match:class = ^(fdm|freedownloadmanager)$
-}
-
-windowrule {
-  name = windowrule-83
-  float = on
-  match:class = ^(proton-authenticator)$
-}
-
-windowrule {
-  name = windowrule-84
-  float = on
-  match:class = ^([Ww]indscribe)$
-}
-
-
-
-# windowrule - ######### float popups and dialogue #######
-windowrule {
-  name = windowrule-85
-  float = on
-  center = on
-  match:title = ^(Authentication Required)$
-}
-
-windowrule {
-  name = windowrule-86
-  float = on
-  match:class = (codium|codium-url-handler|VSCodium)
-  match:title = negative:(.*codium.*|.*VSCodium.*)
-}
-
-windowrule {
-  name = windowrule-87
-  float = on
-  match:class = ^(com.heroicgameslauncher.hgl)$
-  match:title = negative:(Heroic Games Launcher)
-}
-
-windowrule {
-  name = windowrule-88
-  float = on
-  match:class = ^([Ss]team)$
-  match:title = negative:^([Ss]team)$
-}
-
-
-windowrule {
-  name = windowrule-89
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  center = on
-  match:title = ^(Add Folder to Workspace)$
-}
-
-
-windowrule {
-  name = windowrule-90
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  center = on
-  match:title = ^(Save As)$
-}
-
-
-windowrule {
-  name = windowrule-91
-  float = on
-  size = (monitor_w*0.7) (monitor_h*0.6)
-  match:initial_title = (Open Files)
-}
-
-
-windowrule {
-  name = windowrule-92
-  float = on
-  center = on
-  size = (monitor_w*0.16) (monitor_h*0.12)
-  match:title = ^(SDDM Background)$ #HyprFlux YAD for setting SDDM background
-}
-
-# END of float popups and dialogue #######
-
-# OPACITY
-# windowrule = opacity 0.9 0.7, tag:browser*
-# windowrule = opacity 0.9 0.8, tag:projects*
-# windowrule = opacity 0.94 0.86, tag:im*
-# windowrule = opacity 0.94 0.86, tag:multimedia*
-# windowrule = opacity 0.9 0.8, tag:file-manager*
-windowrule {
-  name = windowrule-93
-  opacity = 0.8 0.7
-  match:tag = terminal*
-}
-
-# windowrule = opacity 0.82 0.75, tag:viewer*
-windowrule {
-  name = windowrule-94
-  opacity = 0.8 0.7
-  match:class = ^(gedit|org.gnome.TextEditor|mousepad)$
-}
-
-windowrule {
-  name = windowrule-95
-  opacity = 0.9 0.8
-  match:class = ^(deluge)$
-}
-
-windowrule {
-  name = windowrule-96
-  opacity = 0.9 0.8
-  match:class = ^(seahorse)$ # gnome-keyring gui
-}
-
-# windowrule = opacity 0.95 0.75, title:^(Picture-in-Picture)$
-
-# SIZE
-
-#windowrule = size 25% 25%, title:^(Firefox)$ 
-
-# PINNING
-#windowrule = pin,title:^(Firefox)$ 
-
-# windowrule - extras
-
-# BLUR & FULLSCREEN
-
-#windowrule = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
-#windowrule = bordercolor rgb(282737) rgb(1E1D2D), floating:1
-#windowrule = opacity 0.8 0.8, pinned:1
-
-
-
-# LAYER RULES
-layerrule {
-  name = layerrule-1
-  blur = on
-  ignore_alpha = 0
-  match:namespace = rofi
-}
-
-layerrule {
-  name = layerrule-2
-  blur = on
-  ignore_alpha = 0
-  match:namespace = notifications
-}
-
-layerrule {
-  name = layerrule-3
-  blur = on
-  ignore_alpha = 0.5
-  match:namespace = quickshell:overview
-}
-
-
-#layerrule = ignorealpha 0.5, tag:notif*
-
-#layerrule = ignorezero, class:^([Rr]ofi)$
-#layerrule = blur, class:^([Rr]ofi)$
-#layerrule = unset,class:^([Rr]ofi)$
-#layerrule = ignorezero, <rofi>
-
-#layerrule = ignorezero, overview
-#layerrule = blur, overview
--- a/dotfiles/.config/hypr/UserConfigs/monitors.conf
+++ b/dotfiles/.config/hypr/UserConfigs/monitors.conf
@@ -1,12 +0,0 @@
-# Generated with hyprdynamicmonitors freeze.
-# This is a template that you can edit, it is just a starter that pulled your current monitor setup,
-# adjust as needed.
-# You can use templates here etc, see https://github.com/fiffeek/hyprdynamicmonitors/blob/main/examples/basic/hyprconfigs/template.go.tmpl.
-# Monitors are given arbitrary tags (the "monitor" prefix and the ID coming from hyprland).
-# If you are using tui to edit, leave this at the end of your file (the last monitor config applies)
-# and leave the markers.
-# <<<<< TUI AUTO START
-monitor=desc:LG Electronics LG ULTRAWIDE 0x0002E68A,2560x1080@60.00000,1920x-740,1.00000000,transform,3,vrr,0
-monitor=desc:HP Inc. HP 524pf VNG447017D,1920x1080@100.00000,-1920x0,1.00000000,transform,0,vrr,0
-monitor=desc:Acer Technologies VG240Y S 0x126191DE,1920x1080@165.00301,0x0,1.00000000,transform,0,vrr,0,bitdepth,10,cm,wide
-# <<<<< TUI AUTO END
--- a/dotfiles/.config/hypr/UserConfigs/workspaces.conf
+++ b/dotfiles/.config/hypr/UserConfigs/workspaces.conf
@@ -1,30 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# NOTE: This will be overwritten by NWG-Displays 
-# once you use and click apply. 
-#
-# *********************************************************** #
-
-# You can set workspace rules to achieve workspace-specific behaviors. 
-# For instance, you can define a workspace where all windows are drawn without borders or gaps.
-
-# https://wiki.hyprland.org/Configuring/Workspace-Rules/
-
-# Assigning workspace to a certain monitor. Below are just examples
-workspace = 1, monitor:DP-2, default=true
-workspace = 2, monitor:DP-1, default=true
-workspace = 3, monitor:HDMI-A-1, default=true
-# workspace = 4, monitor:eDP-1
-# workspace = 5, monitor:DP-2
-# workspace = 6, monitor:DP-2
-# workspace = 7, monitor:DP-2
-# workspace = 8, monitor:DP-2
-
-
-# example rules (from wiki)
-# workspace = 3, rounding:false, decorate:false
-# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1
-# workspace = 8,bordersize:8
-# workspace = name:Hello, monitor:DP-1, default:true
-# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
-# workspace = 5, on-created-empty:[float] firefox
-# workspace = special:scratchpad, on-created-empty:foot
--- a/dotfiles/.config/hypr/UserScripts/00-Readme
+++ b/dotfiles/.config/hypr/UserScripts/00-Readme
@@ -1,3 +1,3 @@
 # Place your new scripts here. 
 # If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this directory, and edit. 
-# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs directory if any script is linked to it
+# Make sure to update as well the keybinds in ~/.config/hypr/input/keybinds.lua if any script is linked to it
--- a/dotfiles/.config/hypr/animations/00-default.conf
+++ b/dotfiles/.config/hypr/animations/00-default.conf
@@ -1,25 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-animations {
-  enabled = yes
-
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
-  bezier = overshot, 0.05, 0.9, 0.1, 1.05
-  bezier = smoothOut, 0.5, 0, 0.99, 0.99
-  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
-  
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 5, winIn, slide
-  animation = windowsOut, 1, 3, smoothOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 3, smoothOut
-  animation = workspaces, 1, 5, overshot
-  
-  # animations for -git or version >0.42.0
-  animation = workspacesIn, 1, 5, winIn, slide
-  animation = workspacesOut, 1, 5, winOut, slide
-}
--- a/dotfiles/.config/hypr/animations/01-default
+++ b/dotfiles/.config/hypr/animations/01-default
@@ -1,26 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# old animations
-
-animations {
-  enabled = yes
-
-  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-  bezier = linear, 0.0, 0.0, 1.0, 1.0
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = slow, 0, 0.85, 0.3, 1
-  bezier = overshot, 0.7, 0.6, 0.1, 1.1
-  bezier = bounce, 1.1, 1.6, 0.1, 0.85
-  bezier = sligshot, 1, -1, 0.15, 1.25
-  bezier = nice, 0, 6.9, 0.5, -4.20
-  
-  animation = windowsIn, 1, 5, slow, popin
-  animation = windowsOut, 1, 5, winOut, popin
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 10, linear
-  animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 5, overshot
-  animation = workspaces, 1, 5, wind
-  animation = windows, 1, 5, bounce, popin
-}
--- a/dotfiles/.config/hypr/animations/03-
+++ b/dotfiles/.config/hypr/animations/03-
@@ -1,4 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-animations {
-  enabled = no
-}
--- a/dotfiles/.config/hypr/animations/END-4.conf
+++ b/dotfiles/.config/hypr/animations/END-4.conf
@@ -1,39 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "End-4"
-# credit https://github.com/end-4/dots-hyprland
-
-animations {
-    enabled = true
-    # Animation curves
-    
-    bezier = linear, 0, 0, 1, 1
-    bezier = md3_standard, 0.2, 0, 0, 1
-    bezier = md3_decel, 0.05, 0.7, 0.1, 1
-    bezier = md3_accel, 0.3, 0, 0.8, 0.15
-    bezier = overshot, 0.05, 0.9, 0.1, 1.1
-    bezier = crazyshot, 0.1, 1.5, 0.76, 0.92 
-    bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0
-    bezier = menu_decel, 0.1, 1, 0, 1
-    bezier = menu_accel, 0.38, 0.04, 1, 0.07
-    bezier = easeInOutCirc, 0.85, 0, 0.15, 1
-    bezier = easeOutCirc, 0, 0.55, 0.45, 1
-    bezier = easeOutExpo, 0.16, 1, 0.3, 1
-    bezier = softAcDecel, 0.26, 0.26, 0.15, 1
-    bezier = md2, 0.4, 0, 0.2, 1 # use with .2s duration
-    # Animation configs
-    animation = windows, 1, 3, md3_decel, popin 60%
-    animation = windowsIn, 1, 3, md3_decel, popin 60%
-    animation = windowsOut, 1, 3, md3_accel, popin 60%
-    animation = border, 1, 10, default
-    animation = fade, 1, 3, md3_decel
-    # animation = layers, 1, 2, md3_decel, slide
-    animation = layersIn, 1, 3, menu_decel, slide
-    animation = layersOut, 1, 1.6, menu_accel
-    animation = fadeLayersIn, 1, 2, menu_decel
-    animation = fadeLayersOut, 1, 4.5, menu_accel
-    animation = workspaces, 1, 7, menu_decel, slide
-    # animation = workspaces, 1, 2.5, softAcDecel, slide
-    # animation = workspaces, 1, 7, menu_decel, slidefade 15%
-    # animation = specialWorkspace, 1, 3, md3_decel, slidefadevert 15%
-    animation = specialWorkspace, 1, 3, md3_decel, slidevert
-}
--- a/dotfiles/.config/hypr/animations/HYDE
+++ b/dotfiles/.config/hypr/animations/HYDE
@@ -1,33 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Vertical"
-# credit https://github.com/prasanthrangan/hyprdots
-
-animations {
-  	enabled = yes
-  	
-    bezier = fluent_decel, 0, 0.2, 0.4, 1
-    bezier = easeOutCirc, 0, 0.55, 0.45, 1
-    bezier = easeOutCubic, 0.33, 1, 0.68, 1
-    bezier = easeinoutsine, 0.37, 0, 0.63, 1
-    
-    # Windows
-    animation = windowsIn, 1, 1.5, easeinoutsine, popin 60% # window open
-    animation = windowsOut, 1, 1.5, easeOutCubic, popin 60% # window close.
-    animation = windowsMove, 1, 1.5, easeinoutsine, slide # everything in between, moving, dragging, resizing.
-
-    # Fading
-    animation = fade, 1, 2.5, fluent_decel
-
-	animation = fadeLayersIn, 0
-    animation = border, 0
-
-
-	# Layers
-	animation = layers, 1, 1.5, easeinoutsine, popin
-	
-    # Workspaces
-    #animation = workspaces, 1, 3, fluent_decel, slidefade 30% # styles: slide, slidevert, fade, slidefade, slidefadevert
-    animation = workspaces, 1, 3, fluent_decel, slidefadevert 30% # styles: slide, slidevert, fade, slidefade, slidefadevert
-
-	animation = specialWorkspace, 1, 2, fluent_decel, slidefade 10%
-}
--- a/dotfiles/.config/hypr/animations/HYDE
+++ b/dotfiles/.config/hypr/animations/HYDE
@@ -1,20 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Default"
-# credit https://github.com/prasanthrangan/hyprdots
-
-animations {
-    enabled = yes
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, once
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-    animation = specialWorkspace, 1, 5, wind, slidevert
-}
--- a/dotfiles/.config/hypr/animations/HYDE
+++ b/dotfiles/.config/hypr/animations/HYDE
@@ -1,26 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Minimal-1"
-# credit https://github.com/prasanthrangan/hyprdots- 
-
-animations {
-  enabled = true
-
-  # █▄▄ █▀▀ ▀█ █ █▀▀ █▀█   █▀▀ █░█ █▀█ █░█ █▀▀
-  # █▄█ ██▄ █▄ █ ██▄ █▀▄   █▄▄ █▄█ █▀▄ ▀▄▀ ██▄
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
-
-  
-  #▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
-  #█▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 6, winIn, slide
-  animation = windowsOut, 1, 5, winOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 30, liner, once
-  animation = fade, 1, 10, default
-  animation = workspaces, 1, 5, wind
-}
--- a/dotfiles/.config/hypr/animations/HYDE
+++ b/dotfiles/.config/hypr/animations/HYDE
@@ -1,15 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Minimal-2"
-# credit https://github.com/prasanthrangan/hyprdots
-
-animations {
-    enabled = yes
-
-    bezier = quart, 0.25, 1, 0.5, 1
-
-    animation = windows, 1, 6, quart, slide
-    animation = border, 1, 6, quart
-    animation = borderangle, 1, 6, quart
-    animation = fade, 1, 6, quart
-    animation = workspaces, 1, 6, quart
-}
--- a/dotfiles/.config/hypr/animations/HYDE
+++ b/dotfiles/.config/hypr/animations/HYDE
@@ -1,40 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Optimized"
-# credit https://github.com/prasanthrangan/hyprdots
-
-animations {
-    enabled = true
-    bezier = wind, 0.05, 0.85, 0.03, 0.97
-    bezier = winIn, 0.07, 0.88, 0.04, 0.99
-    bezier = winOut, 0.20, -0.15, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    bezier = md3_standard, 0.12, 0, 0, 1
-    bezier = md3_decel, 0.05, 0.80, 0.10, 0.97
-    bezier = md3_accel, 0.20, 0, 0.80, 0.08
-    bezier = overshot, 0.05, 0.85, 0.07, 1.04
-    bezier = crazyshot, 0.1, 1.22, 0.68, 0.98
-    bezier = hyprnostretch, 0.05, 0.82, 0.03, 0.94
-    bezier = menu_decel, 0.05, 0.82, 0, 1
-    bezier = menu_accel, 0.20, 0, 0.82, 0.10
-    bezier = easeInOutCirc, 0.75, 0, 0.15, 1
-    bezier = easeOutCirc, 0, 0.48, 0.38, 1
-    bezier = easeOutExpo, 0.10, 0.94, 0.23, 0.98
-    bezier = softAcDecel, 0.20, 0.20, 0.15, 1
-    bezier = md2, 0.30, 0, 0.15, 1
-    
-    bezier = OutBack, 0.28, 1.40, 0.58, 1
-    bezier = easeInOutCirc, 0.78, 0, 0.15, 1
-
-    animation = border, 1, 1.6, liner
-    animation = borderangle, 1, 82, liner, once
-    animation = windowsIn, 1, 3.2, winIn, slide
-    animation = windowsOut, 1, 2.8, easeOutCirc
-    animation = windowsMove, 1, 3.0, wind, slide
-    animation = fade, 1, 1.8, md3_decel
-    animation = layersIn, 1, 1.8, menu_decel, slide
-    animation = layersOut, 1, 1.5, menu_accel
-    animation = fadeLayersIn, 1, 1.6, menu_decel
-    animation = fadeLayersOut, 1, 1.8, menu_accel
-    animation = workspaces, 1, 4.0, menu_decel, slide
-    animation = specialWorkspace, 1, 2.3, md3_decel, slidefadevert 15%
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,14 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Classic"
-# credit https://github.com/mylinuxforwork/dotfiles
-
-animations {
-    enabled = true
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,19 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Dynamic"
-# credit https://github.com/mylinuxforwork/dotfiles 
-
-animations {
-    enabled = true
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, loop
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,23 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Fast"
-# credit https://github.com/mylinuxforwork/dotfiles
-
-animations {
-    enabled = true
-    bezier = linear, 0, 0, 1, 1
-    bezier = md3_standard, 0.2, 0, 0, 1
-    bezier = md3_decel, 0.05, 0.7, 0.1, 1
-    bezier = md3_accel, 0.3, 0, 0.8, 0.15
-    bezier = overshot, 0.05, 0.9, 0.1, 1.1
-    bezier = crazyshot, 0.1, 1.5, 0.76, 0.92 
-    bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0
-    bezier = fluent_decel, 0.1, 1, 0, 1
-    bezier = easeInOutCirc, 0.85, 0, 0.15, 1
-    bezier = easeOutCirc, 0, 0.55, 0.45, 1
-    bezier = easeOutExpo, 0.16, 1, 0.3, 1
-    animation = windows, 1, 3, md3_decel, popin 60%
-    animation = border, 1, 10, default
-    animation = fade, 1, 2.5, md3_decel
-    animation = workspaces, 1, 3.5, easeOutExpo, slide
-    animation = specialWorkspace, 1, 3, md3_decel, slidevert
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,19 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "High"
-# credit https://github.com/mylinuxforwork/dotfiles
-
-animations {
-    enabled = true
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, once
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,19 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Moving"
-# credit https://github.com/mylinuxforwork/dotfiles
-
-
-animations {
-    enabled = true
-    bezier = overshot, 0.05, 0.9, 0.1, 1.05
-    bezier = smoothOut, 0.5, 0, 0.99, 0.99
-    bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
-    animation = windows, 1, 5, overshot, slide
-    animation = windowsOut, 1, 3, smoothOut
-    animation = windowsIn, 1, 3, smoothOut
-    animation = windowsMove, 1, 4, smoothIn, slide
-    animation = border, 1, 5, default
-    animation = fade, 1, 5, smoothIn
-    animation = fadeDim, 1, 5, smoothIn
-    animation = workspaces, 1, 6, default
-}
--- a/dotfiles/.config/hypr/animations/ML4W
+++ b/dotfiles/.config/hypr/animations/ML4W
@@ -1,14 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Standard"
-# credit https://github.com/mylinuxforwork/dotfiles
-
-animations {
-    enabled = true
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
--- a/dotfiles/.config/hypr/animations/Mahaveer
+++ b/dotfiles/.config/hypr/animations/Mahaveer
@@ -1,54 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Me-1"
-# credit https://github.com/mahaveergurjar
-
-animations {
-    enabled = true
-    # Animation curves
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    # bezier = linear, 0, 0, 1, 1
-    bezier = md3_standard, 0.2, 0, 0, 1
-    bezier = md3_decel, 0.05, 0.7, 0.1, 1
-    bezier = md3_accel, 0.3, 0, 0.8, 0.15
-    bezier = overshot, 0.05, 0.9, 0.1, 1.1
-    bezier = crazyshot, 0.1, 1.5, 0.76, 0.92 
-    bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0
-    bezier = menu_decel, 0.1, 1, 0, 1
-    bezier = menu_accel, 0.38, 0.04, 1, 0.07
-    bezier = easeInOutCirc, 0.85, 0, 0.15, 1
-    bezier = easeOutCirc, 0, 0.55, 0.45, 1
-    bezier = easeOutExpo, 0.16, 1, 0.3, 1
-    bezier = softAcDecel, 0.26, 0.26, 0.15, 1
-    bezier = md2, 0.4, 0, 0.2, 1 # use with .2s duration
-    
-    # Animation configs
-    # animation = windows, 1, 3, md3_decel, popin 60%
-    # animation = windowsIn, 1, 3, md3_decel, popin 60%
-    # animation = windowsOut, 1, 3, md3_accel, popin 60%
-    # animation = windows, 1, 6, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, once
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-
-    # animation = border, 1, 10, default
-    animation = fade, 1, 3, md3_decel
-    # animation = layers, 1, 2, md3_decel, slide
-    animation = layersIn, 1, 3, menu_decel, slide
-    animation = layersOut, 1, 1.6, menu_accel
-    animation = fadeLayersIn, 1, 2, menu_decel
-    animation = fadeLayersOut, 1, 4.5, menu_accel
-    animation = workspaces, 1, 7, menu_decel, slide
-    animation = workspaces, 1, 5, wind
-    # animation = workspaces, 1, 2.5, softAcDecel, slide
-    # animation = workspaces, 1, 7, menu_decel, slidefade 15%
-    animation = specialWorkspace, 1, 3, md3_decel, slidefadevert 15%
-    animation = specialWorkspace, 1, 3, md3_decel, slidevert
-}
-
-
--- a/dotfiles/.config/hypr/animations/Mahaveer
+++ b/dotfiles/.config/hypr/animations/Mahaveer
@@ -1,29 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# name "Me-2"
-# credit https://github.com/mahaveergurjar
-
-
-animations {
-  enabled = yes
-
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
-  bezier = overshot, 0.05, 0.9, 0.1, 1.05
-  bezier = smoothOut, 0.5, 0, 0.99, 0.99
-  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
-  
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 5, winIn, slide
-  animation = windowsOut, 1, 3, smoothOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 3, smoothOut
-  animation = workspaces, 1, 5, overshot
-  
-  # animations for -git or version >0.42.0
-  animation = workspacesIn, 1, 5, winIn, slide
-  animation = workspacesOut, 1, 5, winOut, slide
-}
--- a/dotfiles/.config/hypr/appearance/animations.lua
+++ b/dotfiles/.config/hypr/appearance/animations.lua
@@ -1,34 +1,6 @@
-- HyprFlux — https://github.com/ahmad9059/HyprFlux
-- Ported from UserConfigs/UserAnimations.conf (the active preset)
--
-- The 14 alternative presets from animations/*.conf were also ported, flat, as
-- anim-*.lua (see the plan) — none of them are wired in. They now live in ../presets/.
-- To switch styles, replace the body of this file with `require("presets.anim-<preset>")`,
-- e.g. require("presets.anim-ml4w-classic").
+-- Active animation preset.
+-- The presets live in ../presets/anim-*.lua. Super+Shift+A (scripts/Animations.sh)
+-- picks one and rewrites the require() line below; edit it by hand to switch too,
+-- e.g. require("presets.anim-ml4w-classic"). Keep it to this single line.

-hl.config({
-    animations = {
-        enabled = true,
-    },
-})
-
-hl.curve("wind",      { type = "bezier", points = { { 0.05, 0.9 },  { 0.1, 1.05 } } })
-hl.curve("winIn",     { type = "bezier", points = { { 0.1, 1.1 },   { 0.1, 1.1 } } })
-hl.curve("winOut",    { type = "bezier", points = { { 0.3, -0.3 },  { 0, 1 } } })
-hl.curve("liner",     { type = "bezier", points = { { 1, 1 },       { 1, 1 } } })
-hl.curve("overshot",  { type = "bezier", points = { { 0.05, 0.9 },  { 0.1, 1.05 } } })
-hl.curve("smoothOut", { type = "bezier", points = { { 0.5, 0 },     { 0.99, 0.99 } } })
-hl.curve("smoothIn",  { type = "bezier", points = { { 0.5, -0.5 },  { 0.68, 1.5 } } })
-
-hl.animation({ leaf = "windows",     enabled = true, speed = 6, bezier = "wind",      style = "slide" })
-hl.animation({ leaf = "windowsIn",   enabled = true, speed = 5, bezier = "winIn",     style = "slide" })
-hl.animation({ leaf = "windowsOut",  enabled = true, speed = 3, bezier = "smoothOut", style = "slide" })
-hl.animation({ leaf = "windowsMove", enabled = true, speed = 5, bezier = "wind",      style = "slide" })
-hl.animation({ leaf = "border",      enabled = true, speed = 1,   bezier = "liner" })
-hl.animation({ leaf = "borderangle", enabled = true, speed = 100, bezier = "liner", style = "loop" }) -- used by rainbow borders and rotating colors; speed clamped from 180 -> Lua hl.animation caps speed at 100
-hl.animation({ leaf = "fade",        enabled = true, speed = 3, bezier = "smoothOut" })
-hl.animation({ leaf = "workspaces",  enabled = true, speed = 5, bezier = "overshot" })
-
-- animations for -git or version >0.42.0
-hl.animation({ leaf = "workspacesIn",  enabled = true, speed = 5, bezier = "winIn",  style = "slide" })
-hl.animation({ leaf = "workspacesOut", enabled = true, speed = 5, bezier = "winOut", style = "slide" })
+require("presets.anim-hyprflux")
--- a/dotfiles/.config/hypr/colours/hyprflux-colors.conf
+++ b/dotfiles/.config/hypr/colours/hyprflux-colors.conf
@@ -1,21 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# HyprFlux static color palette 
-
-$background = rgb(010102)
-$foreground = rgb(FDF8FE)
-$color0 = rgb(313131)
-$color1 = rgb(09050C)
-$color2 = rgb(221647)
-$color3 = rgb(2C1A40)
-$color4 = rgb(5E3887)
-$color5 = rgb(7344A6)
-$color6 = rgb(BAB0BD)
-$color7 = rgb(F3ECF5)
-$color8 = rgb(AAA5AC)
-$color9 = rgb(0B0711)
-$color10 = rgb(2D1D5F)
-$color11 = rgb(3B2355)
-$color12 = rgb(7D4AB4)
-$color13 = rgb(9A5BDD)
-$color14 = rgb(F8EAFC)
-$color15 = rgb(F3ECF5)
--- a/dotfiles/.config/hypr/core/env.lua
+++ b/dotfiles/.config/hypr/core/env.lua
@@ -19,11 +19,7 @@ hl.env("XDG_SESSION_TYPE", "wayland")
 -- QT Variables
 hl.env("QT_AUTO_SCREEN_SCALE_FACTOR", "1")
 hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1")
-hl.env("QT_QPA_PLATFORMTHEME", "qt5ct")
-hl.env("QT_QPA_PLATFORMTHEME", "qt6ct")
-
-- hyprland-qt-support
-hl.env("QT_QUICK_CONTROLS_STYLE", "org.hyprland.style")
+hl.env("QT_QPA_PLATFORMTHEME", "qt6ct") -- qt6ct also styles Qt5 apps that read it; qt5ct.conf is kept in sync

 -- xwayland apps scale fix (useful if you use monitor scaling).
 -- Set same value if you use scaling in monitors.lua
@@ -32,11 +28,17 @@ hl.env("QT_QUICK_CONTROLS_STYLE", "org.hyprland.style")
 hl.env("GDK_SCALE", "1")
 hl.env("QT_SCALE_FACTOR", "1")

-- Bibata-Modern-Ice-Cursor
-- NOTE! You must have the hyprcursor version to activate this.
+-- Cursor: Bibata-Modern-Classic (AUR bibata-cursor-theme-bin, XCursor format).
+-- Same theme in gtk-*/settings.ini, the gsettings call in hyprland.lua and initial-boot.sh.
+-- There's no hyprcursor build installed, so Hyprland falls back to XCURSOR_THEME.
 -- https://wiki.hyprland.org/Hypr-Ecosystem/hyprcursor/
 hl.env("HYPRCURSOR_THEME", "Bibata-Modern-Classic")
 hl.env("HYPRCURSOR_SIZE", "24")
+hl.env("XCURSOR_THEME", "Bibata-Modern-Classic")
+hl.env("XCURSOR_SIZE", "24")
+
+-- Default terminal for anything that asks $TERMINAL (rofi-sensible-terminal, scripts)
+hl.env("TERMINAL", "ghostty")

 -- firefox
 hl.env("MOZ_ENABLE_WAYLAND", "1")
@@ -46,13 +48,17 @@ hl.env("MOZ_ENABLE_WAYLAND", "1")
 hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto") -- auto selects Wayland if possible, X11 otherwise

 -- NVIDIA
-- This is from the Hyprland wiki. Uncomment below if an nvidia GPU is detected.
 -- See hyprland wiki https://wiki.hyprland.org/Nvidia/#environment-variables
-
-hl.env("LIBVA_DRIVER_NAME", "nvidia")
-hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
-hl.env("NVD_BACKEND", "direct")
-hl.env("GSK_RENDERER", "ngl")
+-- Only when the NVIDIA kernel driver is loaded, so the same config works on the
+-- laptop (forcing LIBVA_DRIVER_NAME=nvidia there breaks VA-API video decoding).
+local nvidia = io.open("/proc/driver/nvidia/version")
+if nvidia then
+    nvidia:close()
+    hl.env("LIBVA_DRIVER_NAME", "nvidia")
+    hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
+    hl.env("NVD_BACKEND", "direct")
+    hl.env("GSK_RENDERER", "ngl")
+end

 -- additional ENV's for nvidia. Caution, activate with care
 -- hl.env("GBM_BACKEND", "nvidia-drm")
--- a/dotfiles/.config/hypr/core/hyprmod.lua
+++ b/dotfiles/.config/hypr/core/hyprmod.lua
@@ -29,6 +29,8 @@ hl.monitor({ output = "DP-2", mode = "1920x1080@165.00Hz", position = "0x0", sca
 -- (unbind = SUPER SHIFT, Print / unbind = SUPER, up from the source .conf have no Lua equivalent needed —
 -- we just don't define a conflicting bind elsewhere; SUPER + up -> movefocus u below is otherwise identical
 -- to the one already in keybinds.lua, kept here too for parity with the original file)
-hl.bind("SUPER + Print", hl.dsp.exec_cmd("hyprshot -o " .. os.getenv("HOME") .. "/Pictures/Screenshots-Linux -m region"))
+hl.bind("SUPER + Print", hl.dsp.exec_cmd([[sh -c 'if command -v hyprshot >/dev/null; then hyprshot -o "$HOME/Pictures/Screenshots-Linux" -m region; else grim -g "$(slurp)" "$HOME/Pictures/Screenshots-Linux/$(date +%Y-%m-%d_%H-%M-%S).png" && notify-send "Screenshot saved"; fi']])) -- drag an area (hyprshot if installed, else grim/slurp)
+hl.bind("SUPER + SHIFT + S", hl.dsp.exec_cmd([[sh -c 'grim -g "$(slurp)" "$HOME/Pictures/Screenshots-Linux/$(date +%Y-%m-%d_%H-%M-%S).png" && notify-send "Screenshot saved"']])) -- region; Surface keyboard has no Print key
+hl.bind("SUPER + F6", hl.dsp.exec_cmd([[sh -c 'grim "$HOME/Pictures/Screenshots-Linux/$(date +%Y-%m-%d_%H-%M-%S).png" && notify-send "Screenshot saved"']])) -- full screen
 hl.bind("SUPER + up", hl.dsp.focus({ direction = "u" }))
-hl.bind("SUPER + SHIFT + Print", hl.dsp.exec_cmd("hyprshot -o " .. os.getenv("HOME") .. "/Pictures/Screenshots-Linux -m window"))
+hl.bind("SUPER + SHIFT + Print", hl.dsp.exec_cmd([[sh -c 'if command -v hyprshot >/dev/null; then hyprshot -o "$HOME/Pictures/Screenshots-Linux" -m window; else grim "$HOME/Pictures/Screenshots-Linux/$(date +%Y-%m-%d_%H-%M-%S).png" && notify-send "Screenshot saved"; fi']])) -- window (hyprshot) or full screen (fallback)
--- a/dotfiles/.config/hypr/core/startup.lua
+++ b/dotfiles/.config/hypr/core/startup.lua
@@ -13,9 +13,11 @@ hl.on("hyprland.start", function()
    -- Startup
    hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
    hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
+    -- restart portals once the env is imported, otherwise screen sharing breaks
+    hl.exec_cmd("sleep 1 && systemctl --user restart xdg-desktop-portal-hyprland && systemctl --user restart xdg-desktop-portal")

-    -- Sunshine
-    hl.exec_cmd("sleep 1 && hyprctl output create headless")
+    -- Sunshine (virtual monitor only on desktop; skipped on laptops, detected by a system battery)
+    hl.exec_cmd("sleep 1 && ! ls -d /sys/class/power_supply/BAT* >/dev/null 2>&1 && hyprctl output create headless")

    -- Polkit (Polkit Gnome / KDE)
    hl.exec_cmd(scriptsDir .. "/Polkit.sh")
@@ -34,7 +36,8 @@ hl.on("hyprland.start", function()
    hl.exec_cmd("wl-paste --type image --watch cliphist store")

    -- Starting hypridle to start hyprlock
-    -- hl.exec_cmd("hypridle")
+    -- Sunshine streams hold an idle inhibitor (scripts/SunshineIdle.sh) so this never locks mid-stream
+    hl.exec_cmd("hypridle")

    -- Sunshine for streaming media
    hl.exec_cmd("sunshine")
@@ -44,8 +47,7 @@ hl.on("hyprland.start", function()

    hl.dispatch(hl.dsp.focus({ workspace = 3 }))

-    -- NOTE: the trailing "&&" here is a stray leftover from the original .conf (dangling, does nothing) — ported as-is
-    hl.exec_cmd("/usr/bin/Plexamp.AppImage &&")
+    hl.exec_cmd("plexamp") -- plexamp-bin (AUR)
    hl.exec_cmd("sleep 3 && vesktop")
    hl.dispatch(hl.dsp.focus({ workspace = 1 }))
    hl.exec_cmd("bitwarden-desktop --ozone-platform-hint=auto --silent")
--- a/dotfiles/.config/hypr/hypridle.conf
+++ b/dotfiles/.config/hypr/hypridle.conf
@@ -8,7 +8,7 @@ general {
    lock_cmd = pidof hyprlock || hyprlock # runs hyprlock if it is not already running (this is always run when "loginctl lock-session" is called) 
    # unlock_cmd = killall hyprlock # kills hyprlock when unlocking (this is always run when "loginctl unlock-session" is called)
    before_sleep_cmd = loginctl lock-session    # ensures that the session is locked before going to sleep
-    after_sleep_cmd = hyprctl dispatch dpms on # turn of screen after sleep (not strictly necessary, but just in case)
+    after_sleep_cmd = hyprctl dispatch 'hl.dsp.dpms({action = "on"})' # turn of screen after sleep (not strictly necessary, but just in case)
    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
 }

@@ -16,8 +16,8 @@ general {
 # (disabled by default)
 # listener {
 #     timeout = 30                            # 30 seconds
-#     on-timeout = pidof hyprlock && hyprctl dispatch dpms off # turns off the screen if hyprlock is active
-#     on-resume = pidof hyprlock && hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+#     on-timeout = pidof hyprlock && hyprctl dispatch 'hl.dsp.dpms({action = "off"})' # turns off the screen if hyprlock is active
+#     on-resume = pidof hyprlock && hyprctl dispatch 'hl.dsp.dpms({action = "on"})'    # command to run when activity is detected after timeout has fired.
 # }

 # Warn
@@ -38,8 +38,8 @@ listener {
 # (disabled by default)
 # listener {
 #     timeout = 630                            # 10.5 min
-#     on-timeout = hyprctl dispatch dpms off  # command to run when timeout has passed
-#     on-resume = hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+#     on-timeout = hyprctl dispatch 'hl.dsp.dpms({action = "off"})'  # command to run when timeout has passed
+#     on-resume = hyprctl dispatch 'hl.dsp.dpms({action = "on"})'    # command to run when activity is detected after timeout has fired.
 # }

 # Suspend # disabled by default
--- a/dotfiles/.config/hypr/hyprland-gui.conf
+++ b/dotfiles/.config/hypr/hyprland-gui.conf
@@ -1,20 +0,0 @@
-# Generated by HyprMod
-
-general:allow_tearing = 1
-general:snap:enabled = 0
-# vrr forced off globally: the per-monitor vrr,0 flag below does NOT override this when
-# misc:vrr is 1 (tested live on Hyprland 0.56.2 — DP-2 stayed vrr:true until this global
-# was changed). DP-2 (Acer VG240Y S) flickers under VRR when idle in fullscreen (mouse
-# stationary -> no repaint damage -> frame delivery stalls near the panel's VRR floor).
-# The other two monitors don't negotiate VRR at all, so this has no effect on them.
-misc:vrr = 0
-
-# Monitors
-monitor = DP-2, 1920x1080@165.00Hz, 0x0, 1, bitdepth, 10, cm, wide, vrr, 0
-
-# Keybinds
-unbind = SUPER SHIFT, Print
-unbind = SUPER, up
-bind = SUPER, Print, exec, hyprshot -o $HOME/Pictures/Screenshots-Linux -m region
-bind = SUPER, up, movefocus, u
-bind = SUPER SHIFT, Print, exec, hyprshot -o $HOME/Pictures/Screenshots-Linux -m window
--- a/dotfiles/.config/hypr/hyprland.conf
+++ b/dotfiles/.config/hypr/hyprland.conf
@@ -1,34 +0,0 @@
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# always refer to Hyprland wiki
-# https://wiki.hyprland.org/
-
-# Initial boot script enable to apply initial wallpapers, theming, new settings etc.
-# suggest not to change this or delete this including deleting referrence file in ~/.config/hypr/.initial_startup_done
-# as long as the referrence file is present, this initial-boot.sh will not execute
-exec-once = $HOME/.config/hypr/initial-boot.sh
-
-# ## This is where you want to start tinkering 
-$UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path
-
-source= $UserConfigs/Startup_Apps.conf # put your start-up packages on this file
-
-source= $UserConfigs/ENVariables.conf # Environment variables to load
-
-source= $UserConfigs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules
-
-source= $UserConfigs/UserDecorations.conf # Decorations config file
-
-source= $UserConfigs/UserAnimations.conf # Animation config file
-
-source= $UserConfigs/Keybinds.conf # Put your own keybinds here
-
-source= $UserConfigs/UserSettings.conf # Main Hyprland Settings.
-
-# nwg-displays
-source= $UserConfigs/monitors.conf
-source= $UserConfigs/workspaces.conf
-
-exec = gsettings set org.gnome.desktop.interface cursor-theme Future-black Cursors
-
-# HyprMod managed settings
-source = $HOME/.config/hypr/hyprland-gui.conf
--- a/dotfiles/.config/hypr/hyprland.lua
+++ b/dotfiles/.config/hypr/hyprland.lua
@@ -35,7 +35,7 @@ require("layout.workspaces")
 -- only fires once at actual compositor start — close enough for a one-shot gsettings
 -- call, but worth knowing if you relied on the reload-time re-apply.
 hl.on("hyprland.start", function()
-    hl.exec_cmd("gsettings set org.gnome.desktop.interface cursor-theme Future-black Cursors")
+    hl.exec_cmd("gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Classic && gsettings set org.gnome.desktop.interface cursor-size 24")
 end)

 -- HyprMod managed settings
--- a/dotfiles/.config/hypr/hyprlock.conf
+++ b/dotfiles/.config/hypr/hyprlock.conf
@@ -113,7 +113,7 @@ label {
    text = cmd[update:1000] echo "$(~/.config/hypr/hyprlock/Scripts/songdetail.sh)" 
    color = rgba(255, 255, 255, 0.6)
    font_size = 18
-    font_family = JetBrains Mono Nerd, SF Pro Display Bold
+    font_family = JetBrainsMono Nerd Font, SF Pro Display Bold
    position = 0, 90
    halign = center
    valign = bottom
@@ -221,7 +221,7 @@ label {
    text = cmd[update:1000] echo "$(~/.config/hypr/hyprlock/Scripts/songdetail.sh)" 
    color = rgba(255, 255, 255, 0.6)
    font_size = 28
-    font_family = JetBrains Mono Nerd, SF Pro Display Bold
+    font_family = JetBrainsMono Nerd Font, SF Pro Display Bold
    position = 0, 90
    halign = center
    valign = bottom
--- a/dotfiles/.config/hypr/hyprlock/Fonts/JetBrains/JetBrains
+++ b/dotfiles/.config/hypr/hyprlock/Fonts/JetBrains/JetBrains
--- a/dotfiles/.config/hypr/initial-boot.sh
+++ b/dotfiles/.config/hypr/initial-boot.sh
@@ -13,7 +13,7 @@ kvantum_theme="catppuccin-mocha-blue"
 color_scheme="prefer-dark"
 gtk_theme="Material-DeepOcean-BL"
 icon_theme="Papirus-Dark"
-cursor_theme="Moga-Cursor"
+cursor_theme="Bibata-Modern-Classic"

 # Check if a marker file exists.
 if [ ! -f "$HOME/.config/hypr/.initial_startup_done" ]; then
--- a/dotfiles/.config/hypr/input/keybinds.lua
+++ b/dotfiles/.config/hypr/input/keybinds.lua
@@ -10,7 +10,7 @@ local userScripts = os.getenv("HOME") .. "/.config/hypr/UserScripts"
 local edit = os.getenv("EDITOR") or "nvim"

 -- These two are for UserKeybinds.conf & Waybar Modules
-local term  = "foot"    -- Terminal
+local term  = "ghostty" -- Terminal (foot is still installed as a fallback)
 local files = "thunar"  -- File Manager

 -- Default Search Engine for ROFI Search (SUPER S)
@@ -31,7 +31,7 @@ hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("fdm")) -- Free Download Manager
 hl.bind(mainMod .. " + W", hl.dsp.exec_cmd("waypaper")) -- Wayland Wallpaper Setter
 hl.bind(mainMod .. " + L", hl.dsp.exec_cmd("hyprlock")) -- Screen Locker
 hl.bind(mainMod .. " + DELETE", hl.dsp.exec_cmd("~/.config/rofi/powermenu/type-2/powermenu.sh")) -- Power Menu
-hl.bind(mainMod .. " + S", hl.dsp.exec_cmd("cd /home/thomas/hyprmod && uv run hyprmod")) -- Hyprmod - A Hyprland settings manager (if installed)
+hl.bind(mainMod .. " + S", hl.dsp.exec_cmd("hyprmod")) -- Hyprmod - A Hyprland settings manager (AUR: hyprmod)
 hl.bind(mainMod .. " + SHIFT + R", hl.dsp.exec_cmd(scriptsDir .. "/Refresh.sh")) -- Refresh waybar, swaync, rofirrr
 hl.bind(mainMod .. " + N", hl.dsp.exec_cmd("swaync-client -t -sw")) -- swayNC notification panel

@@ -40,8 +40,9 @@ hl.bind(mainMod .. " + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen
 hl.bind(mainMod .. " + SHIFT + SPACE", hl.dsp.window.float({ action = "toggle" })) -- Float Mode

 -- Desktop zooming or magnifier
-hl.bind(mainMod .. " + ALT + mouse_down", hl.dsp.exec_cmd([[hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"]]))
-hl.bind(mainMod .. " + ALT + mouse_up", hl.dsp.exec_cmd([[hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')"]]))
+-- (`hyprctl keyword` is rejected by the Lua config — "keyword can't work with non-legacy parsers" — so set it via eval)
+hl.bind(mainMod .. " + ALT + mouse_down", hl.dsp.exec_cmd([[hyprctl eval "hl.config({ cursor = { zoom_factor = $(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}') } })"]]))
+hl.bind(mainMod .. " + ALT + mouse_up", hl.dsp.exec_cmd([[hyprctl eval "hl.config({ cursor = { zoom_factor = $(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}') } })"]]))

 -- Waybar / Bar related
 hl.bind(mainMod .. " + CTRL + ALT + B", hl.dsp.exec_cmd("pkill -SIGUSR1 waybar")) -- Toggle hide/show waybar
@@ -116,23 +117,22 @@ hl.bind(mainMod .. " + SHIFT + tab", hl.dsp.focus({ workspace = "m-1" }))
 hl.bind(mainMod .. " + U",         hl.dsp.workspace.toggle_special("nyx"))
 hl.bind(mainMod .. " + SHIFT + U", hl.dsp.window.move({ workspace = "special:nyx" }))

-- The following mappings use key codes to better support various keyboard layouts
-- 1 is code:10, 2 is code:11, etc
+-- Number-row keys (the Lua bind parser does not accept the code:NN keycode syntax)
 -- Switch workspaces with mainMod + [0-9]
-for i, code in ipairs({ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }) do
-    hl.bind(mainMod .. " + code:" .. code, hl.dsp.focus({ workspace = i })) -- code:10 = key 1 ... code:19 = key 0
+for i, key in ipairs({ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" }) do
+    hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i }))
 end

 -- Move active window and follow to workspace mainMod + SHIFT + [0-9]
-for i, code in ipairs({ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }) do
-    hl.bind(mainMod .. " + SHIFT + code:" .. code, hl.dsp.window.move({ workspace = i, follow = true }))
+for i, key in ipairs({ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" }) do
+    hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i, follow = true }))
 end
 hl.bind(mainMod .. " + SHIFT + bracketleft",  hl.dsp.window.move({ workspace = -1, follow = true })) -- brackets [
 hl.bind(mainMod .. " + SHIFT + bracketright", hl.dsp.window.move({ workspace = 1,  follow = true })) -- brackets ]

 -- Move active window to a workspace silently mainMod + CTRL + [0-9]
-for i, code in ipairs({ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }) do
-    hl.bind(mainMod .. " + CTRL + code:" .. code, hl.dsp.window.move({ workspace = i, follow = false }))
+for i, key in ipairs({ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" }) do
+    hl.bind(mainMod .. " + CTRL + " .. key, hl.dsp.window.move({ workspace = i, follow = false }))
 end
 hl.bind(mainMod .. " + CTRL + bracketleft",  hl.dsp.window.move({ workspace = -1, follow = false })) -- brackets [
 hl.bind(mainMod .. " + CTRL + bracketright", hl.dsp.window.move({ workspace = 1,  follow = false })) -- brackets ]
@@ -151,9 +151,6 @@ hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) --
 -- Laptop specific keybinds
 --------------------------------------------------------------------------------------

-- for disabling Touchpad. hyprctl devices to get device name.
-local touchpadDevice = "asue1209:00-04f3:319f-touchpad"
-
 hl.bind("XF86KbdBrightnessDown", hl.dsp.exec_cmd(scriptsDir .. "/BrightnessKbd.sh --dec"), { repeating = true }) -- decrease keyboard brightness
 hl.bind("XF86KbdBrightnessUp",   hl.dsp.exec_cmd(scriptsDir .. "/BrightnessKbd.sh --inc"), { repeating = true }) -- increase keyboard brightness
 hl.bind("XF86Launch1", hl.dsp.exec_cmd("rog-control-center")) -- ASUS Armory crate button
@@ -161,7 +158,7 @@ hl.bind("XF86Launch3", hl.dsp.exec_cmd("asusctl led-mode -n")) -- FN+F4 Switch k
 hl.bind("XF86Launch4", hl.dsp.exec_cmd("asusctl profile -n")) -- FN+F5 change of fan profiles (Quiet, Balance, Performance)
 hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd(scriptsDir .. "/Brightness.sh --dec"), { repeating = true }) -- decrease monitor brightness
 hl.bind("XF86MonBrightnessUp",   hl.dsp.exec_cmd(scriptsDir .. "/Brightness.sh --inc"), { repeating = true }) -- increase monitor brightness
-hl.bind("XF86TouchpadToggle", hl.dsp.exec_cmd(scriptsDir .. "/TouchPad.sh")) -- disable touchpad
+hl.bind("XF86TouchpadToggle", hl.dsp.exec_cmd(scriptsDir .. "/TouchPad.sh")) -- toggle touchpad (finds the device itself)

 -- Screenshot keybindings using F6 (no PrintSrc button)
 -- hl.bind(mainMod .. " + F6", hl.dsp.exec_cmd(scriptsDir .. "/ScreenShot.sh --now")) -- screenshot
@@ -169,8 +166,3 @@ hl.bind("XF86TouchpadToggle", hl.dsp.exec_cmd(scriptsDir .. "/TouchPad.sh")) --
 -- hl.bind(mainMod .. " + CTRL + F6", hl.dsp.exec_cmd(scriptsDir .. "/ScreenShot.sh --in5")) -- screenshot (5 secs delay)
 -- hl.bind(mainMod .. " + ALT + F6", hl.dsp.exec_cmd(scriptsDir .. "/ScreenShot.sh --in10")) -- screenshot (10 secs delay)
 -- hl.bind("ALT + F6", hl.dsp.exec_cmd(scriptsDir .. "/ScreenShot.sh --active")) -- screenshot (active window only)
-
-hl.device({
-    name    = touchpadDevice,
-    enabled = true,
-})
--- a/dotfiles/.config/hypr/layout/windowrules.lua
+++ b/dotfiles/.config/hypr/layout/windowrules.lua
@@ -57,6 +57,11 @@ hl.window_rule({ name = "windowrule-24", tag = "+im", match = { class = "^(im.ri
 -- game tags
 hl.window_rule({ name = "windowrule-25", tag = "+games", match = { class = "^(gamescope)$" } })
 hl.window_rule({ name = "windowrule-26", tag = "+games", match = { class = "^(steam_app_\\d+)$" } })
+-- While Sunshine is streaming, open Steam games fullscreen on the headless stream output
+-- (workspace 9 -> HEADLESS-1). Old games like KOTOR fix their render size/scaling at launch
+-- and never adapt to a later resize, so they must start there. Off by default (local play
+-- unaffected); toggled by ~/.config/sunshine/scripts/sunshine-games.sh via the global.
+SunshineGamesRule = hl.window_rule({ name = "sunshine-games", enabled = false, workspace = "9", fullscreen = true, match = { class = "^(steam_app_\\d+)$" } })

 -- gamestore tags
 hl.window_rule({ name = "windowrule-27", tag = "+gamestore", match = { class = "^([Ss]team)$" } })
@@ -93,8 +98,13 @@ hl.window_rule({ name = "windowrule-46", tag = "+settings", match = { class = "^
 -- Custom rule
 hl.window_rule({ name = "windowrule-47", tile = true, match = { class = "^([Cc]hromium)$" } })
 hl.window_rule({ name = "windowrule-48", size = "monitor_w*0.25 monitor_h*0.55", float = true, match = { class = "^(com.network.manager)$" } })
-hl.window_rule({ name = "windowrule-49", workspace = "special:nyx", match = { class = "^([Vv]esktop|[Dd]iscord|[Ss]potify)$" } })
 hl.window_rule({ name = "windowrule-255", size = "monitor_w*0.75 monitor_h*0.80", float = true, match = { class = "^([Bb]itwarden)$" } })
+-- System updater terminal (quickshell/scripts/update-system.sh) — float + center it instead of
+-- tiling into the current workspace. Matches the title the script launches it with, so it works
+-- for Ghostty and the foot fallback alike; initial_title so a later rename can't dodge it.
+-- Fixed pixel size rather than monitor_w/h fractions: HDMI-A-1 is rotated portrait (1080 wide),
+-- where a fraction of the width made it too narrow for package output; 1000x650 fits every screen.
+hl.window_rule({ name = "system-update-terminal", float = true, center = true, size = "1000 650", match = { initial_title = "^(update)$" } })

 -- viewer tags
 hl.window_rule({ name = "windowrule-50", tag = "+viewer", match = { class = "^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$" } }) -- system monitor
@@ -128,11 +138,8 @@ hl.window_rule({
 -- hl.window_rule({ idle_inhibit = "fullscreen", match = { title = "^(*)$" } })
 hl.window_rule({ name = "windowrule-60", idle_inhibit = "fullscreen", match = { fullscreen = true } })

-- Discord to workspace 3
-- NOTE: these two used the old single-line windowrule syntax in the source .conf (match packed
-- oddly with the rule); windowrule-49 above already sends the same apps to special:nyx, so this
-- looks like a pre-existing conflict in the original config rather than something introduced here —
-- ported literally, last-defined-wins as before.
+-- Discord / Spotify / Plexamp to workspace 3 (the portrait LG). An older rule also sent
+-- Vesktop/Discord/Spotify to special:nyx; this one always won, so that rule was removed.
 hl.window_rule({ workspace = "3", match = { class = "^([Vv]esktop|[Dd]iscord|[Ss]potify|[Pp]lexamp)$" } })
 hl.window_rule({ size = "20% 20%", match = { class = "^([Pp]lexamp)" } })

@@ -144,6 +151,7 @@ hl.window_rule({ name = "windowrule-78", float = true, match = { class = "([Zz]o
 hl.window_rule({ name = "windowrule-79", float = true, match = { class = "(org.gnome.Calculator)", title = "(Calculator)" } })
 hl.window_rule({ name = "windowrule-80", float = true, match = { class = "^(mpv|com.github.rafostar.Clapper)$" } })
 hl.window_rule({ name = "windowrule-81", float = true, match = { class = "^([Qq]alculate-gtk)$" } })
+hl.window_rule({ name = "galculator", float = true, center = true, size = "407 596", match = { class = "^([Gg]alculator)$" } })
 -- hl.window_rule({ float = true, match = { class = "^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$" } })
 -- hl.window_rule({ float = true, match = { title = "^(Firefox)$" } })
 hl.window_rule({ name = "windowrule-82", float = true, match = { class = "^(fdm|freedownloadmanager)$" } })
--- a/dotfiles/.config/hypr/presets/anim-hyprflux.lua
+++ b/dotfiles/.config/hypr/presets/anim-hyprflux.lua
@@ -0,0 +1,31 @@
+-- HyprFlux — https://github.com/ahmad9059/HyprFlux
+-- name "HyprFlux (default)"
+-- The animation set that shipped as appearance/animations.lua (ported from
+-- UserConfigs/UserAnimations.conf). Selected by default; Super+Shift+A switches.
+
+hl.config({
+    animations = {
+        enabled = true,
+    },
+})
+
+hl.curve("wind",      { type = "bezier", points = { { 0.05, 0.9 },  { 0.1, 1.05 } } })
+hl.curve("winIn",     { type = "bezier", points = { { 0.1, 1.1 },   { 0.1, 1.1 } } })
+hl.curve("winOut",    { type = "bezier", points = { { 0.3, -0.3 },  { 0, 1 } } })
+hl.curve("liner",     { type = "bezier", points = { { 1, 1 },       { 1, 1 } } })
+hl.curve("overshot",  { type = "bezier", points = { { 0.05, 0.9 },  { 0.1, 1.05 } } })
+hl.curve("smoothOut", { type = "bezier", points = { { 0.5, 0 },     { 0.99, 0.99 } } })
+hl.curve("smoothIn",  { type = "bezier", points = { { 0.5, -0.5 },  { 0.68, 1.5 } } })
+
+hl.animation({ leaf = "windows",     enabled = true, speed = 6, bezier = "wind",      style = "slide" })
+hl.animation({ leaf = "windowsIn",   enabled = true, speed = 5, bezier = "winIn",     style = "slide" })
+hl.animation({ leaf = "windowsOut",  enabled = true, speed = 3, bezier = "smoothOut", style = "slide" })
+hl.animation({ leaf = "windowsMove", enabled = true, speed = 5, bezier = "wind",      style = "slide" })
+hl.animation({ leaf = "border",      enabled = true, speed = 1,   bezier = "liner" })
+hl.animation({ leaf = "borderangle", enabled = true, speed = 100, bezier = "liner", style = "loop" }) -- used by rainbow borders and rotating colors; speed clamped from 180 -> Lua hl.animation caps speed at 100
+hl.animation({ leaf = "fade",        enabled = true, speed = 3, bezier = "smoothOut" })
+hl.animation({ leaf = "workspaces",  enabled = true, speed = 5, bezier = "overshot" })
+
+-- animations for -git or version >0.42.0
+hl.animation({ leaf = "workspacesIn",  enabled = true, speed = 5, bezier = "winIn",  style = "slide" })
+hl.animation({ leaf = "workspacesOut", enabled = true, speed = 5, bezier = "winOut", style = "slide" })
--- a/dotfiles/.config/hypr/scripts/Animations.sh
+++ b/dotfiles/.config/hypr/scripts/Animations.sh
@@ -1,31 +1,38 @@
 #!/bin/bash
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# For applying Animations from different users
+# Animation preset picker (Super+Shift+A).
+# Lists ~/.config/hypr/presets/anim-*.lua by their original HyprFlux preset name
+# (the "Ported from animations/<name>.conf" line, else `-- name "..."`), then
+# points appearance/animations.lua's require() at the chosen one and reloads.
+
+iDIR="$HOME/.config/swaync/images"
+presets_dir="$HOME/.config/hypr/presets"
+active_file="$HOME/.config/hypr/appearance/animations.lua"
+rofi_theme="$HOME/.config/rofi/launchers/type-4/style-4.rasi"

-# Check if rofi is already running
 if pidof rofi >/dev/null; then
  pkill rofi
 fi

-# Variables
-iDIR="$HOME/.config/swaync/images"
-SCRIPTSDIR="$HOME/.config/hypr/scripts"
-animations_dir="$HOME/.config/hypr/animations"
-UserConfigs="$HOME/.config/hypr/UserConfigs"
-rofi_theme="$HOME/.config/rofi/config-Animations.rasi"
-msg='❗NOTE:❗ This will copy animations into UserAnimations.conf'
-# list of animation files, sorted alphabetically with numbers first
-animations_list=$(find -L "$animations_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//' | sort -V)
+# "Display name<TAB>module" per preset, sorted by name
+list=$(for f in "$presets_dir"/anim-*.lua; do
+  module=$(basename "$f" .lua)
+  name=$(sed -n 's/^-- Ported from animations\/\(.*\)\.conf.*/\1/p' "$f" | head -n1)
+  [[ -z "$name" ]] && name=$(sed -n 's/^-- name "\(.*\)"$/\1/p' "$f" | head -n1)
+  printf '%s\t%s\n' "${name:-$module}" "$module"
+done | sort -f)

-# Rofi Menu
-chosen_file=$(echo "$animations_list" | rofi -i -dmenu -config $rofi_theme -mesg "$msg")
+current=$(sed -n 's/^require("presets\.\(.*\)")$/\1/p' "$active_file")
+current_name=$(awk -F'\t' -v m="$current" '$2 == m { print $1 }' <<<"$list")

-# Check if a file was selected
-if [[ -n "$chosen_file" ]]; then
-  full_path="$animations_dir/$chosen_file.conf"
-  cp "$full_path" "$UserConfigs/UserAnimations.conf"
-  notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Hyprland Animation Loaded"
-fi
+chosen=$(cut -f1 <<<"$list" | rofi -i -dmenu -p "Animations" \
+  -theme "$rofi_theme" \
+  -theme-str 'mainbox { children: [ "inputbar", "message", "listview" ]; }' \
+  -mesg "Current: ${current_name:-$current}")
+[[ -z "$chosen" ]] && exit 0

-sleep 1
-"$SCRIPTSDIR/RefreshNoWaybar.sh"
+module=$(awk -F'\t' -v n="$chosen" '$1 == n { print $2; exit }' <<<"$list")
+[[ -z "$module" ]] && exit 1
+
+sed -i "s/^require(\"presets\.[^\"]*\")$/require(\"presets.$module\")/" "$active_file"
+hyprctl reload >/dev/null
+notify-send -u low -i "$iDIR/note.png" "$chosen" "Hyprland animation loaded"
--- a/dotfiles/.config/hypr/scripts/ClipManager.sh
+++ b/dotfiles/.config/hypr/scripts/ClipManager.sh
@@ -3,7 +3,7 @@
 # Clipboard Manager. This script uses cliphist, rofi, and wl-copy.

 # Variables
-rofi_theme="$HOME/.config/rofi/config-clipboard.rasi"
+rofi_theme="$HOME/.config/rofi/launchers/type-4/style-4.rasi"
 msg='👀 **note**  CTRL DEL = cliphist del (entry)   or   ALT DEL - cliphist wipe (all)'
 # Actions:
 # CTRL Del to delete an entry
@@ -19,7 +19,9 @@ while true; do
        rofi -i -dmenu \
            -kb-custom-1 "Control-Delete" \
            -kb-custom-2 "Alt-Delete" \
-            -config $rofi_theme < <(cliphist list) \
+            -theme "$rofi_theme" \
+            -theme-str 'mainbox { children: [ "inputbar", "message", "listview" ]; }' \
+            < <(cliphist list) \
 			-mesg "$msg" 
    )

--- a/dotfiles/.config/hypr/scripts/MediaCtrl.sh
+++ b/dotfiles/.config/hypr/scripts/MediaCtrl.sh
@@ -4,6 +4,11 @@

 music_icon="$HOME/.config/swaync/icons/music.png"

+# Use the app's own icon for known players
+case "$(playerctl metadata --format '{{playerName}}' 2>/dev/null)" in
+    Plexamp) music_icon="com.plexamp.Plexamp" ;;
+esac
+
 # Play the next track
 play_next() {
    playerctl next
--- a/dotfiles/.config/hypr/scripts/Refresh.sh
+++ b/dotfiles/.config/hypr/scripts/Refresh.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # HyprFlux — https://github.com/ahmad9059/HyprFlux
-# Scripts for refreshing waybar, rofi, swaync
+# Scripts for refreshing quickshell, rofi, swaync (Waybar is retired — not restarted here)

 SCRIPTSDIR=$HOME/.config/hypr/scripts
 UserScripts=$HOME/.config/hypr/UserScripts
@@ -15,31 +15,24 @@ file_exists() {
 }

 # Kill already running processes
-_ps=(waybar rofi swaync ags)
+_ps=(rofi swaync ags)
 for _prs in "${_ps[@]}"; do
    if pidof "${_prs}" >/dev/null; then
        pkill "${_prs}"
    fi
 done

-# ensure waybar fully reloads
-killall -SIGUSR2 waybar 
-
 # quit ags & relaunch ags
 #ags -q && ags &

 # quit quickshell & relaunch quickshell
-pkill qs && qs &
+pkill -x qs; qs &

 # some process to kill
-for pid in $(pidof waybar rofi swaync ags swaybg); do
+for pid in $(pidof rofi swaync ags swaybg); do
    kill -SIGUSR1 "$pid"
 done

-#Restart waybar
-sleep 1
-waybar &
-
 # relaunch swaync
 sleep 0.5
 swaync > /dev/null 2>&1 &
--- a/dotfiles/.config/hypr/scripts/SunshineIdle.sh
+++ b/dotfiles/.config/hypr/scripts/SunshineIdle.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Keeps hypridle from locking the screen while Sunshine is streaming.
+# Hooked up as Sunshine's global_prep_cmd, so it runs for every app:
+#   start -> hold a systemd idle inhibitor (hypridle respects these) and
+#            unlock hyprlock if the session was already locked
+#   stop  -> release the inhibitor so normal idle locking resumes
+
+pidfile="${XDG_RUNTIME_DIR:-/tmp}/sunshine-idle-inhibit.pid"
+
+case "$1" in
+    start)
+        if ! { [ -f "$pidfile" ] && kill -0 "$(cat "$pidfile")" 2>/dev/null; }; then
+            setsid systemd-inhibit --what=idle --who=Sunshine --why="Streaming" \
+                sleep infinity >/dev/null 2>&1 &
+            echo $! > "$pidfile"
+        fi
+        # SIGUSR1 tells hyprlock to unlock
+        pkill -USR1 -x hyprlock
+        ;;
+    stop)
+        [ -f "$pidfile" ] && kill "$(cat "$pidfile")" 2>/dev/null
+        rm -f "$pidfile"
+        ;;
+    *)
+        echo "Usage: $0 start|stop" >&2
+        exit 1
+        ;;
+esac
+exit 0
--- a/dotfiles/.config/hypr/scripts/TouchPad.sh
+++ b/dotfiles/.config/hypr/scripts/TouchPad.sh
@@ -1,32 +1,30 @@
 #!/bin/bash
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# For disabling touchpad.
-# Edit the Touchpad_Device on ~/.config/hypr/UserConfigs/Laptops.conf according to your system
-# use hyprctl devices to get your system touchpad device name
-# source https://github.com/hyprwm/Hyprland/discussions/4283?sort=new#discussioncomment-8648109
+# Toggles the laptop touchpad (XF86TouchpadToggle).
+# Finds the touchpad by name in `hyprctl devices`, so it works on any laptop
+# without hard-coding the device. The Lua config rejects `hyprctl keyword`,
+# so the device is switched with hl.device() through `hyprctl eval`.

-notif="$HOME/.config/swaync/images/ja.png"
+notif="$HOME/.config/swaync/images/note.png"
+STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"

-export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
-
-enable_touchpad() {
-    printf "true" >"$STATUS_FILE"
-    notify-send -u low -i $notif  " Enabling" " touchpad"
-    hyprctl keyword '$TOUCHPAD_ENABLED' "true" -r
-}
-
-disable_touchpad() {
-    printf "false" >"$STATUS_FILE"
-    notify-send -u low -i $notif " Disabling" " touchpad"
-    hyprctl keyword '$TOUCHPAD_ENABLED' "false" -r
-}
-
-if ! [ -f "$STATUS_FILE" ]; then
-  enable_touchpad
-else
-  if [ $(cat "$STATUS_FILE") = "true" ]; then
-    disable_touchpad
-  elif [ $(cat "$STATUS_FILE") = "false" ]; then
-    enable_touchpad
-  fi
+device=$(hyprctl devices -j | jq -r '[.mice[].name | select(test("touchpad"; "i"))][0] // empty')
+if [ -z "$device" ]; then
+  notify-send -u low -i "$notif" "Touchpad" "No touchpad found"
+  exit 1
+fi
+
+set_touchpad() {
+  printf '%s' "$1" >"$STATUS_FILE"
+  hyprctl eval "hl.device({ name = \"$device\", enabled = $1 })" >/dev/null
+  if [ "$1" = true ]; then
+    notify-send -u low -i "$notif" " Enabling" " touchpad"
+  else
+    notify-send -u low -i "$notif" " Disabling" " touchpad"
+  fi
+}
+
+if [ "$(cat "$STATUS_FILE" 2>/dev/null)" = "false" ]; then
+  set_touchpad true
+else
+  set_touchpad false
 fi
--- a/dotfiles/.config/hypr/scripts/Volume.sh
+++ b/dotfiles/.config/hypr/scripts/Volume.sh
@@ -1,143 +1,37 @@
 #!/bin/bash
-# HyprFlux — https://github.com/ahmad9059/HyprFlux
-# Scripts for volume controls for audio and mic 
+# Volume controls for audio and mic via wpctl (PipeWire).
+# Quickshell's VolumeOsd watches PipeWire directly, so no notifications here.

-iDIR="$HOME/.config/swaync/icons"
-sDIR="$HOME/.config/hypr/scripts"
+SINK="@DEFAULT_AUDIO_SINK@"
+SOURCE="@DEFAULT_AUDIO_SOURCE@"
+STEP="5%"

-# Get Volume
+# Print volume as an integer percent, or "Muted"
 get_volume() {
-    volume=$(pamixer --get-volume)
-    if [[ "$volume" -eq "0" ]]; then
+    local out
+    out=$(wpctl get-volume "$1")
+    if [[ "$out" == *MUTED* ]]; then
        echo "Muted"
    else
-        echo "$volume %"
+        awk '{ printf "%d %%\n", $2 * 100 + 0.5 }' <<< "$out"
    fi
 }

-# Get icons
-get_icon() {
-    current=$(get_volume)
-    if [[ "$current" == "Muted" ]]; then
-        echo "$iDIR/volume-mute.png"
-    elif [[ "${current%\%}" -le 30 ]]; then
-        echo "$iDIR/volume-low.png"
-    elif [[ "${current%\%}" -le 60 ]]; then
-        echo "$iDIR/volume-mid.png"
-    else
-        echo "$iDIR/volume-high.png"
-    fi
+is_muted() {
+    [[ "$(wpctl get-volume "$1")" == *MUTED* ]]
 }

-# Notify
-notify_user() {
-    if [[ "$(get_volume)" == "Muted" ]]; then
-        notify-send -e -h string:x-canonical-private-synchronous:volume_notif -h boolean:SWAYNC_BYPASS_DND:true -u low -i "$(get_icon)" " Volume:" " Muted"
-    else
-        notify-send -e -h int:value:"$(get_volume | sed 's/%//')" -h string:x-canonical-private-synchronous:volume_notif -h boolean:SWAYNC_BYPASS_DND:true -u low -i "$(get_icon)" " Volume Level:" " $(get_volume)" &&
-        "$sDIR/Sounds.sh" --volume
-    fi
-}
+# Raising/lowering while muted unmutes first, matching the old behaviour
+inc() { is_muted "$1" && wpctl set-mute "$1" 0 || wpctl set-volume -l 1.0 "$1" "$STEP+"; }
+dec() { is_muted "$1" && wpctl set-mute "$1" 0 || wpctl set-volume "$1" "$STEP-"; }

-# Increase Volume
-inc_volume() {
-    if [ "$(pamixer --get-mute)" == "true" ]; then
-        toggle_mute
-    else
-        pamixer -i 5 --allow-boost --set-limit 150 && notify_user
-    fi
-}
-
-# Decrease Volume
-dec_volume() {
-    if [ "$(pamixer --get-mute)" == "true" ]; then
-        toggle_mute
-    else
-        pamixer -d 5 && notify_user
-    fi
-}
-
-# Toggle Mute
-toggle_mute() {
-	if [ "$(pamixer --get-mute)" == "false" ]; then
-		pamixer -m && notify-send -e -u low -h boolean:SWAYNC_BYPASS_DND:true -i "$iDIR/volume-mute.png" " Mute"
-	elif [ "$(pamixer --get-mute)" == "true" ]; then
-		pamixer -u && notify-send -e -u low -h boolean:SWAYNC_BYPASS_DND:true -i "$(get_icon)" " Volume:" " Switched ON"
-	fi
-}
-
-# Toggle Mic
-toggle_mic() {
-	if [ "$(pamixer --default-source --get-mute)" == "false" ]; then
-		pamixer --default-source -m && notify-send -e -u low -h boolean:SWAYNC_BYPASS_DND:true -i "$iDIR/microphone-mute.png" " Microphone:" " Switched OFF"
-	elif [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-		pamixer -u --default-source u && notify-send -e -u low -h boolean:SWAYNC_BYPASS_DND:true -i "$iDIR/microphone.png" " Microphone:" " Switched ON"
-	fi
-}
-# Get Mic Icon
-get_mic_icon() {
-    current=$(pamixer --default-source --get-volume)
-    if [[ "$current" -eq "0" ]]; then
-        echo "$iDIR/microphone-mute.png"
-    else
-        echo "$iDIR/microphone.png"
-    fi
-}
-
-# Get Microphone Volume
-get_mic_volume() {
-    volume=$(pamixer --default-source --get-volume)
-    if [[ "$volume" -eq "0" ]]; then
-        echo "Muted"
-    else
-        echo "$volume %"
-    fi
-}
-
-# Notify for Microphone
-notify_mic_user() {
-    volume=$(get_mic_volume)
-    icon=$(get_mic_icon)
-    notify-send -e -h int:value:"$volume" -h "string:x-canonical-private-synchronous:volume_notif" -h boolean:SWAYNC_BYPASS_DND:true -u low -i "$icon"  " Mic Level:" " $volume"
-}
-
-# Increase MIC Volume
-inc_mic_volume() {
-    if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        toggle_mic
-    else
-        pamixer --default-source -i 5 && notify_mic_user
-    fi
-}
-
-# Decrease MIC Volume
-dec_mic_volume() {
-    if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        toggle-mic
-    else
-        pamixer --default-source -d 5 && notify_mic_user
-    fi
-}
-
-# Execute accordingly
-if [[ "$1" == "--get" ]]; then
-	get_volume
-elif [[ "$1" == "--inc" ]]; then
-	inc_volume
-elif [[ "$1" == "--dec" ]]; then
-	dec_volume
-elif [[ "$1" == "--toggle" ]]; then
-	toggle_mute
-elif [[ "$1" == "--toggle-mic" ]]; then
-	toggle_mic
-elif [[ "$1" == "--get-icon" ]]; then
-	get_icon
-elif [[ "$1" == "--get-mic-icon" ]]; then
-	get_mic_icon
-elif [[ "$1" == "--mic-inc" ]]; then
-	inc_mic_volume
-elif [[ "$1" == "--mic-dec" ]]; then
-	dec_mic_volume
-else
-	get_volume
-fi
+case "$1" in
+    --inc)        inc "$SINK" ;;
+    --dec)        dec "$SINK" ;;
+    --toggle)     wpctl set-mute "$SINK" toggle ;;
+    --toggle-mic) wpctl set-mute "$SOURCE" toggle ;;
+    --mic-inc)    inc "$SOURCE" ;;
+    --mic-dec)    dec "$SOURCE" ;;
+    --get-mic)    get_volume "$SOURCE" ;;
+    *)            get_volume "$SINK" ;;
+esac
--- a/dotfiles/.config/orbit/theme.toml
+++ b/dotfiles/.config/orbit/theme.toml
@@ -1,5 +0,0 @@
-accent_primary = "#007acc"
-accent_secondary = "#06b6d4"
-background = "#1e1e1e"
-foreground = "#d4d4d8"
-opacity = 0.91
--- a/dotfiles/.config/quickshell/config/Appearance.qml
+++ b/dotfiles/.config/quickshell/config/Appearance.qml
@@ -8,6 +8,11 @@ QtObject {
    // a visually distinct icon style from the rest of the bar (currently
    // just BluetoothIndicator.qml) without switching every icon over.
    readonly property string iconFontFamilyRounded: "Material Symbols Rounded"
+    // Brand logos (YouTube, Spotify, Plex...), which Material Symbols doesn't
+    // have — used by MediaPlayer.qml's per-source icon. The "Propo" build
+    // draws Nerd Font icons at full size; the Mono one squeezes them into a
+    // single character cell, which renders them noticeably smaller.
+    readonly property string brandIconFontFamily: "CaskaydiaCove Nerd Font Propo"
    // Material Symbols is a variable font. Left unset, glyphs fall back to the
    // font's default optical size (24px), which is tuned for larger rendering
    // and makes some icons (e.g. "lock") look heavier/bigger than others when
@@ -26,4 +31,23 @@ QtObject {
    readonly property int spacing: 10

    readonly property int animationDuration: 150
+
+    // Max characters for the bar's free-text labels before they're cut off
+    // with "…" (ActiveWindow.qml and MediaPlayer.qml).
+    readonly property int activeWindowMaxChars: 50
+    readonly property int mediaMaxChars: 40
+    // Tighter limits for narrow screens (the laptop's eDP-1 is 1440 logical
+    // px wide), where the full-length labels nearly run into the centre
+    // clock/weather group. Bar.qml switches when it's narrower than
+    // compactBarWidth.
+    readonly property int compactBarWidth: 1600
+    readonly property int activeWindowMaxCharsCompact: 32
+    readonly property int mediaMaxCharsCompact: 28
+
+    // Counts code points rather than UTF-16 units so emoji / some CJK
+    // aren't split in half at the cut.
+    function truncate(str, maxChars) {
+        const chars = Array.from(str || "")
+        return chars.length > maxChars ? chars.slice(0, maxChars - 1).join("").replace(/\s+$/, "") + "…" : chars.join("")
+    }
 }
--- a/dotfiles/.config/quickshell/config/VpnExclusivity.qml
+++ b/dotfiles/.config/quickshell/config/VpnExclusivity.qml
@@ -1,16 +1,45 @@
 pragma Singleton
 import QtQuick

-// Tailscale, Mullvad, and ProtonVPN all fight over the default route/DNS if
-// more than one is active at once (see VpnIndicator.qml's header comment) —
-// only one of the three should ever actually be connected. This singleton
-// is the shared signal between the two widget files: VpnIndicator.qml
-// writes Mullvad/ProtonVPN's live connection state here as it polls them;
-// TailscaleIndicator.qml reads it to back off (`tailscale down`) rather
-// than stay up alongside either one, and to refuse turning Tailscale back
-// on while one is still connected.
+// Tailscale, Mullvad, ProtonVPN, and the home UniFi WireGuard tunnel all
+// fight over the default route/DNS if more than one is active at once (see
+// VpnIndicator.qml's header comment) — only one should ever actually be
+// connected. This singleton is the shared signal between the two widget
+// files: VpnIndicator.qml writes each tunnel's live connection state here
+// as it polls them; TailscaleIndicator.qml reads it to back off (`tailscale
+// down`) rather than stay up alongside one, to refuse turning Tailscale
+// back on while one is still connected, and to bring Tailscale up on its
+// own whenever none of them is.
+//
+// TailscaleIndicator.qml publishes its own state back here too, so
+// NetworkIndicator.qml can name whichever tunnel is up under the public IP.
 QtObject {
    property bool mullvadConnected: false
    property bool protonConnected: false
-    readonly property bool commercialVpnActive: mullvadConnected || protonConnected
+    property bool homeWgConnected: false
+    readonly property bool commercialVpnActive: mullvadConnected || protonConnected || homeWgConnected
+
+    // Also published by VpnIndicator.qml: whether every provider has
+    // reported its state at least once (until then the flags above are just
+    // their defaults), and whether any of them is mid connect, disconnect or
+    // switch (when "nothing connected" is only momentary). noVpnActive is
+    // the settled "none of them is connected" that TailscaleIndicator.qml
+    // auto-connects on.
+    property bool vpnStatesKnown: false
+    property bool vpnTransitioning: false
+    readonly property bool noVpnActive: vpnStatesKnown && !commercialVpnActive && !vpnTransitioning
+
+    property bool tailscaleConnected: false
+    // Name of the exit node in use, "" if none.
+    property string tailscaleExitNode: ""
+
+    // e.g. "ProtonVPN", or "Tailscale (exit node: nas)"; "" when nothing is
+    // up. Normally one name, but lists every tunnel it sees, since one can
+    // briefly overlap another while switching.
+    readonly property string activeVpnLabel: [
+        mullvadConnected ? "Mullvad" : "",
+        protonConnected ? "ProtonVPN" : "",
+        homeWgConnected ? "Home (UniFi)" : "",
+        tailscaleConnected ? "Tailscale" + (tailscaleExitNode ? " (exit node: " + tailscaleExitNode + ")" : "") : ""
+    ].filter(Boolean).join(", ")
 }
--- a/dotfiles/.config/quickshell/modules/bar/ActiveWindow.qml
+++ b/dotfiles/.config/quickshell/modules/bar/ActiveWindow.qml
@@ -4,10 +4,9 @@ import Quickshell.Hyprland
 import "../../config"

 Text {
-    Layout.maximumWidth: 320
-    elide: Text.ElideRight
+    property bool compact: false
    font.family: Appearance.fontFamily
    font.pixelSize: Appearance.fontSizeSmall
    color: Colors.muted
-    text: Hyprland.activeToplevel ? Hyprland.activeToplevel.title : ""
+    text: Hyprland.activeToplevel ? Appearance.truncate(Hyprland.activeToplevel.title, compact ? Appearance.activeWindowMaxCharsCompact : Appearance.activeWindowMaxChars) : ""
 }
--- a/dotfiles/.config/quickshell/modules/bar/Bar.qml
+++ b/dotfiles/.config/quickshell/modules/bar/Bar.qml
@@ -16,6 +16,10 @@ PanelWindow {
    exclusiveZone: implicitHeight
    color: "transparent"

+    // Narrow screen (laptop): shorten the left-side free-text labels so they
+    // don't crowd the centre group.
+    readonly property bool compact: width < Appearance.compactBarWidth
+
    WlrLayershell.layer: WlrLayer.Top
    WlrLayershell.namespace: "quickshell:bar"

@@ -32,7 +36,8 @@ PanelWindow {
        }
        spacing: Appearance.spacing
        Workspaces { screen: bar.screen }
-        ActiveWindow {}
+        MediaPlayer { barWindow: bar; compact: bar.compact }
+        ActiveWindow { compact: bar.compact }
    }

    RowLayout {
--- a/dotfiles/.config/quickshell/modules/bar/MediaPlayer.qml
+++ b/dotfiles/.config/quickshell/modules/bar/MediaPlayer.qml
@@ -0,0 +1,470 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Hyprland
+import Quickshell.Services.Mpris
+import "../../config"
+
+// Now-playing label. A playing player always wins; otherwise the label
+// sticks to whichever player was last playing, so pausing keeps the track
+// in the bar (dimmed). Hidden once that player stops or quits.
+//
+// Left-click opens a player panel (art, seek bar, transport, shuffle/repeat);
+// middle-click toggles play/pause; right-click skips to the next track.
+Item {
+    id: root
+    implicitWidth: row.implicitWidth
+    implicitHeight: row.implicitHeight
+
+    // The bar's own PanelWindow, passed in from Bar.qml — the panel anchors
+    // to the bar so it sits flush under it rather than under this label's
+    // (shorter) text box.
+    required property var barWindow
+    // Set by Bar.qml on narrow screens — shortens the label.
+    property bool compact: false
+
+    // Last player seen playing. Becomes null by itself if that player's
+    // process exits and Quickshell destroys the object.
+    property var lastPlayer: null
+
+    readonly property var player: {
+        const players = Mpris.players.values
+        for (let i = 0; i < players.length; i++) {
+            if (players[i].isPlaying)
+                return players[i]
+        }
+        if (lastPlayer && lastPlayer.playbackState === MprisPlaybackState.Paused)
+            return lastPlayer
+        // Nothing has played since the shell started (e.g. right after a
+        // reload) — fall back to any paused player that has a track loaded.
+        for (let i = 0; i < players.length; i++) {
+            if (players[i].playbackState === MprisPlaybackState.Paused && players[i].trackTitle)
+                return players[i]
+        }
+        return null
+    }
+    readonly property bool paused: player !== null && !player.isPlaying
+
+    // --- Per-source bar icon ---
+    // First match wins. `app` is tested against the player's identity +
+    // desktop entry; `url` against the track's URL, which is how a browser
+    // tab gets told apart (YouTube vs Twitch...) since the player itself is
+    // just "Firefox"/"Zen" either way. `glyph` is a Nerd Font code point —
+    // look new ones up at https://www.nerdfonts.com/cheat-sheet.
+    readonly property var sources: [
+        { name: "YouTube",    url: /youtube\.com|youtu\.be/i,              glyph: 0xf16a,  color: "#ff0033" },
+        { name: "Twitch",     url: /twitch\.tv/i,                         glyph: 0xf0543, color: "#9146ff" },
+        { name: "SoundCloud", url: /soundcloud\.com/i,                    glyph: 0xf1be,  color: "#ff5500" },
+        { name: "Spotify",    app: /spotify/i, url: /open\.spotify\.com/i, glyph: 0xf1bc,  color: "#1db954" },
+        { name: "Plexamp",    app: /plex/i,                               glyph: 0xf06ba, color: "#e5a00d" },
+        { name: "VLC",        app: /vlc/i,                                glyph: 0xf057c, color: "#ff8800" }
+    ]
+    // Anything unmatched: a plain music note in the theme colour.
+    readonly property var defaultSource: ({ name: "Audio", glyph: 0xf075a, color: Colors.primary })
+
+    readonly property var source: {
+        if (!player)
+            return defaultSource
+        const app = [player.identity, player.desktopEntry].join(" ")
+        const url = String((player.metadata && player.metadata["xesam:url"]) || "")
+        return sources.find(s => (s.app && s.app.test(app)) || (s.url && s.url.test(url))) || defaultSource
+    }
+
+    onPlayerChanged: {
+        if (player && player.isPlaying)
+            lastPlayer = player
+        if (!player)
+            panel.visible = false
+    }
+
+    visible: player !== null
+
+    function formatTime(seconds) {
+        if (!(seconds > 0))
+            return "0:00"
+        const s = Math.floor(seconds)
+        const m = Math.floor(s / 60)
+        const h = Math.floor(m / 60)
+        const ss = String(s % 60).padStart(2, "0")
+        return h > 0 ? h + ":" + String(m % 60).padStart(2, "0") + ":" + ss : m + ":" + ss
+    }
+
+    RowLayout {
+        id: row
+        spacing: 6
+
+        // Source logo in its brand colour; greyed out while paused.
+        Text {
+            font.family: Appearance.brandIconFontFamily
+            font.pixelSize: 14
+            color: root.paused ? Colors.muted : root.source.color
+            text: String.fromCodePoint(root.source.glyph)
+        }
+
+        // CJK characters pull in a fallback font with a taller line box
+        // (16px vs 13px, baseline 2.5px lower), and centring that taller box
+        // dropped Japanese titles ~2px below ActiveWindow's text. So the label
+        // sits in a box sized from the primary font alone, positioned so its
+        // baseline lands where a plain-Latin label's would.
+        FontMetrics { id: labelMetrics; font: label.font }
+
+        Item {
+            implicitWidth: label.implicitWidth
+            implicitHeight: Math.ceil(labelMetrics.height)
+
+            Text {
+                id: label
+                y: labelMetrics.ascent - baselineOffset
+                font.family: Appearance.fontFamily
+                font.pixelSize: Appearance.fontSizeSmall
+                color: root.paused ? Colors.muted : Colors.foreground
+                text: {
+                    if (!root.player)
+                        return ""
+                    const title = root.player.trackTitle || root.player.identity
+                    const artist = root.player.trackArtist
+                    return Appearance.truncate(artist ? artist + " — " + title : title, root.compact ? Appearance.mediaMaxCharsCompact : Appearance.mediaMaxChars)
+                }
+            }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        onClicked: (mouse) => {
+            if (!root.player)
+                return
+            if (mouse.button === Qt.LeftButton) {
+                // Line the panel's left edge up with this label. Read at
+                // click time since the label's x shifts with the workspace
+                // count and isn't something the anchor can bind to.
+                panel.anchor.rect.x = root.mapToItem(null, 0, 0).x
+                panel.visible = !panel.visible
+                grab.active = panel.visible
+            } else if (mouse.button === Qt.MiddleButton) {
+                if (root.player.canTogglePlaying)
+                    root.player.togglePlaying()
+            } else if (root.player.canGoNext) {
+                root.player.next()
+            }
+        }
+    }
+
+    // MPRIS doesn't push position updates while playing (only on seeks and
+    // state changes), so poll it — only while the panel is actually showing.
+    Timer {
+        running: panel.visible && root.player !== null && root.player.isPlaying
+        interval: 1000
+        repeat: true
+        onTriggered: root.player.positionChanged()
+    }
+
+    // --- Reusable pieces -----------------------------------------------
+
+    // Same look as Volume.qml's VolumeSlider. While dragging it shows the
+    // drag position rather than `value`, so a seek bar doesn't fight the
+    // player's own position updates mid-drag; `committed` fires on release.
+    component MediaSlider: Item {
+        id: sliderRoot
+        property real value: 0
+        property bool enabled: true
+        property real dragValue: -1
+        readonly property real shownValue: dragValue >= 0 ? dragValue : value
+        signal moved(real newValue)
+        signal committed(real newValue)
+        implicitHeight: 16
+
+        Rectangle {
+            id: track
+            anchors.verticalCenter: parent.verticalCenter
+            width: parent.width
+            height: 4
+            color: Colors.muted
+            opacity: 0.35
+        }
+        Rectangle {
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            width: track.width * Math.max(0, Math.min(1, sliderRoot.shownValue))
+            height: 4
+            color: Colors.primary
+            opacity: sliderRoot.enabled ? 1 : 0.4
+        }
+        Rectangle {
+            width: 12
+            height: 12
+            radius: 6
+            color: Colors.primary
+            opacity: sliderRoot.enabled ? 1 : 0.4
+            anchors.verticalCenter: parent.verticalCenter
+            x: Math.max(0, Math.min(track.width - width, track.width * sliderRoot.shownValue - width / 2))
+        }
+        MouseArea {
+            anchors.fill: parent
+            enabled: sliderRoot.enabled
+            cursorShape: Qt.PointingHandCursor
+            function valueAt(mx) {
+                return Math.max(0, Math.min(1, mx / track.width))
+            }
+            onPressed: (mouse) => {
+                sliderRoot.dragValue = valueAt(mouse.x)
+                sliderRoot.moved(sliderRoot.dragValue)
+            }
+            onPositionChanged: (mouse) => {
+                if (!pressed)
+                    return
+                sliderRoot.dragValue = valueAt(mouse.x)
+                sliderRoot.moved(sliderRoot.dragValue)
+            }
+            onReleased: {
+                sliderRoot.committed(sliderRoot.dragValue)
+                sliderRoot.dragValue = -1
+            }
+        }
+    }
+
+    component IconButton: Item {
+        id: btn
+        property string icon: ""
+        property int size: 22
+        property bool enabled: true
+        // Filled = the big primary-coloured play/pause button.
+        property bool filled: false
+        // Active = a toggle that's switched on (shuffle/repeat), tinted primary.
+        property bool active: false
+        signal clicked()
+        implicitWidth: size + 16
+        implicitHeight: size + 16
+        opacity: enabled ? 1 : 0.35
+
+        Rectangle {
+            anchors.fill: parent
+            radius: btn.filled ? width / 2 : Appearance.radiusSmall
+            color: btn.filled ? Colors.primary
+                : btnMouse.containsMouse ? Qt.rgba(Colors.foreground.r, Colors.foreground.g, Colors.foreground.b, 0.12)
+                : "transparent"
+            Behavior on color { ColorAnimation { duration: Appearance.animationDuration } }
+        }
+        Text {
+            anchors.centerIn: parent
+            text: btn.icon
+            font.family: Appearance.iconFontFamilyRounded
+            // Filled glyphs read better than outlines at transport-button size.
+            font.variableAxes: ({ "FILL": 1, "wght": 400, "GRAD": 0, "opsz": 24 })
+            font.pixelSize: btn.size
+            color: btn.filled ? Colors.primaryText : btn.active ? Colors.primary : Colors.foreground
+        }
+        MouseArea {
+            id: btnMouse
+            anchors.fill: parent
+            enabled: btn.enabled
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: btn.clicked()
+        }
+    }
+
+    // --- Panel -----------------------------------------------------------
+
+    PopupWindow {
+        id: panel
+        visible: false
+        color: "transparent"
+        readonly property int artSize: 160
+        readonly property int contentWidth: 470
+        readonly property int contentPadding: 16
+        implicitWidth: contentWidth + contentPadding * 2
+        implicitHeight: Math.max(artSize, infoColumn.implicitHeight) + contentPadding * 2
+
+        anchor {
+            window: root.barWindow
+            // rect.x is set on click (see the MouseArea above).
+            rect.y: 0
+            rect.width: 1
+            rect.height: root.barWindow.height
+            edges: Edges.Bottom | Edges.Left
+            gravity: Edges.Bottom | Edges.Right
+            margins.bottom: -4
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [panel]
+            onCleared: panel.visible = false
+        }
+
+        Rectangle {
+            anchors.fill: parent
+            color: Colors.surface
+            border.color: Colors.muted
+            border.width: 3
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.margins: panel.contentPadding
+                spacing: 16
+
+                // Album art, or a placeholder note when the player has none.
+                Rectangle {
+                    Layout.preferredWidth: panel.artSize
+                    Layout.preferredHeight: panel.artSize
+                    Layout.alignment: Qt.AlignTop
+                    color: Colors.background
+
+                    Text {
+                        anchors.centerIn: parent
+                        visible: art.status !== Image.Ready
+                        text: "music_note"
+                        font.family: Appearance.iconFontFamilyRounded
+                        font.variableAxes: Appearance.iconFontAxes
+                        font.pixelSize: 56
+                        color: Colors.muted
+                    }
+
+                    Image {
+                        id: art
+                        anchors.fill: parent
+                        source: root.player ? root.player.trackArtUrl : ""
+                        fillMode: Image.PreserveAspectCrop
+                        sourceSize.width: panel.artSize * 2
+                        sourceSize.height: panel.artSize * 2
+                        asynchronous: true
+                        smooth: true
+                    }
+                }
+
+                ColumnLayout {
+                    id: infoColumn
+                    Layout.fillWidth: true
+                    Layout.alignment: Qt.AlignVCenter
+                    spacing: 8
+
+                    // Track info
+                    ColumnLayout {
+                        Layout.fillWidth: true
+                        spacing: 2
+
+                        Text {
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignHCenter
+                            elide: Text.ElideRight
+                            visible: text !== ""
+                            text: root.player ? root.player.trackArtist : ""
+                            font.family: Appearance.fontFamily
+                            font.pixelSize: Appearance.fontSize
+                            color: Colors.foreground
+                        }
+                        Text {
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignHCenter
+                            elide: Text.ElideRight
+                            text: root.player ? (root.player.trackTitle || root.player.identity) : ""
+                            font.family: Appearance.fontFamily
+                            font.pixelSize: 15
+                            font.bold: true
+                            color: Colors.foreground
+                        }
+                        Text {
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignHCenter
+                            elide: Text.ElideRight
+                            visible: text !== ""
+                            text: root.player ? root.player.trackAlbum : ""
+                            font.family: Appearance.fontFamily
+                            font.pixelSize: Appearance.fontSizeSmall
+                            color: Colors.muted
+                        }
+                    }
+
+                    // Seek bar
+                    RowLayout {
+                        Layout.fillWidth: true
+                        Layout.topMargin: 4
+                        spacing: 8
+                        visible: root.player !== null && root.player.lengthSupported && root.player.length > 0
+
+                        Text {
+                            Layout.preferredWidth: 36
+                            horizontalAlignment: Text.AlignRight
+                            text: root.player ? root.formatTime(seekSlider.dragValue >= 0
+                                ? seekSlider.dragValue * root.player.length : root.player.position) : ""
+                            font.family: Appearance.fontFamily
+                            font.pixelSize: Appearance.fontSizeSmall
+                            color: Colors.muted
+                        }
+                        MediaSlider {
+                            id: seekSlider
+                            Layout.fillWidth: true
+                            enabled: root.player !== null && root.player.canSeek && root.player.positionSupported
+                            value: root.player && root.player.length > 0 ? root.player.position / root.player.length : 0
+                            onCommitted: (v) => { if (root.player) root.player.position = v * root.player.length }
+                        }
+                        Text {
+                            Layout.preferredWidth: 36
+                            text: root.player ? root.formatTime(root.player.length) : ""
+                            font.family: Appearance.fontFamily
+                            font.pixelSize: Appearance.fontSizeSmall
+                            color: Colors.muted
+                        }
+                    }
+
+                    // Transport
+                    RowLayout {
+                        Layout.alignment: Qt.AlignHCenter
+                        spacing: 4
+
+                        IconButton {
+                            icon: "shuffle"
+                            size: 18
+                            visible: root.player !== null && root.player.shuffleSupported
+                            active: root.player !== null && root.player.shuffle
+                            onClicked: root.player.shuffle = !root.player.shuffle
+                        }
+                        IconButton {
+                            icon: "replay_10"
+                            size: 18
+                            visible: root.player !== null && root.player.canSeek
+                            onClicked: root.player.seek(-10)
+                        }
+                        IconButton {
+                            icon: "skip_previous"
+                            enabled: root.player !== null && root.player.canGoPrevious
+                            onClicked: root.player.previous()
+                        }
+                        IconButton {
+                            icon: root.paused ? "play_arrow" : "pause"
+                            size: 26
+                            filled: true
+                            enabled: root.player !== null && root.player.canTogglePlaying
+                            onClicked: root.player.togglePlaying()
+                        }
+                        IconButton {
+                            icon: "skip_next"
+                            enabled: root.player !== null && root.player.canGoNext
+                            onClicked: root.player.next()
+                        }
+                        IconButton {
+                            icon: "forward_10"
+                            size: 18
+                            visible: root.player !== null && root.player.canSeek
+                            onClicked: root.player.seek(10)
+                        }
+                        // Cycles off -> repeat all -> repeat one -> off.
+                        IconButton {
+                            icon: root.player && root.player.loopState === MprisLoopState.Track ? "repeat_one" : "repeat"
+                            size: 18
+                            visible: root.player !== null && root.player.loopSupported
+                            active: root.player !== null && root.player.loopState !== MprisLoopState.None
+                            onClicked: root.player.loopState =
+                                root.player.loopState === MprisLoopState.None ? MprisLoopState.Playlist
+                                : root.player.loopState === MprisLoopState.Playlist ? MprisLoopState.Track
+                                : MprisLoopState.None
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/dotfiles/.config/quickshell/modules/bar/NetworkIndicator.qml
+++ b/dotfiles/.config/quickshell/modules/bar/NetworkIndicator.qml
@@ -222,6 +222,82 @@ Item {
        root.passwordSsid = ""
    }

+    // --- Captive portal ---------------------------------------------------
+    // NetworkManager tells "portal" (a walled-garden sign-in page sits
+    // between us and the real internet) apart from "full" connectivity only
+    // via an active probe — nmcli's cached CONNECTIVITY field just reflects
+    // NM's own internal check, which runs every few minutes and is far too
+    // slow to catch a portal right after joining a network. So this forces a
+    // fresh probe itself, same shell-out approach as the stats below, and
+    // runs it whenever we're connected — not gated to panel.visible like
+    // those — since the whole point is noticing this before the popup is
+    // ever opened.
+    //
+    // "limited" is treated the same as "portal", not just "full" vs.
+    // everything-else: NM only reports "portal" when the probe request
+    // actually comes back *different* (redirected/rewritten) from what it
+    // expected. Plenty of real captive portals instead black-hole every
+    // request that isn't to their own login domain, so the probe just times
+    // out — which is also why this is slow to resolve — and NM reports
+    // "limited" (it got a route/gateway, but the internet check itself
+    // never landed) rather than "portal". From the user's side both look
+    // identical: connected, but no real internet.
+    property string connectivityState: "unknown"
+    readonly property bool connectivityRestricted: root.connectivityState === "portal" || root.connectivityState === "limited"
+
+    // A plain, unencrypted HTTP page whose only job is to be interceptable
+    // by a captive portal's redirect. An https:// URL mostly just gets
+    // silently blocked instead of redirected, which looks identical to the
+    // portal not existing at all.
+    readonly property string captivePortalCheckUrl: "http://neverssl.com/"
+
+    // Auto-opened once per network join (mirrors TailscaleIndicator's
+    // openAuthUrl/_authUrlOpened) so flapping connectivity on the same
+    // network doesn't keep popping a new browser tab — the manual "Open"
+    // button in the panel banner below still works regardless.
+    property bool _portalAutoOpened: false
+    property bool _wasConnected: false
+    onConnectedDeviceChanged: {
+        const isConnected = root.connectedDevice !== null
+        if (isConnected && !root._wasConnected) {
+            root._portalAutoOpened = false
+            root.connectivityState = "unknown"
+        }
+        root._wasConnected = isConnected
+    }
+
+    onConnectivityRestrictedChanged: {
+        if (root.connectivityRestricted && !root._portalAutoOpened)
+            root.openCaptivePortal()
+    }
+
+    function openCaptivePortal() {
+        root._portalAutoOpened = true
+        Qt.openUrlExternally(root.captivePortalCheckUrl)
+    }
+
+    Process {
+        id: connectivityProc
+        command: ["nmcli", "networking", "connectivity", "check"]
+        stdout: StdioCollector {
+            id: connectivityCollector
+            onStreamFinished: root.connectivityState = connectivityCollector.text.trim()
+        }
+    }
+
+    Timer {
+        id: connectivityTimer
+        // Poll quickly while things are still unresolved (fresh join, or an
+        // active portal we're waiting to clear) and back off once
+        // connectivity is confirmed full, rather than shelling out every
+        // few seconds forever for no reason.
+        interval: root.connectivityState === "full" ? 20000 : 3000
+        repeat: true
+        triggeredOnStart: true
+        running: root.connectedDevice !== null
+        onTriggered: if (!connectivityProc.running) connectivityProc.running = true
+    }
+
    // --- Live stats --------------------------------------------------
    // None of this comes from Quickshell's Networking API — it only knows
    // about devices/networks, not throughput, ping, or routing. So this
@@ -499,6 +575,51 @@ Item {
        }
    }

+    // Public (WAN-side) IP — nothing local knows this, the address on the
+    // interface is the LAN one behind NAT, so it has to come from an
+    // outside service. Polled much more slowly than the local stats since
+    // it's a real HTTP request and rarely changes.
+    property string publicIp: "—"
+
+    Process {
+        id: publicIpProc
+        command: ["curl", "-s", "--max-time", "5", "https://api.ipify.org"]
+        stdout: StdioCollector {
+            id: publicIpCollector
+            onStreamFinished: {
+                const ip = publicIpCollector.text.trim()
+                root.publicIp = /^[\d.]+$|^[0-9a-fA-F:]+$/.test(ip) ? ip : "—"
+            }
+        }
+    }
+
+    // Switching networks almost always changes the public IP, so don't
+    // leave the old one up until the next slow poll.
+    onConnectedNetworkNameChanged: {
+        root.publicIp = "—"
+        if (panel.visible && root.connectedDevice !== null && !publicIpProc.running)
+            publicIpProc.running = true
+    }
+
+    // Same for a VPN coming up or going down — the public IP is then the
+    // tunnel's exit (or no longer is).
+    Connections {
+        target: VpnExclusivity
+        function onActiveVpnLabelChanged() {
+            root.publicIp = "—"
+            if (panel.visible && root.connectedDevice !== null && !publicIpProc.running)
+                publicIpProc.running = true
+        }
+    }
+
+    Timer {
+        interval: 60000
+        repeat: true
+        triggeredOnStart: true
+        running: panel.visible && root.connectedDevice !== null
+        onTriggered: if (!publicIpProc.running) publicIpProc.running = true
+    }
+
    Process {
        id: bytesProc
        command: root.ifaceName
@@ -595,6 +716,34 @@ Item {
        }
    }

+    // Small warning badge over the icon's corner when the connection looks
+    // restricted (a captive portal, confirmed or just suspected — see
+    // connectivityRestricted above) — same treatment as TailscaleIndicator's
+    // login-needed badge, so "this needs your attention" reads the same way
+    // across indicators.
+    Rectangle {
+        visible: root.connectivityRestricted
+        width: Math.max(7, label.font.pixelSize * 0.42)
+        height: width
+        radius: width / 2
+        color: Colors.urgent
+        border.color: Colors.surface
+        border.width: 1
+        anchors.right: label.right
+        anchors.bottom: label.bottom
+        anchors.rightMargin: -1
+        anchors.bottomMargin: -1
+
+        Text {
+            anchors.centerIn: parent
+            text: "!"
+            color: Colors.surface
+            font.family: Appearance.fontFamily
+            font.pixelSize: Math.max(6, parent.height * 0.75)
+            font.bold: true
+        }
+    }
+
    MouseArea {
        anchors.fill: parent
        cursorShape: Qt.PointingHandCursor
@@ -890,6 +1039,133 @@ Item {

                }

+                Row {
+                    width: parent.width
+                    spacing: 4
+                    visible: root.connectedDevice !== null
+
+                    Text {
+                        text: "Public IP:"
+                        font.family: Appearance.fontFamily
+                        font.pixelSize: Appearance.fontSizeSmall
+                        color: Colors.muted
+                    }
+
+                    Text {
+                        text: root.publicIp
+                        font.family: Appearance.fontFamily
+                        font.pixelSize: Appearance.fontSizeSmall
+                        color: Colors.foreground
+                        font.bold: true
+                    }
+                }
+
+                // Which VPN (if any) the public IP above is coming through.
+                Row {
+                    width: parent.width
+                    spacing: 4
+                    visible: root.connectedDevice !== null && VpnExclusivity.activeVpnLabel !== ""
+
+                    Text {
+                        text: "VPN:"
+                        font.family: Appearance.fontFamily
+                        font.pixelSize: Appearance.fontSizeSmall
+                        color: Colors.muted
+                    }
+
+                    Text {
+                        width: parent.width - x
+                        text: VpnExclusivity.activeVpnLabel
+                        elide: Text.ElideRight
+                        font.family: Appearance.fontFamily
+                        font.pixelSize: Appearance.fontSizeSmall
+                        color: Colors.foreground
+                        font.bold: true
+                    }
+                }
+
+                // Captive portal banner — shown when the connectivity probe
+                // above finds either a confirmed sign-in page or a
+                // "limited" result standing between this network and the
+                // real internet (see connectivityRestricted). openCaptivePortal()
+                // already fired once automatically when this was first
+                // detected; this stays up as a manual retry in case that tab
+                // got closed.
+                Rectangle {
+                    width: parent.width
+                    visible: root.connectivityRestricted
+                    radius: 0
+                    color: Qt.rgba(Colors.urgent.r, Colors.urgent.g, Colors.urgent.b, 0.18)
+                    border.color: Colors.urgent
+                    border.width: 1
+                    implicitHeight: portalBannerRow.implicitHeight + 12
+
+                    RowLayout {
+                        id: portalBannerRow
+                        anchors.fill: parent
+                        anchors.margins: 6
+                        spacing: 8
+
+                        Text {
+                            text: "lock_open"
+                            font.family: Appearance.iconFontFamilyRounded
+                            font.variableAxes: Appearance.iconFontAxes
+                            font.pixelSize: 16
+                            color: Colors.urgent
+                        }
+
+                        ColumnLayout {
+                            Layout.fillWidth: true
+                            spacing: 0
+
+                            Text {
+                                Layout.fillWidth: true
+                                text: root.connectivityState === "portal" ? "Sign-in required" : "No internet access"
+                                elide: Text.ElideRight
+                                font.family: Appearance.fontFamily
+                                font.pixelSize: Appearance.fontSize
+                                font.bold: true
+                                color: Colors.foreground
+                            }
+                            Text {
+                                Layout.fillWidth: true
+                                text: root.connectivityState === "portal"
+                                    ? "This network needs a web sign-in first"
+                                    : "This network may need a web sign-in first"
+                                elide: Text.ElideRight
+                                font.family: Appearance.fontFamily
+                                font.pixelSize: Appearance.fontSizeSmall
+                                color: Colors.muted
+                            }
+                        }
+
+                        Rectangle {
+                            implicitWidth: openPortalText.implicitWidth + 16
+                            implicitHeight: 24
+                            radius: 0
+                            color: openPortalMouse.containsMouse ? Colors.urgent : "transparent"
+                            border.color: Colors.urgent
+                            border.width: 1
+
+                            Text {
+                                id: openPortalText
+                                anchors.centerIn: parent
+                                text: "Open"
+                                font.family: Appearance.fontFamily
+                                font.pixelSize: Appearance.fontSizeSmall
+                                color: openPortalMouse.containsMouse ? Colors.primaryText : Colors.urgent
+                            }
+                            MouseArea {
+                                id: openPortalMouse
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: root.openCaptivePortal()
+                            }
+                        }
+                    }
+                }
+
                // Live stats — ping/loss/throughput/IP/gateway for whichever
                // device is currently connected.
                GridLayout {
--- a/dotfiles/.config/quickshell/modules/bar/PinnedTray.qml
+++ b/dotfiles/.config/quickshell/modules/bar/PinnedTray.qml
@@ -32,7 +32,7 @@ RowLayout {
            icon: Qt.resolvedUrl("../../assets/sunshine.svg"),
            binary: "sunshine",
            launch: ["systemctl", "--user", "start", "app-dev.lizardbyte.app.Sunshine.service"],
-            secondary: ["xdg-open", "https://xol.twhomelab.local:47990"],
+            secondary: ["xdg-open", "https://xol.twhomelab.tailnet:47990"],
        },
    ]

--- a/dotfiles/.config/quickshell/modules/bar/PowerButton.qml
+++ b/dotfiles/.config/quickshell/modules/bar/PowerButton.qml
@@ -119,7 +119,7 @@ Item {
                            { label: "Lock", icon: "lock", cmd: ["hyprlock"] },
                            { label: "Suspend", icon: "bedtime", cmd: ["systemctl", "suspend"] },
                            { label: "Hibernate", icon: "ac_unit", cmd: ["systemctl", "hibernate"] },
-                            { label: "Log out", icon: "logout", cmd: ["hyprctl", "dispatch", "exit"] },
+                            { label: "Log out", icon: "logout", cmd: ["hyprctl", "dispatch", "hl.dsp.exit()"] },
                            { label: "Reboot", icon: "restart_alt", cmd: ["systemctl", "reboot"] },
                            { label: "Shut down", icon: "power_settings_new", cmd: ["systemctl", "poweroff"] }
                        ]
--- a/dotfiles/.config/quickshell/modules/bar/TailscaleIndicator.qml
+++ b/dotfiles/.config/quickshell/modules/bar/TailscaleIndicator.qml
@@ -52,11 +52,15 @@ Item {
    property bool _loginPending: false
    property bool _authUrlOpened: false

-    // Set when the VPN-exclusivity guard (below) forces Tailscale down —
-    // as opposed to you turning it off yourself — so it knows to bring
-    // Tailscale back up automatically once Mullvad/ProtonVPN disconnect,
-    // without overriding a deliberate manual "off".
-    property bool _forcedDownByVpn: false
+    // Tailscale is the fallback whenever none of the VPN providers is
+    // connected — see maybeAutoConnect(). _manualOff is set when you switch
+    // it off yourself with no provider connected, so that sticks; it's
+    // cleared once a provider connects, so Tailscale still comes back after
+    // that one disconnects. _autoConnectTried allows one automatic `up` per
+    // stretch of no provider being connected, so a failing one doesn't
+    // retry (and re-report its failure) on every poll.
+    property bool _manualOff: false
+    property bool _autoConnectTried: false

    // Other logged-in Tailscale accounts on this machine (`tailscale switch
    // --list`) — separate tailnets/identities you can flip between, not
@@ -147,6 +151,8 @@ Item {
    function applyStatus(text) {
        const next = root.parseTailscaleStatus(text)
        root.status = next
+        VpnExclusivity.tailscaleConnected = next.running
+        VpnExclusivity.tailscaleExitNode = next.running && next.activeExitNode ? next.activeExitNode.name : ""
        if (root._desired !== -1 && next.running === (root._desired === 1)) root._desired = -1
        if (next.running) {
            root._loginPending = false
@@ -159,7 +165,6 @@ Item {
            if (VpnExclusivity.commercialVpnActive && !root.busy) {
                root.busy = true
                root._desired = 0
-                root._forcedDownByVpn = true
                root.actionStatus = "Tailscale stopped — a VPN provider is active"
                actionStatusTimer.restart()
                actionProc.command = ["tailscale", "down"]
@@ -168,6 +173,22 @@ Item {
        } else if (next.needsLogin && next.authUrl !== "" && !root._authUrlOpened) {
            root.openAuthUrl(next.authUrl)
        }
+        root.maybeAutoConnect()
+    }
+
+    // Only acts on a confirmed "Stopped": not NeedsLogin (`tailscale up`
+    // would open a login page in the browser unasked), nor a daemon that
+    // isn't answering yet.
+    function shouldAutoConnect() {
+        return VpnExclusivity.noVpnActive && !root._manualOff && !root._autoConnectTried
+            && root.installed && !root.busy && root.status.backendState === "Stopped"
+    }
+
+    // Waits out autoConnectTimer first rather than connecting right away —
+    // see there.
+    function maybeAutoConnect() {
+        if (!root.shouldAutoConnect()) autoConnectTimer.stop()
+        else if (!autoConnectTimer.running) autoConnectTimer.start()
    }

    function openAuthUrl(url) {
@@ -192,10 +213,10 @@ Item {

    function toggleTailscale() {
        if (root.busy || !root.installed) return
-        // Any manual action overrides the guard's own memory of why
-        // Tailscale went down — a deliberate "off" here should stick even
-        // once the VPN it deferred to eventually disconnects.
-        root._forcedDownByVpn = false
+        // A deliberate "off" with no VPN connected shouldn't be undone by
+        // auto-connect straight away.
+        root._manualOff = root.active && !VpnExclusivity.commercialVpnActive
+        autoConnectTimer.stop()
        if (root.active) {
            root.busy = true
            root._desired = 0
@@ -204,7 +225,7 @@ Item {
            return
        }
        if (VpnExclusivity.commercialVpnActive) {
-            root.actionStatus = "Disconnect Mullvad/ProtonVPN first"
+            root.actionStatus = "Disconnect the active VPN first"
            actionStatusTimer.restart()
            return
        }
@@ -325,19 +346,34 @@ Item {
        }
    }

-    // Auto-resumes Tailscale once neither commercial VPN is connected
-    // anymore — but only if it was this guard that took Tailscale down in
-    // the first place, never overriding a manual "off".
+    // A provider connecting starts things afresh for when it next
+    // disconnects: a manual "off" from before no longer applies, and
+    // auto-connect gets a new attempt.
    Connections {
        target: VpnExclusivity
        function onCommercialVpnActiveChanged() {
-            if (!VpnExclusivity.commercialVpnActive && root._forcedDownByVpn && !root.active) {
-                root._forcedDownByVpn = false
-                root.actionStatus = "Resuming Tailscale — VPN disconnected"
-                actionStatusTimer.restart()
-                root.bringTailscaleUp()
+            if (VpnExclusivity.commercialVpnActive) {
+                root._manualOff = false
+                root._autoConnectTried = false
            }
        }
+        function onNoVpnActiveChanged() { root.maybeAutoConnect() }
+    }
+
+    // A short grace period before auto-connecting, as a backstop against
+    // momentary gaps vpnTransitioning doesn't cover (e.g. one provider's
+    // disconnect finishing a moment before the next one's connect starts).
+    Timer {
+        id: autoConnectTimer
+        interval: 3000
+        repeat: false
+        onTriggered: {
+            if (!root.shouldAutoConnect()) return
+            root._autoConnectTried = true
+            root.bringTailscaleUp()
+            root.actionStatus = "Connecting Tailscale — no VPN active"
+            actionStatusTimer.restart()
+        }
    }

    // Background poll, independent of whether the panel is open, so the bar
--- a/dotfiles/.config/quickshell/modules/bar/Volume.qml
+++ b/dotfiles/.config/quickshell/modules/bar/Volume.qml
@@ -137,15 +137,25 @@ Item {
    MouseArea {
        anchors.fill: parent
        cursorShape: Qt.PointingHandCursor
+        // Scroll distance is accumulated rather than stepping per event:
+        // a mouse wheel sends one 120-unit event per notch, but a touchpad
+        // sends a stream of tiny events, which at a fixed step per event
+        // made touchpad scrolling far too fast. One notch's worth (120) of
+        // scrolling = one volume step, regardless of input device.
+        property real wheelAccum: 0
+        readonly property real volumeStep: 0.05
+        readonly property real unitsPerStep: 120
        onClicked: {
            panel.visible = !panel.visible
            grab.active = panel.visible
        }
        onWheel: (wheel) => {
            if (!root.sink || !root.sink.audio) return
-            const step = 0.05
-            const delta = wheel.angleDelta.y > 0 ? step : -step
-            root.sink.audio.volume = Math.max(0, Math.min(1, root.sink.audio.volume + delta))
+            wheelAccum += wheel.angleDelta.y
+            const steps = Math.trunc(wheelAccum / unitsPerStep)
+            if (steps === 0) return
+            wheelAccum -= steps * unitsPerStep
+            root.sink.audio.volume = Math.max(0, Math.min(1, root.sink.audio.volume + steps * volumeStep))
        }
    }

--- a/dotfiles/.config/quickshell/modules/bar/VpnIndicator.qml
+++ b/dotfiles/.config/quickshell/modules/bar/VpnIndicator.qml
--- a/dotfiles/.config/quickshell/modules/bar/Workspaces.qml
+++ b/dotfiles/.config/quickshell/modules/bar/Workspaces.qml
@@ -37,7 +37,8 @@ RowLayout {
            MouseArea {
                anchors.fill: parent
                cursorShape: Qt.PointingHandCursor
-                onClicked: Hyprland.dispatch("workspace " + modelData.name)
+                // Hyprland's Lua config expects Lua syntax from dispatch
+                onClicked: Hyprland.dispatch("hl.dsp.focus({ workspace = " + JSON.stringify(modelData.id > 0 ? modelData.id : modelData.name) + " })")
            }
        }
    }
--- a/dotfiles/.config/quickshell/modules/osd/VolumeOsd.qml
+++ b/dotfiles/.config/quickshell/modules/osd/VolumeOsd.qml
@@ -11,16 +11,13 @@ PanelWindow {
    color: "transparent"
    exclusiveZone: 0

-    // Top-right, just under the bar — same fixed distance from the bar and
-    // screen edge (Appearance.spacing) that every popup opened from the bar
-    // itself uses, so this lines up with them instead of floating
-    // bottom-center.
-    anchors { top: true; right: true }
-    margins.top: Appearance.spacing
-    margins.right: Appearance.spacing
+    // Bottom-center: anchoring only the bottom edge lets the layer shell
+    // center it horizontally.
+    anchors { bottom: true }
+    margins.bottom: Appearance.spacing * 4

-    implicitWidth: 272
-    implicitHeight: 54
+    implicitWidth: 300
+    implicitHeight: 60

    WlrLayershell.layer: WlrLayer.Overlay
    WlrLayershell.namespace: "quickshell:osd"
@@ -49,13 +46,13 @@ PanelWindow {

        RowLayout {
            anchors.fill: parent
-            anchors.margins: 14
-            spacing: 12
+            anchors.margins: 15
+            spacing: 13

            Text {
                font.family: Appearance.iconFontFamilyRounded
                font.variableAxes: Appearance.iconFontAxes
-                font.pixelSize: 18
+                font.pixelSize: 21
                color: Colors.foreground
                text: {
                    const audio = osd.sink ? osd.sink.audio : null
@@ -67,7 +64,7 @@ PanelWindow {
            Item {
                id: slider
                Layout.fillWidth: true
-                implicitHeight: 16
+                implicitHeight: 18

                readonly property real value: osd.sink && osd.sink.audio ? osd.sink.audio.volume : 0
                readonly property bool enabled: !!osd.sink
@@ -76,7 +73,7 @@ PanelWindow {
                    id: track
                    anchors.verticalCenter: parent.verticalCenter
                    width: parent.width
-                    height: 4
+                    height: 5
                    radius: 0
                    color: Colors.muted
                    opacity: 0.35
@@ -85,15 +82,15 @@ PanelWindow {
                    anchors.verticalCenter: parent.verticalCenter
                    anchors.left: parent.left
                    width: track.width * Math.max(0, Math.min(1, slider.value))
-                    height: 4
+                    height: 5
                    radius: 0
                    color: Colors.primary
                    opacity: slider.enabled ? 1 : 0.4
                }
                Rectangle {
-                    width: 12
-                    height: 12
-                    radius: 6
+                    width: 14
+                    height: 14
+                    radius: 7
                    color: Colors.primary
                    opacity: slider.enabled ? 1 : 0.4
                    anchors.verticalCenter: parent.verticalCenter
@@ -113,10 +110,10 @@ PanelWindow {
            }

            Text {
-                Layout.preferredWidth: 32
+                Layout.preferredWidth: 38
                horizontalAlignment: Text.AlignRight
                font.family: Appearance.fontFamily
-                font.pixelSize: Appearance.fontSizeSmall
+                font.pixelSize: 13
                color: Colors.muted
                text: Math.round(slider.value * 100) + "%"
            }
--- a/dotfiles/.config/quickshell/scripts/CheckQuickshellSetup.sh
+++ b/dotfiles/.config/quickshell/scripts/CheckQuickshellSetup.sh
@@ -159,6 +159,21 @@ if [ $have_mullvad -eq 0 ] && [ $have_proton -eq 0 ]; then
    warn "neither Mullvad nor ProtonVPN CLI is installed — VpnIndicator.qml will show both as 'Not installed'"
 fi

+# Keep in sync with homeWgConnection in VpnIndicator.qml.
+if nmcli -g connection.type connection show unifi-home >/dev/null 2>&1; then
+    pass "NetworkManager profile 'unifi-home' exists — used by VpnIndicator.qml (Home/UniFi row)"
+else
+    warn "no NetworkManager profile 'unifi-home' — import one from the VPN panel's 'Add config' button (optional)"
+fi
+
+# The 'Add config' button's file chooser (scripts/PickFile.py) talks to
+# xdg-desktop-portal over D-Bus via PyGObject.
+if python3 -c "from gi.repository import Gio" >/dev/null 2>&1; then
+    pass "PyGObject available — used by PickFile.py (VPN 'Add config' file chooser)"
+else
+    warn "PyGObject (python-gobject) missing — the VPN panel's 'Add config' button can't open a file chooser"
+fi
+
 # --- 4. VPN daemons + functional status (Mullvad/ProtonVPN/Tailscale) -------
 # The exclusivity logic (VpnExclusivity.qml backing off Tailscale when a
 # commercial VPN connects) is pure QML and ships with the dotfiles — it
--- a/dotfiles/.config/quickshell/scripts/ImportUnifiWireguard.sh
+++ b/dotfiles/.config/quickshell/scripts/ImportUnifiWireguard.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+# Imports a UniFi WireGuard VPN Server client config into NetworkManager
+# under the profile name VpnIndicator.qml expects (homeWgConnection,
+# "unifi-home" by default), so the bar's VPN panel can toggle it.
+#
+# Get the .conf from UniFi Network: Settings → VPN → VPN Server → your
+# WireGuard server → Add Client → Download.
+#
+# Usage: ./ImportUnifiWireguard.sh <client.conf> [profile-name] [--replace]
+#        ./ImportUnifiWireguard.sh --pick [profile-name] [--replace]
+#
+# --pick opens a file chooser (PickFile.py) instead of taking a path — this
+# is what the VPN panel's "Add config" button runs. Exits 3 if cancelled.
+#
+# NetworkManager names both the profile and the interface after the file's
+# basename, so the config is copied to <profile-name>.conf first (interface
+# names max out at 15 chars). The private key ends up in a root-only file
+# under /etc/NetworkManager/system-connections — delete the downloaded
+# .conf afterwards.
+
+set -euo pipefail
+
+replace=0
+pick=0
+args=()
+for a in "$@"; do
+    case "$a" in
+        --replace) replace=1 ;;
+        --pick) pick=1 ;;
+        -h|--help) sed -n '2,19p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
+        *) args+=("$a") ;;
+    esac
+done
+
+if [ $pick -eq 1 ]; then
+    conf=""
+    name="${args[0]:-unifi-home}"
+    rc=0
+    conf=$("$(dirname "$0")/PickFile.py" "Select UniFi WireGuard config" "*.conf") || rc=$?
+    if [ $rc -eq 1 ]; then echo "Cancelled" >&2; exit 3; fi
+    if [ $rc -ne 0 ]; then echo "Couldn't open a file chooser" >&2; exit 1; fi
+else
+    conf="${args[0]:-}"
+    name="${args[1]:-unifi-home}"
+fi
+
+if [ -z "$conf" ] || [ ! -f "$conf" ]; then
+    echo "Usage: $0 <client.conf> [profile-name] [--replace]" >&2
+    exit 1
+fi
+if ! [[ "$name" =~ ^[A-Za-z0-9_-]{1,15}$ ]]; then
+    echo "Profile name must be 1-15 chars of [A-Za-z0-9_-] (it doubles as the interface name)" >&2
+    exit 1
+fi
+
+if nmcli -g connection.id connection show "$name" >/dev/null 2>&1; then
+    if [ $replace -eq 1 ]; then
+        nmcli connection delete "$name" >/dev/null
+    else
+        echo "A NetworkManager profile named '$name' already exists — rerun with --replace to overwrite it" >&2
+        exit 1
+    fi
+fi
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+install -m 600 "$conf" "$tmpdir/$name.conf"
+
+if ! grep -qi '^\[Interface\]' "$tmpdir/$name.conf" || ! grep -qi '^\[Peer\]' "$tmpdir/$name.conf"; then
+    echo "$(basename "$conf") doesn't look like a WireGuard config" >&2
+    exit 1
+fi
+
+nmcli connection import type wireguard file "$tmpdir/$name.conf"
+# Only ever brought up deliberately from the bar — never on boot or on
+# joining a network, where it'd silently fight Tailscale/Mullvad/ProtonVPN.
+nmcli connection modify "$name" connection.autoconnect no
+# Import itself defaults to autoconnect=yes, so NetworkManager may already
+# have started bringing it up in the moment before the modify above.
+nmcli connection down "$name" >/dev/null 2>&1 || true
+
+echo
+echo "Imported as '$name'. Toggle it from the VPN panel, or: nmcli connection up $name"
+echo "You can now delete $conf"
--- a/dotfiles/.config/quickshell/scripts/PickFile.py
+++ b/dotfiles/.config/quickshell/scripts/PickFile.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+# Opens the xdg-desktop-portal file chooser and prints the picked file's
+# path. Quickshell has no usable file dialog of its own (QtQuick.Dialogs'
+# fallback renders inside the calling window, i.e. the tiny bar popup), and
+# no zenity/kdialog is installed — the portal goes through
+# xdg-desktop-portal-gtk, which is.
+#
+# Usage: PickFile.py [title] [glob ...]
+# Exits 0 and prints the path on a pick, 1 on cancel, 2 on error.
+
+import os
+import sys
+from urllib.parse import unquote, urlparse
+
+from gi.repository import Gio, GLib
+
+title = sys.argv[1] if len(sys.argv) > 1 else "Open File"
+globs = sys.argv[2:]
+
+try:
+    bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+except GLib.Error as e:
+    print(f"No session bus: {e.message}", file=sys.stderr)
+    sys.exit(2)
+
+# The portal answers on a Request object whose path is derived from our
+# unique bus name and handle_token, so subscribe to it before calling —
+# otherwise a fast response could arrive before we're listening.
+token = f"quickshell_{os.getpid()}"
+sender = bus.get_unique_name().lstrip(":").replace(".", "_")
+handle = f"/org/freedesktop/portal/desktop/request/{sender}/{token}"
+
+loop = GLib.MainLoop()
+result = {"code": 2, "uris": []}
+
+
+def on_response(_conn, _sender, _path, _iface, _signal, params):
+    code, results = params.unpack()
+    result["code"] = code
+    result["uris"] = results.get("uris", [])
+    loop.quit()
+
+
+bus.signal_subscribe("org.freedesktop.portal.Desktop", "org.freedesktop.portal.Request",
+                     "Response", handle, None, Gio.DBusSignalFlags.NONE, on_response)
+
+options = {
+    "handle_token": GLib.Variant("s", token),
+    "modal": GLib.Variant("b", True),
+}
+filters = []
+if globs:
+    filters.append((", ".join(globs), [(0, g) for g in globs]))
+filters.append(("All files", [(0, "*")]))
+options["filters"] = GLib.Variant("a(sa(us))", filters)
+downloads = os.path.expanduser("~/Downloads")
+if os.path.isdir(downloads):
+    options["current_folder"] = GLib.Variant("ay", downloads.encode() + b"\0")
+
+try:
+    bus.call_sync("org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop",
+                  "org.freedesktop.portal.FileChooser", "OpenFile",
+                  GLib.Variant("(ssa{sv})", ("", title, options)),
+                  GLib.VariantType("(o)"), Gio.DBusCallFlags.NONE, -1, None)
+except GLib.Error as e:
+    print(f"File chooser portal unavailable: {e.message}", file=sys.stderr)
+    sys.exit(2)
+
+loop.run()
+
+# Response codes: 0 = picked, 1 = cancelled, 2 = other failure.
+if result["code"] != 0 or not result["uris"]:
+    sys.exit(1 if result["code"] == 1 else 2)
+print(unquote(urlparse(result["uris"][0]).path))
--- a/dotfiles/.config/quickshell/scripts/VpnPackage.sh
+++ b/dotfiles/.config/quickshell/scripts/VpnPackage.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Installs or uninstalls one of the VPN clients the bar's VPN panel drives
+# (VpnIndicator.qml's Install / Uninstall links), along with its system
+# service. Both packages are in Arch's official repos.
+#
+# Usage: ./VpnPackage.sh install|uninstall mullvad|proton
+#
+# This runs from the bar with no terminal to type a sudo password into, so
+# the root part goes through pkexec (the polkit agent's password dialog),
+# same as update-system.sh's Ghostty install. Exits 3 if that dialog is
+# dismissed.
+#
+# Services: proton-vpn-daemon's own pacman hooks enable proton.VPN.service
+# on install and disable it on removal. Mullvad's package only prints a
+# reminder, so its daemon is enabled/disabled here.
+
+set -euo pipefail
+
+action="${1:-}"
+vpn="${2:-}"
+
+case "$vpn" in
+    mullvad) pkg=mullvad-vpn-daemon ;;
+    proton) pkg=proton-vpn-cli ;;
+    *) echo "Usage: $0 install|uninstall mullvad|proton" >&2; exit 1 ;;
+esac
+
+case "$action" in
+    install)
+        root_cmd="pacman -S --needed --noconfirm $pkg"
+        if [ "$vpn" = mullvad ]; then
+            root_cmd+=" && systemctl enable --now mullvad-daemon.service"
+        fi
+        ;;
+    uninstall)
+        # Take the tunnel down cleanly first, rather than have it pulled out
+        # from under the network by the service stopping. For Mullvad, also
+        # turn lockdown mode off — otherwise its block-everything firewall
+        # rules can outlive the daemon.
+        if [ "$vpn" = mullvad ] && command -v mullvad &> /dev/null; then
+            mullvad lockdown-mode set off &> /dev/null || true
+            mullvad disconnect --wait &> /dev/null || true
+        elif [ "$vpn" = proton ] && command -v protonvpn &> /dev/null; then
+            protonvpn disconnect &> /dev/null || true
+        fi
+        root_cmd="pacman -Rns --noconfirm $pkg"
+        if [ "$vpn" = mullvad ]; then
+            root_cmd="systemctl disable --now mullvad-daemon.service mullvad-early-boot-blocking.service &> /dev/null; $root_cmd"
+        fi
+        ;;
+    *) echo "Usage: $0 install|uninstall mullvad|proton" >&2; exit 1 ;;
+esac
+
+rc=0
+pkexec bash -c "$root_cmd" || rc=$?
+# 126: the password dialog was dismissed.
+if [ $rc -eq 126 ]; then echo "Cancelled" >&2; exit 3; fi
+exit $rc
--- a/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh
+++ b/dotfiles/.config/quickshell/scripts/sync-dotfiles.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Run by update-system.sh inside the update terminal, before the system
+# update — pulls the dotfiles repo and re-stows it so both machines pick up
+# config changes on every update.
+#
+# Never fails the update: a pull that can't fast-forward (local commits or
+# uncommitted changes in the way) or a stow conflict just prints a warning
+# and leaves things as they were, then the system update carries on.
+
+DOTFILES="$HOME/Projects/dotfiles"
+
+warn() { printf '\033[1;33m%s\033[0m\n' "$*"; }
+info() { printf '\033[1;36m%s\033[0m\n' "$*"; }
+
+if [ ! -d "$DOTFILES/.git" ]; then
+  warn "Dotfiles repo not found at $DOTFILES — skipping."
+  exit 0
+fi
+
+info "Pulling dotfiles..."
+# Fetch and merge separately so the warning says which one went wrong — the
+# remote is SSH via Bitwarden's agent, so a failed fetch is almost always
+# Bitwarden being closed or locked.
+if ! git -C "$DOTFILES" fetch; then
+  warn "Couldn't reach the dotfiles remote — is Bitwarden open and unlocked? Skipping stow."
+  echo
+  exit 0
+fi
+# --ff-only so a diverged branch never produces a surprise merge commit;
+# sort that out by hand instead.
+if ! git -C "$DOTFILES" merge --ff-only; then
+  warn "Couldn't fast-forward dotfiles (local changes or diverged branch) — skipping stow."
+  echo
+  exit 0
+fi
+
+if ! command -v stow &> /dev/null; then
+  warn "stow not installed — skipping."
+  exit 0
+fi
+
+info "Applying dotfiles with stow..."
+# Real dirs first, or stow links the whole folder into the repo (see bootstrap.sh)
+mkdir -p "$HOME/.local/share/fonts"
+# -R restows: drops links for files removed from the repo and adds new ones.
+if stow -R -d "$DOTFILES" -t "$HOME" dotfiles; then
+  info "Dotfiles applied."
+  fc-cache "$HOME/.local/share/fonts" >/dev/null 2>&1
+else
+  warn "stow hit a conflict — nothing was changed. Fix it and re-run:"
+  warn "  stow -R -d $DOTFILES -t ~ dotfiles"
+fi
+echo
--- a/dotfiles/.config/quickshell/scripts/update-system.sh
+++ b/dotfiles/.config/quickshell/scripts/update-system.sh
@@ -6,38 +6,37 @@
 # this machine is Arch, since these dotfiles aren't.
 #
 # The window it opens is floated + centered by a matching Hyprland rule
-# (system-update-terminal, in .config/hypr/UserConfigs/WindowRules.conf),
+# (system-update-terminal, in .config/hypr/layout/windowrules.lua),
 # same treatment as Bitwarden's window, rather than tiling into whatever
 # workspace you happened to be on.

 iDIR="$HOME/.config/swaync/images"

-if ! command -v foot &> /dev/null; then
-  notify-send -i "$iDIR/error.png" "Need foot:" "foot terminal not found. Please install foot terminal."
-  exit 1
-fi
-
 # Printed inside the terminal before the actual update command runs, so it
 # reads as "updating" from the first frame rather than looking like an
 # empty/stuck window while pacman/apt/etc. take a moment to start printing.
 #
-# foot runs this in a fresh `bash -c`, which doesn't inherit shell functions
-# from this script's own environment (export -f only reaches bash processes
-# forked from *this* one, not whatever foot execs) — so instead, the
-# already-colored text is built once here with real escape bytes ($'...'),
-# then %q-quoted into a self-contained `echo '...'` that reproduces those
-# same bytes verbatim when the child bash parses it.
+# The terminal runs this in a fresh `bash -c`, which doesn't inherit shell
+# functions from this script's own environment (export -f only reaches bash
+# processes forked from *this* one, not whatever the terminal execs) — so
+# instead, the already-colored text is built once here with real escape
+# bytes ($'...'), then %q-quoted into a self-contained `echo '...'` that
+# reproduces those same bytes verbatim when the child bash parses it.
 msg="  Updating System — please wait  "
 line=$(printf '=%.0s' $(seq 1 ${#msg}))
 banner_text=$'\033[1;36m'"$line"$'\033[0m\n\033[1;36m'"$msg"$'\033[0m\n\033[1;36m'"$line"$'\033[0m\n\n'
 BANNER="echo $(printf '%q' "$banner_text")"

+# GHOSTTY_INSTALL is how to install the terminal on this distro, if it's
+# packaged there at all — only Arch ships it in the official repos.
 if command -v paru &> /dev/null; then
  CMD="paru -Syu"
  LABEL="Arch-based system"
+  GHOSTTY_INSTALL="pacman -S --needed --noconfirm ghostty"
 elif command -v yay &> /dev/null; then
  CMD="yay -Syu"
  LABEL="Arch-based system"
+  GHOSTTY_INSTALL="pacman -S --needed --noconfirm ghostty"
 elif command -v dnf &> /dev/null; then
  CMD="sudo dnf update --refresh -y"
  LABEL="Fedora system"
@@ -52,11 +51,55 @@ else
  exit 1
 fi

+# --- Terminal: Ghostty, offering to install it if missing ---
+# This runs from the bar with no terminal of its own, so there's nowhere to
+# type a sudo password — the install goes through pkexec instead, which
+# pops up the polkit agent's graphical password prompt. Declining (or a
+# failed install) falls back to foot for this run, so updating never gets
+# blocked on the terminal choice.
+if ! command -v ghostty &> /dev/null; then
+  if [ -n "$GHOSTTY_INSTALL" ]; then
+    # -A waits for a click and prints the chosen action's name (nothing if
+    # the notification is dismissed instead).
+    choice=$(notify-send -i "$iDIR/error.png" -u critical \
+      -A install="Install Ghostty" -A foot="Use foot this time" \
+      "Ghostty not installed" "The system updater runs in Ghostty. Install it now?")
+    if [ "$choice" = "install" ]; then
+      if pkexec $GHOSTTY_INSTALL; then
+        notify-send -i "$iDIR/profile-pic.jpg" -u low "Ghostty installed" "Starting the update..."
+      else
+        notify-send -i "$iDIR/error.png" "Ghostty install failed" "Using foot for this update."
+      fi
+    fi
+  else
+    notify-send -i "$iDIR/error.png" "Ghostty not installed" \
+      "Install Ghostty for the system updater — using foot for now."
+  fi
+fi
+
+if command -v ghostty &> /dev/null; then
+  # --gtk-single-instance=false: otherwise, with a Ghostty window already
+  # open, this would just hand the window off to that running instance and
+  # return immediately — SystemUpdates.qml relies on this script blocking
+  # until the update window is closed (that's when it re-checks the count),
+  # and the "has been updated" notification below would fire up front.
+  TERMINAL=(ghostty --gtk-single-instance=false --title=update -e)
+elif command -v foot &> /dev/null; then
+  TERMINAL=(foot -T update)
+else
+  notify-send -i "$iDIR/error.png" "Need a terminal:" "Neither Ghostty nor foot is installed."
+  exit 1
+fi
+
 # Keeps the terminal open (whether the update succeeded or failed — read
 # always runs regardless, since it's ; not &&) until you press Enter,
-# instead of foot closing the instant the update command exits and taking
-# any output/errors with it.
+# instead of the terminal closing the instant the update command exits and
+# taking any output/errors with it.
 WAIT_PROMPT="echo; read -p 'Update finished — press Enter to close...'"

-foot -T update bash -c "$BANNER; $CMD; $WAIT_PROMPT"
+# Pull + re-stow the dotfiles first, so config changes from the other machine
+# land alongside the package update.
+SYNC="$(printf '%q' "$(dirname "$0")/sync-dotfiles.sh")"
+
+"${TERMINAL[@]}" bash -c "$BANNER; $SYNC; $CMD; $WAIT_PROMPT"
 notify-send -i "$iDIR/profile-pic.jpg" -u low "$LABEL" 'has been updated.'
--- a/dotfiles/.config/sunshine/.gitignore
+++ b/dotfiles/.config/sunshine/.gitignore
@@ -0,0 +1,5 @@
+# Machine-local Sunshine state lives next to the stowed config; never commit it
+credentials/
+*.log
+*.log.*
+sunshine_state.json
--- a/dotfiles/.config/sunshine/apps.json
+++ b/dotfiles/.config/sunshine/apps.json
@@ -0,0 +1,47 @@
+{
+  "env": {
+    "PATH": "$(PATH):$(HOME)/.local/bin"
+  },
+  "apps": [
+    {
+      "name": "Desktop",
+      "image-path": "desktop.png"
+    },
+    {
+      "name": "Low Res Desktop",
+      "image-path": "desktop.png",
+      "prep-cmd": [
+        {
+          "do": "xrandr --output HDMI-1 --mode 1920x1080",
+          "undo": "xrandr --output HDMI-1 --mode 1920x1200"
+        }
+      ]
+    },
+    {
+      "name": "Steam Big Picture",
+      "detached": [
+        "setsid steam steam://open/bigpicture"
+      ],
+      "prep-cmd": [
+        {
+          "do": "/home/thomas/.config/sunshine/scripts/steam-bigpicture-prep.sh",
+          "undo": "setsid steam steam://close/bigpicture"
+        }
+      ],
+      "image-path": "steam.png"
+    },
+    {
+      "name": "Steam Big Picture (TV)",
+      "detached": [
+        "setsid steam steam://open/bigpicture"
+      ],
+      "prep-cmd": [
+        {
+          "do": "/home/thomas/.config/sunshine/scripts/steam-bigpicture-tv-prep.sh",
+          "undo": "/home/thomas/.config/sunshine/scripts/steam-bigpicture-tv-undo.sh"
+        }
+      ],
+      "image-path": "steam.png"
+    }
+  ]
+}
--- a/dotfiles/.config/sunshine/scripts/steam-bigpicture-prep.sh
+++ b/dotfiles/.config/sunshine/scripts/steam-bigpicture-prep.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Run before Sunshine launches Steam Big Picture: focus the headless virtual
+# monitor and park the cursor on it, so Big Picture (which spawns on whatever
+# monitor currently has focus/the mouse) opens there instead of wherever the
+# mouse happened to be.
+set -e
+hyprctl dispatch 'hl.dsp.focus({monitor = "HEADLESS-1"})'
+hyprctl dispatch 'hl.dsp.cursor.move({x = 5344, y = 540})'
+
+# Sunshine only flips the system default audio sink to sink-sunshine-stereo
+# after the streaming session/client handshake completes (~500ms after this
+# script runs and Steam is spawned) — see sunshine.log timestamps. If Steam's
+# own audio (SDL) initializes in that window, it binds to whatever was
+# default at the time (the real HDMI output) and never re-homes even after
+# Sunshine's swap. Set it here first so it's already correct before Steam
+# ever launches; Sunshine's own (redundant) swap right after is harmless.
+pactl set-default-sink sink-sunshine-stereo || true
--- a/dotfiles/.config/sunshine/scripts/steam-bigpicture-tv-prep.sh
+++ b/dotfiles/.config/sunshine/scripts/steam-bigpicture-tv-prep.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Run before Sunshine launches Steam Big Picture for the 4K TV target.
+# Switches the headless virtual monitor from its default 1728x1080@60
+# (used for the Steam Deck target) up to 3840x2160@60, then focuses it
+# and parks the cursor there so Big Picture opens on it. Reverted by
+# steam-bigpicture-tv-undo.sh once the stream ends.
+set -e
+# NOTE: this Hyprland build uses the Lua config layer, which rejects the
+# usual `hyprctl keyword monitor ...` syntax ("keyword can't work with
+# non-legacy parsers. Use eval.") — hl.monitor() via `hyprctl eval` is the
+# runtime equivalent of the hl.monitor() call in layout/monitors.lua.
+hyprctl eval 'hl.monitor({ output = "HEADLESS-1", mode = "3840x2160@60.00000", position = "4480x0", scale = 1.00000000, transform = 0, vrr = 0 })'
+hyprctl dispatch 'hl.dsp.focus({monitor = "HEADLESS-1"})'
+hyprctl dispatch 'hl.dsp.cursor.move({x = 6400, y = 1080})'
+
+# See steam-bigpicture-prep.sh for why this runs here instead of relying on
+# Sunshine's own post-handshake audio-sink swap.
+pactl set-default-sink sink-sunshine-stereo || true
--- a/dotfiles/.config/sunshine/scripts/steam-bigpicture-tv-undo.sh
+++ b/dotfiles/.config/sunshine/scripts/steam-bigpicture-tv-undo.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Undo for steam-bigpicture-tv-prep.sh: close Big Picture and restore
+# HEADLESS-1 to its default mode (the one the Steam Deck target expects).
+set -e
+setsid steam steam://close/bigpicture
+hyprctl eval 'hl.monitor({ output = "HEADLESS-1", mode = "1728x1080@60.00000", position = "4480x0", scale = 1.00000000, transform = 0, vrr = 0 })'
--- a/dotfiles/.config/sunshine/scripts/sunshine-games.sh
+++ b/dotfiles/.config/sunshine/scripts/sunshine-games.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Sunshine global_prep_cmd: make games launched during a stream open on the
+# headless stream output instead of whichever physical monitor had focus.
+#   start -> enable the "sunshine-games" Hyprland window rule (layout/windowrules.lua:
+#            steam_app_* -> workspace 9 on HEADLESS-1, fullscreen) and make
+#            HEADLESS-1 the XWayland primary output, which Wine/Proton uses for
+#            fullscreen mode changes and scaling
+#   stop  -> disable the rule and clear the primary output again
+# Games that pick their render size at launch (KOTOR etc.) otherwise come up
+# on a desk monitor and stay tiny in a corner when moved to the stream.
+
+case "$1" in
+    start)
+        hyprctl eval 'SunshineGamesRule:set_enabled(true)'
+        xrandr --output HEADLESS-1 --primary 2>/dev/null
+        ;;
+    stop)
+        hyprctl eval 'SunshineGamesRule:set_enabled(false)'
+        xrandr --noprimary 2>/dev/null
+        ;;
+    *)
+        echo "Usage: $0 start|stop" >&2
+        exit 1
+        ;;
+esac
+exit 0
--- a/dotfiles/.config/sunshine/sunshine.conf
+++ b/dotfiles/.config/sunshine/sunshine.conf
@@ -0,0 +1,5 @@
+audio_sink = sink-sunshine-stereo
+csrf_allowed_origins = https://xol.twhomelab.local:47990
+nvenc_preset = 4
+output_name = HEADLESS-1
+global_prep_cmd = [{"do":"/home/thomas/.config/hypr/scripts/SunshineIdle.sh start","undo":"/home/thomas/.config/hypr/scripts/SunshineIdle.sh stop"},{"do":"/home/thomas/.config/sunshine/scripts/sunshine-games.sh start","undo":"/home/thomas/.config/sunshine/scripts/sunshine-games.sh stop"}]
--- a/dotfiles/.config/swaync/config.json
+++ b/dotfiles/.config/swaync/config.json
@@ -56,15 +56,15 @@
      "actions": [
        {
          "label": "󰐥",
-          "command": "bash -c $HOME/.config/hypr/scripts/Wlogout.sh"
+          "command": "bash -c $HOME/.config/rofi/powermenu/type-2/powermenu.sh"
        },
        {
          "label": "󰌾",
-          "command": "bash -c $HOME/.config/hypr/scripts/LockScreen.sh"
+          "command": "loginctl lock-session"
        },
        {
          "label": "󰍃",
-          "command": "hyprctl dispatch exit"
+          "command": "hyprctl dispatch 'hl.dsp.exit()'"
        },
        {
          "label": "󰀝",
--- a/dotfiles/.config/systemd/user/vpn-notify.service
+++ b/dotfiles/.config/systemd/user/vpn-notify.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Desktop notifications for VPN connect/disconnect
+PartOf=graphical-session.target
+After=graphical-session.target
+
+[Service]
+ExecStart=%h/.local/bin/vpn-notify
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=graphical-session.target
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -13,7 +13,7 @@
        "tooltip-format": "{ipaddr} via {gwaddr}",
        "tooltip-format-disconnected": "Disconnected",
        "max-length": 50,
-        "on-click": "orbit toggle top-right",
+        "on-click": "nm-connection-editor",
        "on-click-right": "kitty -e nmtui",
        "format-icons": {
            "wifi": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
--- a/dotfiles/.config/xfce4/helpers.rc
+++ b/dotfiles/.config/xfce4/helpers.rc
@@ -0,0 +1 @@
+TerminalEmulator=ghostty
--- a/dotfiles/.local/bin/Plex
+++ b/dotfiles/.local/bin/Plex
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Wrapper for the plex-desktop package's /usr/bin/Plex (-> /opt/plex-desktop/Plex.sh).
+#
+# QT_QUICK_CONTROLS_STYLE=org.hyprland.style is set globally in
+# hypr/core/env.lua for other Qt/QML apps' theming (hyprland-qt-support), but
+# Plex Desktop bundles its own private Qt/QML runtime that doesn't ship that
+# style plugin — inheriting the var makes it fail to load its UI and exit
+# immediately with "module \"org.hyprland.style\" is not installed" (see
+# ~/.local/share/plex/Logs/Plex.log). This dir is first on $PATH, so it
+# shadows /usr/bin/Plex for both a terminal launch and the .desktop entry
+# (Exec=Plex is PATH-resolved) without touching the global env var.
+# QT_QPA_PLATFORM: hypr env sets "wayland;xcb"; under Wayland the bundled
+# QtWebEngine never runs the web client and the window stays blank.
+unset QT_QUICK_CONTROLS_STYLE
+export QT_QPA_PLATFORM=xcb
+# Unset in the session; without it the X11 cursor in Plex is huge.
+export XCURSOR_SIZE=24
+exec /opt/plex-desktop/Plex.sh "$@"
--- a/dotfiles/.local/bin/vpn-notify
+++ b/dotfiles/.local/bin/vpn-notify
@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+# Sends a desktop notification whenever a VPN connects or disconnects.
+# Covers WireGuard/tun interfaces (NetworkManager, wg-quick, Proton, OpenVPN)
+# and Tailscale (whose tailscale0 interface stays up even when stopped).
+#
+# NetworkManager WireGuard connections go stale when the underlying network
+# changes (wifi -> ethernet, wifi -> wifi), so when that happens any that were
+# up get restarted, checked, retried if needed, and reported as reconnected.
+
+INTERVAL=2
+RETRIES=5
+
+ICON_ON=/usr/share/icons/hicolor/scalable/apps/nm-vpn-active-lock-symbolic.svg
+ICON_OFF=/usr/share/icons/hicolor/scalable/apps/nm-vpn-standalone-lock-symbolic.svg
+
+# Provider logos: Papirus has Mullvad's and Proton's; Tailscale's and UniFi's
+# live in this repo (.local/share/vpn-notify).
+PAPIRUS_APPS=/usr/share/icons/Papirus/64x64/apps
+LOCAL_ICONS=$HOME/.local/share/vpn-notify
+
+# Friendly name for an interface: NetworkManager connection name if it has one
+vpn_name() {
+    local name
+    name=$(nmcli -g GENERAL.CONNECTION device show "$1" 2>/dev/null)
+    echo "${name:-$1}"
+}
+
+# Logo for a VPN by its name (as vpn_name/active_vpns give it), or $2 if
+# it's not one of the known providers or the logo is missing
+vpn_icon() {
+    local icon
+    case "${1,,}" in
+        *mullvad*) icon=$PAPIRUS_APPS/mullvad-vpn.svg ;;
+        *proton*) icon=$PAPIRUS_APPS/protonvpn-logo.svg ;;
+        tailscale) icon=$LOCAL_ICONS/tailscale.svg ;;
+        *unifi*) icon=$LOCAL_ICONS/unifi.svg ;;
+    esac
+    [[ -n $icon && -f $icon ]] && echo "$icon" || echo "$2"
+}
+
+active_vpns() {
+    ip -d -o link show up 2>/dev/null \
+        | awk -F': ' '/ (wireguard|tun) / { sub(/@.*/, "", $2); print $2 }' \
+        | grep -vx tailscale0 \
+        | while read -r iface; do vpn_name "$iface"; done
+
+    if command -v tailscale >/dev/null &&
+        [[ $(tailscale status --json 2>/dev/null | jq -r .BackendState) == Running ]]; then
+        echo Tailscale
+    fi
+}
+
+# Active NetworkManager connections, as UUID:TYPE:NAME
+nm_active() {
+    nmcli -t -f UUID,TYPE,NAME connection show --active 2>/dev/null
+}
+
+# UUIDs of the physical networks we're on (wifi, ethernet, tethering, ...)
+underlying_networks() {
+    nm_active | awk -F: '$2 !~ /^(wireguard|tun|vpn|loopback|bridge)$/ { print $1 }' | sort
+}
+
+# UUIDs of active NetworkManager WireGuard connections
+nm_wireguard() {
+    nm_active | awk -F: '$2 == "wireguard" { print $1 }' | sort
+}
+
+current_network_name() {
+    nm_active | awk -F: '$2 !~ /^(wireguard|tun|vpn|loopback|bridge)$/ { sub(/^[^:]*:[^:]*:/, ""); print; exit }'
+}
+
+notify() {
+    notify-send -a "VPN" -i "$2" "${@:4}" "$1" "$3"
+}
+
+# Confirm traffic flows through the tunnel by pinging its DNS server
+tunnel_works() {
+    local uuid=$1 iface target
+    iface=$(nmcli -g connection.interface-name connection show "$uuid" 2>/dev/null)
+    target=$(nmcli -g ipv4.dns connection show "$uuid" 2>/dev/null | cut -d, -f1)
+    [[ -z $target ]] && return 0
+    ping -c 3 -W 2 -I "$iface" "$target" >/dev/null 2>&1
+}
+
+reconnect() {
+    local uuid=$1 name attempt
+    name=$(nmcli -g connection.id connection show "$uuid" 2>/dev/null)
+
+    for ((attempt = 1; attempt <= RETRIES; attempt++)); do
+        nmcli connection down "$uuid" >/dev/null 2>&1
+        if nmcli -w 20 connection up "$uuid" >/dev/null 2>&1 && sleep 2 && tunnel_works "$uuid"; then
+            notify "🔄 VPN reconnected" "$(vpn_icon "$name" "$ICON_ON")" \
+                "“$name” was reconnected after switching to “$(current_network_name)”."
+            return 0
+        fi
+        sleep $((attempt * 3))
+    done
+
+    notify "⚠️ VPN reconnect failed" "$(vpn_icon "$name" "$ICON_OFF")" \
+        "Couldn't reconnect “$name” after $RETRIES attempts." -u critical
+    return 1
+}
+
+prev=$(active_vpns | sort)
+prev_net=$(underlying_networks)
+prev_wg=$(nm_wireguard)
+pending=""
+
+while sleep "$INTERVAL"; do
+    cur_net=$(underlying_networks)
+    cur_wg=$(nm_wireguard)
+
+    # Network changed: queue WireGuard connections that were up for a restart
+    if [[ $cur_net != "$prev_net" ]]; then
+        pending=$(printf '%s\n%s\n' "$pending" "$prev_wg" | grep -v '^$' | sort -u)
+    fi
+
+    # Drop any the user switched off themselves while waiting for a network
+    if [[ -n $pending && $cur_net == "$prev_net" ]]; then
+        switched_off=$(comm -23 <(echo "$prev_wg") <(echo "$cur_wg"))
+        pending=$(comm -23 <(echo "$pending") <(echo "$switched_off") | grep -v '^$')
+    fi
+
+    # Reconnect once we're on a network again (give DHCP/routes a moment)
+    if [[ -n $pending && -n $cur_net ]]; then
+        sleep 3
+        while read -r uuid; do
+            [[ -n $uuid ]] && reconnect "$uuid"
+        done <<<"$pending"
+        pending=""
+        prev=$(active_vpns | sort)
+        prev_net=$(underlying_networks)
+        prev_wg=$(nm_wireguard)
+        continue
+    fi
+
+    prev_net=$cur_net
+    prev_wg=$cur_wg
+
+    cur=$(active_vpns | sort)
+    [[ $cur == "$prev" ]] && continue
+
+    while read -r vpn; do
+        [[ -n $vpn ]] && notify "🔒 VPN connected" "$(vpn_icon "$vpn" "$ICON_ON")" "You are now connected to “$vpn”."
+    done < <(comm -13 <(echo "$prev") <(echo "$cur"))
+
+    while read -r vpn; do
+        [[ -n $vpn ]] && notify "🔓 VPN disconnected" "$(vpn_icon "$vpn" "$ICON_OFF")" "“$vpn” has been disconnected."
+    done < <(comm -23 <(echo "$prev") <(echo "$cur"))
+
+    prev=$cur
+done
--- a/dotfiles/.local/share/applications/tv.plex.PlexDesktop.desktop
+++ b/dotfiles/.local/share/applications/tv.plex.PlexDesktop.desktop
@@ -0,0 +1,31 @@
+# User override of /usr/share/applications/tv.plex.PlexDesktop.desktop
+# (~/.local/share/applications takes XDG precedence over /usr/share for the
+# same filename, so this is picked up by app launchers instead automatically
+# — no association/mimeapps changes needed).
+#
+# QT_QPA_PLATFORM=xcb is kept from upstream: hypr env sets "wayland;xcb", and
+# under Wayland the bundled QtWebEngine never runs the web client (blank
+# window, no [Web] lines in Plex.log). XCURSOR_SIZE=24 is also kept from
+# upstream: it is unset in the session, so the X11 cursor comes out huge.
+#
+# Change from upstream: Exec unsets QT_QUICK_CONTROLS_STYLE and calls
+# the package's Plex.sh directly, bypassing $PATH entirely. Plex Desktop
+# bundles its own private Qt/QML runtime that doesn't ship the
+# "org.hyprland.style" QQC2 style hypr/core/env.lua sets globally for other
+# apps' theming — inheriting it makes Plex fail to load its UI and exit
+# immediately with "module \"org.hyprland.style\" is not installed" (see
+# ~/.local/share/plex/Logs/Plex.log). Going straight to the fixed install
+# path (rather than relying on the .local/bin/Plex wrapper shadowing
+# /usr/bin/Plex on $PATH) means this keeps working even if $PATH order ever
+# changes.
+[Desktop Entry]
+Type=Application
+Name=Plex
+Comment=Plex client for desktop computers
+Exec=env -u QT_QUICK_CONTROLS_STYLE QT_QPA_PLATFORM=xcb XCURSOR_SIZE=24 /opt/plex-desktop/Plex.sh
+Icon=tv.plex.PlexDesktop
+Terminal=false
+Categories=AudioVideo;Player;X-Media;
+X-Flatpak=tv.plex.PlexDesktop
+StartupWMClass=Plex
+Name[en_US]=Plex
--- a/dotfiles/.local/share/fonts/SF-Pro-Display-Bold.otf
+++ b/dotfiles/.local/share/fonts/SF-Pro-Display-Bold.otf
--- a/dotfiles/.local/share/fonts/SF-Pro-Display-Regular.otf
+++ b/dotfiles/.local/share/fonts/SF-Pro-Display-Regular.otf
--- a/dotfiles/.local/share/vpn-notify/tailscale.svg
+++ b/dotfiles/.local/share/vpn-notify/tailscale.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect x="2" y="2" width="60" height="60" rx="14" fill="#242424"/>
+  <g fill="#ffffff" fill-opacity="0.25">
+    <circle cx="16" cy="16" r="6"/>
+    <circle cx="32" cy="16" r="6"/>
+    <circle cx="48" cy="16" r="6"/>
+    <circle cx="16" cy="48" r="6"/>
+    <circle cx="48" cy="48" r="6"/>
+  </g>
+  <g fill="#ffffff">
+    <circle cx="16" cy="32" r="6"/>
+    <circle cx="32" cy="32" r="6"/>
+    <circle cx="48" cy="32" r="6"/>
+    <circle cx="32" cy="48" r="6"/>
+  </g>
+</svg>
--- a/dotfiles/.local/share/vpn-notify/unifi.svg
+++ b/dotfiles/.local/share/vpn-notify/unifi.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect x="2" y="2" width="60" height="60" rx="14" fill="#006fff"/>
+  <path d="M17 14h9v20a6 6 0 0 0 12 0V26h9v8a15 15 0 0 1-30 0z" fill="#ffffff"/>
+  <rect x="38" y="19" width="4" height="4" fill="#ffffff"/>
+  <rect x="42" y="14" width="5" height="5" fill="#ffffff"/>
+  <rect x="42" y="22" width="5" height="4" fill="#ffffff" fill-opacity="0.7"/>
+</svg>
--- a/dotfiles/.local/share/xfce4/helpers/ghostty.desktop
+++ b/dotfiles/.local/share/xfce4/helpers/ghostty.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+# exo helper so Thunar's "Open Terminal Here" (exo-open --launch TerminalEmulator)
+# opens Ghostty; selected by ~/.config/xfce4/helpers.rc
+NoDisplay=true
+Version=1.0
+Type=X-XFCE-Helper
+X-XFCE-Category=TerminalEmulator
+Name=Ghostty
+Icon=com.mitchellh.ghostty
+X-XFCE-Binaries=ghostty;
+X-XFCE-Commands=%B;
+X-XFCE-CommandsWithParameter=%B -e "%s";
--- a/dotfiles/.ssh/config
+++ b/dotfiles/.ssh/config
@@ -1,3 +1,18 @@
+Host gavin.twhomelab.tailnet
+  HostName gavin.twhomelab.tailnet
+  User thoams
+  ForwardAgent yes
+
+Host raspberrypi.twhomelab.tailnet
+  HostName raspberrypi.twhomelab.tailnet
+  User thoams
+  ForwardAgent yes
+
+Host ted.twhomelab.tailnet
+  HostName ted.twhomelab.tailnet
+  User thoams
+  ForwardAgent yes
+
 Host 192.168.1.87
  HostName 192.168.1.87
  User thoams
@@ -11,4 +26,4 @@ Host 192.168.1.83
 Host 192.168.1.86
  HostName 192.168.1.86
  User thoams
-  ForwardAgent yes
+  ForwardAgent yes
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
thomas	d10a1aec05	Feature: Provider logos in VPN notifications vpn-notify picks the icon by VPN name: Papirus's Mullvad and ProtonVPN icons, plus Tailscale and UniFi logos shipped in .local/share/vpn-notify. Anything else keeps the generic lock icon. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 11:14:46 +01:00
thomas	24d7bb280e	Fix: Start vpn-notify straight away in bootstrap.sh `enable` alone only hooks it into graphical-session.target, which is already active by the time bootstrap runs, so it didn't start until the next login. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 11:14:46 +01:00
thomas	e544580963	Feature: VPN panel options, install/uninstall, and Tailscale auto-connect VpnIndicator.qml gains ProtonVPN sign-in (with 2FA), location/Secure Core/NetShield/kill switch options, Mullvad options, and Install / Uninstall links for both clients via the new scripts/VpnPackage.sh (pkexec). NetworkIndicator.qml names the VPN the public IP is coming through, using a new activeVpnLabel on VpnExclusivity. Tailscale now connects on its own whenever none of Home (UniFi), ProtonVPN or Mullvad is connected, and still backs off when one is. VpnIndicator publishes vpnStatesKnown/vpnTransitioning so this waits for every provider's first poll and never fires mid-switch. A manual "off" sticks until a provider next connects. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 11:14:46 +01:00
thomas	5aaa3822a6	Feature: Float and centre Galculator at a fixed size Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 11:14:46 +01:00
thomas	d24141e2e0	Feature: Desktop notifications when a VPN connects or disconnects Adds the vpn-notify script and its systemd user service, which notify on WireGuard/tun/Tailscale changes and reconnect NetworkManager WireGuard tunnels after a network switch. bootstrap.sh now enables the service and packages.txt lists libnotify explicitly. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 11:04:35 +01:00
thomas	81b051c95d	Removal: Drop QT_QUICK_CONTROLS_STYLE (hyprland-qt-support) env Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 09:24:49 +01:00
thomas	e563ec22d2	Feature: Shorter bar labels on narrow screens Bar.qml switches ActiveWindow and MediaPlayer to tighter truncation limits when the bar is narrower than compactBarWidth (1600px), so on the laptop's eDP-1 they don't crowd the centre clock/weather group. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 09:24:49 +01:00
thomas	7d9905f73b	Fix: Make system/install.sh report what it did and stop adding blank lines Prints whether options.conf and the pacman.conf Include were installed or already in place, then the options pacman ends up using. Dropping an old Include now also drops the blank line written after it, so re-runs leave pacman.conf untouched instead of adding a blank line and rewriting it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:57:35 +01:00
thomas	7f11abf50f	Feature: Pac-Man progress bars, version table and 10 parallel downloads in pacman Turns on ILoveCandy and VerbosePkgLists and raises ParallelDownloads to 10 in system/pacman/options.conf. install.sh now puts the Include at the end of [options] instead of straight after the header, so these override pacman.conf's own defaults (its ParallelDownloads = 5 would otherwise win), and moves an existing Include there when re-run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:53:36 +01:00
thomas	37c03fa03c	Feature: Make Ghostty the default terminal Super+Return, $TERMINAL (rofi-sensible-terminal and scripts) and Thunar's "Open Terminal Here" (exo helper + helpers.rc) now open Ghostty; foot stays installed as the fallback. Also replaces Ghostty's deprecated gtk-tabs-location = hidden with window-show-tab-bar = never. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:50:20 +01:00
Thomas Williams	20873c1ca6	Merge pull request 'Fix: Known issues from the dotfiles documentation pass' (#8 ) from thomas/fixes/known_issues into main Reviewed-on: #8	2026-10-22 08:29:48 +01:00
thomas	6e1ea8ffc4	Removal: Delete pre-Lua Hyprland config (hyprland.conf, UserConfigs, colours, animations) hyprland.lua and its modules replaced all of these in the Lua migration; nothing loads or reads them any more. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:19:12 +01:00
thomas	3eb8f6027b	Fix: Toggle touchpad via hyprctl eval and detect the device automatically Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:18:39 +01:00
thomas	9e7d6284eb	Fix: Update README program list and link Outline docs, fix fastfetch v2 logo Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:25 +01:00
thomas	0e9dbf0abc	Fix: Stop Refresh.sh relaunching Waybar, drop dead special:nyx rule Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:25 +01:00
thomas	aefa68f24c	Fix: Bootstrap oh-my-zsh, its plugins and the bar's Cascadia font on new installs Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:25 +01:00
thomas	02adb17b4e	Fix: Install hyprlock's SF Pro fonts through stow so fontconfig finds them Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:19 +01:00
thomas	353d77c4fb	Fix: Only set NVIDIA env vars when the NVIDIA driver is loaded, drop duplicate Qt theme var Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:19 +01:00
thomas	3931597aca	Fix: Use Bibata-Modern-Classic everywhere and add it to packages Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	206bf15bf4	Fix: Style clipboard menu with the launcher theme Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	818971b29c	Fix: Rewrite animation picker to switch Lua presets Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	f861c7c31c	Fix: Autostart Plexamp from plexamp-bin's real binary Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	6a8c8c92d8	Fix: Set zoom via hyprctl eval and launch installed HyprMod from keybinds Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	e23ce6647f	Fix: Use Lua dispatch syntax for log out and DPMS, repair swaync power/lock buttons Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 08:17:13 +01:00
thomas	5c6dad3e91	Feature: Run system updater in Ghostty with floating window rule Open the update terminal in Ghostty, offering to install it via pkexec when missing and falling back to foot if declined. Add the system-update-terminal window rule the script already referred to, so the window floats centred at 1000x650 instead of tiling. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 07:23:24 +01:00
thomas	5827f18d05	Feature: Add Ghostty config ported from foot Same font, padding, colours, cursor and Ctrl+C/Ctrl+Shift+C bindings as foot.ini, so the two can be tried side by side. Ctrl+C copies only with a selection and interrupts otherwise; TERM falls back to xterm-256color only over SSH. foot stays the default $term. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 07:23:24 +01:00
thomas	561312c234	Feature: Show public IP in network panel Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 07:21:09 +01:00
thomas	6e567dd1e1	Feature: Open Steam games on headless output while Sunshine streams Disabled-by-default window rule that sends steam_app windows fullscreen to workspace 9 (HEADLESS-1), toggled by sunshine-games.sh, so old games like KOTOR start at the stream's resolution.	2026-10-22 07:11:14 +01:00
thomas	9af1beeaae	Feature: Add now-playing media player to bar Show the current MPRIS track after the workspaces, with a per-source brand icon (YouTube, Spotify, Plexamp, Twitch...) that greys out while paused. Clicking it opens a panel with album art, a seek bar, transport controls and shuffle/repeat. Also cap the window title and track text by character count rather than pixel width. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-22 07:11:14 +01:00
thomas	16a0d12b8f	Feature: Add compatibility for kotor	2026-10-22 06:41:45 +01:00
thomas	e8113f4366	Fix: Adding all/most hosts	2026-10-22 06:40:05 +01:00
thomas	ea11fe0eb6	Feature: Make home UniFi VPN row a collapsible card Put the Replace config option behind an expand chevron, like Mullvad's options, and frame the card while it's expanded. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-19 21:07:01 +01:00
thomas	19e7d3f673	Feature: Add config import button for home UniFi VPN Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-19 20:45:12 +01:00
thomas	bf86ffe258	Feature: Add gavin homelab host to SSH config Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-19 20:41:26 +01:00
thomas	8d73d2a37e	Feature: Add home UniFi WireGuard tunnel to VPN panel Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-19 20:40:23 +01:00
thomas	54b91a72e2	Feature: Add new-install package review list Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-17 22:24:30 +01:00
thomas	788d4939f0	Fix: Drop plain Ctrl+V paste binding in foot Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-17 22:23:41 +01:00
thomas	9a038b74c3	Fix: Restart portals after env import so screen sharing works xdg-desktop-portal-hyprland could start before Hyprland imported WAYLAND_DISPLAY/XDG_CURRENT_DESKTOP, leaving no ScreenCast backend. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-17 22:23:41 +01:00
thomas	954dedf7cd	Fix: Scale bar volume scroll by distance for touchpads Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 03:40:27 +01:00
thomas	90d0e2bed0	Feature: Show Plexamp icon in media notifications Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 03:37:01 +01:00
thomas	14f72af3f2	Fix: Fall back to grim/slurp for screenshots without hyprshot Super+Print and Super+Shift+Print use hyprshot when installed and grim/slurp otherwise. Add Super+Shift+S (area) and Super+F6 (full screen) for keyboards without a Print key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 03:31:57 +01:00
thomas	836848dedd	Fix: Bind workspace number keys by name in Lua config Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 02:26:10 +01:00
thomas	fbaffc0816	Fix: Use Lua dispatch syntax for bar workspace buttons Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 02:26:10 +01:00
thomas	ccae379490	Feature: Ctrl+C/Ctrl+V copy and paste in foot Ctrl+C and Ctrl+V now copy and paste like in other apps. The interrupt signal (^C) moves to Ctrl+Shift+C. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-14 06:33:49 +01:00
thomas	7f0fad5922	Fix: Run Plex under XWayland to stop a blank window hypr env sets QT_QPA_PLATFORM="wayland;xcb", and under Wayland Plex's bundled QtWebEngine never loads the web client, so the window stays blank. Both the PATH wrapper and the .desktop entry now force xcb, as upstream does, and set XCURSOR_SIZE=24 so the X11 cursor isn't huge. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-14 06:33:12 +01:00
thomas	b40d4a9fa4	Fix: Point Sunshine tray link at new tailnet domain The tailnet's MagicDNS suffix changed from twhomelab.local to twhomelab.tailnet, so the Sunshine web UI link now opens xol.twhomelab.tailnet:47990. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-14 06:33:12 +01:00
thomas	19d6936aa6	Feature: Enable hypridle without locking during Sunshine streams Sunshine's global_prep_cmd now runs hypr/scripts/SunshineIdle.sh, which holds a systemd idle inhibitor for the length of a stream (hypridle respects it) and unlocks hyprlock if the session was already locked. With that in place hypridle starts at login again. Sunshine's config (sunshine.conf, apps.json, prep scripts) moves into the dotfiles; credentials, logs and state stay local and are gitignored. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 18:14:44 +01:00
thomas	4a57e9902f	Feature: Bootstrap script for new installs bootstrap.sh installs everything listed in system/packages.txt (pacman, AUR via yay, flatpak, official install scripts), auto-detects CPU microcode and GPU drivers, enables services, links dotfiles with stow and runs system/install.sh. Optional --svt-av1 installs svt-av1-essential-git and rebuilds ffmpeg against it via system/rebuild-ffmpeg.sh. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 18:10:27 +01:00
thomas	1201e6a4cc	Feature: Sync dotfiles on system update update-system.sh now runs sync-dotfiles.sh first, which pulls the repo (fast-forward only) and re-stows it so both machines pick up config changes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:34:07 +01:00
thomas	626c7dbcc1	Feature: Move volume OSD to bottom-center and enlarge slightly Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:28:55 +01:00
thomas	35374800bf	Fix: Volume keys use wpctl instead of missing pamixer Quickshell's VolumeOsd now shows changes, so drop notify-send popups. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:28:55 +01:00
thomas	7cb7f10ff6	Fix: Only create Sunshine headless output on desktop (no battery) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:10:21 +01:00
thomas	88484f8495	Remove: Drop orbit, network click opens nm-connection-editor Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:10:21 +01:00
thomas	1babf2e334	Feature: Shared pacman options installed via system/install.sh Enables Color through an Include snippet in /etc/pacman.d so pacman options stay in sync between machines. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-11 17:10:21 +01:00
thomas	cc78daea77	Merge branch 'main' of ssh://gitea.thomasleewilliams.co.uk:2222/thomas/dotfiles	2026-10-11 16:52:33 +01:00
thomas	0415804b67	applying changes	2026-10-11 16:50:54 +01:00