Merge branch 'main' of ssh://gitea.thomasleewilliams.co.uk:2222/thomas/dotfiles

dotfiles/.config/environment.d/ssh-agent.conf

@@ -0,0 +1 @@
+SSH_AUTH_SOCK=${HOME}/.bitwarden-ssh-agent.sock

dotfiles/.config/gtk-3.0/bookmarks

@@ -3,5 +3,6 @@ file:///home/thomas/Documents
 file:///home/thomas/Downloads
 file:///home/thomas/Pictures
 file:///home/thomas/Music
+file:///home/thomas/Videos
 smb://192.168.1.84/media/
 smb://192.168.1.85/music/

dotfiles/.config/hypr/UserConfigs/ENVariables.conf

@@ -51,10 +51,10 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto # auto selects Wayland if possible, X11
 # 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
+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
@@ -87,3 +87,6 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto # auto selects Wayland if possible, X11
 # 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

dotfiles/.config/hypr/UserConfigs/UserDecorations.conf

@@ -21,7 +21,7 @@ decoration {
   rounding = 10
          
   active_opacity = 1.0
-  inactive_opacity = 0.9
+  inactive_opacity = 1.0
   fullscreen_opacity = 1.0
 
   dim_inactive = true

dotfiles/.config/hypr/UserConfigs/monitors.conf

@@ -8,5 +8,5 @@
 # <<<<< 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,1,bitdepth,10,cm,wide
+monitor=desc:Acer Technologies VG240Y S 0x126191DE,1920x1080@165.00301,0x0,1.00000000,transform,0,vrr,0,bitdepth,10,cm,wide
 # <<<<< TUI AUTO END

dotfiles/.config/hypr/appearance/decorations.lua

@@ -24,7 +24,7 @@ hl.config({
         rounding = 10,
 
         active_opacity     = 1.0,
-        inactive_opacity    = 0.9,
+        inactive_opacity    = 1.0,
         fullscreen_opacity  = 1.0,
 
         dim_inactive = true,

dotfiles/.config/hypr/core/env.lua

@@ -49,10 +49,10 @@ hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto") -- auto selects Wayland if possib
 -- 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")
+hl.env("LIBVA_DRIVER_NAME", "nvidia")
+hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
+hl.env("NVD_BACKEND", "direct")
+hl.env("GSK_RENDERER", "ngl")
 
 -- additional ENV's for nvidia. Caution, activate with care
 -- hl.env("GBM_BACKEND", "nvidia-drm")
@@ -85,3 +85,6 @@ hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto") -- auto selects Wayland if possib
 -- hl.env("HYPRLAND_NO_RT", "1") -- Disables realtime priority setting by Hyprland.
 -- hl.env("HYPRLAND_NO_SD_NOTIFY", "1") -- If systemd, disables the 'sd_notify' calls.
 -- hl.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)
+hl.env("SSH_AUTH_SOCK", os.getenv("HOME") .. "/.bitwarden-ssh-agent.sock")

dotfiles/.config/hypr/core/hyprmod.lua

@@ -5,6 +5,11 @@
 -- whatever it last wrote. If you reinstall HyprMod, prefer letting its own "Migrate to Lua…"
 -- wizard take over managing this file instead of hand-editing it going forward.
 
+-- 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.
 hl.config({
     general = {
         allow_tearing = true,
@@ -13,12 +18,12 @@ hl.config({
         },
     },
     misc = {
-        vrr = 1,
+        vrr = 0,
     },
 })
 
 -- Monitors
-hl.monitor({ output = "DP-2", mode = "1920x1080@165.00Hz", position = "0x0", scale = 1, bitdepth = 10, cm = "wide" })
+hl.monitor({ output = "DP-2", mode = "1920x1080@165.00Hz", position = "0x0", scale = 1, bitdepth = 10, cm = "wide", vrr = 0 })
 
 -- Keybinds
 -- (unbind = SUPER SHIFT, Print / unbind = SUPER, up from the source .conf have no Lua equivalent needed —

dotfiles/.config/hypr/core/startup.lua

@@ -37,7 +37,7 @@ hl.on("hyprland.start", function()
     -- hl.exec_cmd("hypridle")
 
     -- Sunshine for streaming media
-    h1.exec_cmd("sunshine")
+    hl.exec_cmd("sunshine")
 
     -- Float + center the Bitwarden extension pop-out (window rules can't catch it — see the script)
     hl.exec_cmd(scriptsDir .. "/FloatBitwardenPopup.sh")
@@ -49,6 +49,7 @@ hl.on("hyprland.start", function()
     hl.exec_cmd("sleep 3 && vesktop")
     hl.dispatch(hl.dsp.focus({ workspace = 1 }))
     hl.exec_cmd("bitwarden-desktop --ozone-platform-hint=auto --silent")
+    hl.exec_cmd("seafile-applet")
 
     -- Here are a list of features available but disabled by default
     -- hl.exec_cmd("awww-daemon --format xrgb && awww img " .. os.getenv("HOME") .. "/Pictures/wallpapers/mecha-nostalgia.png") -- persistent wallpaper

dotfiles/.config/hypr/hyprland-gui.conf

@@ -2,10 +2,15 @@
 
 general:allow_tearing = 1
 general:snap:enabled = 0
-misc:vrr = 1
+# 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
+monitor = DP-2, 1920x1080@165.00Hz, 0x0, 1, bitdepth, 10, cm, wide, vrr, 0
 
 # Keybinds
 unbind = SUPER SHIFT, Print

dotfiles/.config/hypr/layout/monitors.lua

@@ -10,6 +10,6 @@
 -- <<<<< TUI AUTO START
 hl.monitor({ output = "desc:LG Electronics LG ULTRAWIDE 0x0002E68A", mode = "2560x1080@60.00000", position = "1920x-740", scale = 1.00000000, transform = 3, vrr = 0 })
 hl.monitor({ output = "desc:HP Inc. HP 524pf VNG447017D",           mode = "1920x1080@100.00000", position = "-1920x0",   scale = 1.00000000, transform = 0, vrr = 0 })
-hl.monitor({ output = "desc:Acer Technologies VG240Y S 0x126191DE", mode = "1920x1080@165.00301", position = "0x0",       scale = 1.00000000, transform = 0, vrr = 1, bitdepth = 10, cm = "wide" })
+hl.monitor({ output = "desc:Acer Technologies VG240Y S 0x126191DE", mode = "1920x1080@165.00301", position = "0x0",       scale = 1.00000000, transform = 0, vrr = 0, bitdepth = 10, cm = "wide" })
 hl.monitor({ output = "HEADLESS-1", mode = "1728x1080@60.00000", position = "4480x0", scale = 1.00000000, transform = 0, vrr = 0 })
 -- <<<<< TUI AUTO END

dotfiles/.config/hypr/layout/windowrules.lua

@@ -137,8 +137,8 @@ hl.window_rule({ workspace = "3", match = { class = "^([Vv]esktop|[Dd]iscord|[Ss
 hl.window_rule({ size = "20% 20%", match = { class = "^([Pp]lexamp)" } })
 
 -- FLOAT
-hl.window_rule({ name = "windowrule-75", float = true, opacity = "0.9 0.7", size = "monitor_w*0.7 monitor_h*0.7", match = { tag = "wallpaper*" } })
-hl.window_rule({ name = "windowrule-76", float = true, opacity = "0.8 0.7", size = "monitor_w*0.7 monitor_h*0.7", match = { tag = "settings*" } })
+hl.window_rule({ name = "windowrule-75", float = true, opacity = "0.9 0.9", size = "monitor_w*0.7 monitor_h*0.7", match = { tag = "wallpaper*" } })
+hl.window_rule({ name = "windowrule-76", float = true, opacity = "0.8 0.8", size = "monitor_w*0.7 monitor_h*0.7", match = { tag = "settings*" } })
 hl.window_rule({ name = "windowrule-77", float = true, match = { tag = "viewer*" } })
 hl.window_rule({ name = "windowrule-78", float = true, match = { class = "([Zz]oom|onedriver|onedriver-launcher)$" } })
 hl.window_rule({ name = "windowrule-79", float = true, match = { class = "(org.gnome.Calculator)", title = "(Calculator)" } })
@@ -162,17 +162,17 @@ hl.window_rule({ name = "windowrule-92", float = true, center = true, size = "mo
 -- END of float popups and dialogue #######
 
 -- OPACITY
--- hl.window_rule({ opacity = "0.9 0.7", match = { tag = "browser*" } })
--- hl.window_rule({ opacity = "0.9 0.8", match = { tag = "projects*" } })
--- hl.window_rule({ opacity = "0.94 0.86", match = { tag = "im*" } })
--- hl.window_rule({ opacity = "0.94 0.86", match = { tag = "multimedia*" } })
--- hl.window_rule({ opacity = "0.9 0.8", match = { tag = "file-manager*" } })
-hl.window_rule({ name = "windowrule-93", opacity = "0.8 0.7", match = { tag = "terminal*" } })
--- hl.window_rule({ opacity = "0.82 0.75", match = { tag = "viewer*" } })
-hl.window_rule({ name = "windowrule-94", opacity = "0.8 0.7", match = { class = "^(gedit|org.gnome.TextEditor|mousepad)$" } })
-hl.window_rule({ name = "windowrule-95", opacity = "0.9 0.8", match = { class = "^(deluge)$" } })
-hl.window_rule({ name = "windowrule-96", opacity = "0.9 0.8", match = { class = "^(seahorse)$" } }) -- gnome-keyring gui
--- hl.window_rule({ opacity = "0.95 0.75", match = { title = "^(Picture-in-Picture)$" } })
+-- hl.window_rule({ opacity = "0.9 0.9", match = { tag = "browser*" } })
+-- hl.window_rule({ opacity = "0.9 0.9", match = { tag = "projects*" } })
+-- hl.window_rule({ opacity = "0.94 0.94", match = { tag = "im*" } })
+-- hl.window_rule({ opacity = "0.94 0.94", match = { tag = "multimedia*" } })
+-- hl.window_rule({ opacity = "0.9 0.9", match = { tag = "file-manager*" } })
+hl.window_rule({ name = "windowrule-93", opacity = "0.8 0.8", match = { tag = "terminal*" } })
+-- hl.window_rule({ opacity = "0.82 0.82", match = { tag = "viewer*" } })
+hl.window_rule({ name = "windowrule-94", opacity = "0.8 0.8", match = { class = "^(gedit|org.gnome.TextEditor|mousepad)$" } })
+hl.window_rule({ name = "windowrule-95", opacity = "0.9 0.9", match = { class = "^(deluge)$" } })
+hl.window_rule({ name = "windowrule-96", opacity = "0.9 0.9", match = { class = "^(seahorse)$" } }) -- gnome-keyring gui
+-- hl.window_rule({ opacity = "0.95 0.95", match = { title = "^(Picture-in-Picture)$" } })
 
 -- SIZE
 -- hl.window_rule({ size = "25% 25%", match = { title = "^(Firefox)$" } })

dotfiles/.config/quickshell/modules/bar/PinnedTray.qml

@@ -20,6 +20,13 @@ RowLayout {
             launch: ["bitwarden"],
             secondary: ["pkill", "bitwarden"]
         },
+        {
+            name: "Seafile",
+            icon: "seafile",
+            binary: "seafile-applet",
+            launch: ["seafile-applet"],
+            secondary: ["pkill", "seafile-applet"]
+        },
         {
             name: "Sunshine",
             icon: Qt.resolvedUrl("../../assets/sunshine.svg"),

dotfiles/.config/quickshell/modules/bar/SystemUpdate.qml

@@ -4,22 +4,12 @@ import Quickshell
 import Quickshell.Hyprland
 import "../../config"
 
-// Package update indicator — replaces the old waybar custom/updater module
-// (see .config/waybar/config and its scripts/update-distro.sh). The actual
-// polling/state lives in the SystemUpdates singleton (config/), shared
-// across every monitor's bar; this is just the icon + panel UI. Clicking
-// opens a panel showing the pending count with a button that runs the
-// actual update in a terminal (scripts/update-system.sh, ported from the
-// same waybar script, distro-detection and all).
 Item {
     id: root
-    implicitWidth: row.implicitWidth + 2
+    implicitWidth: row.implicitWidth + 6
     implicitHeight: Appearance.barHeight
 
-    // The bar's own PanelWindow — same barWindow-anchoring convention as
-    // every other popup-having module here (Volume.qml, PowerButton.qml,
-    // etc.), so the panel opens in a fixed spot rather than following this
-    // icon's exact position in its RowLayout.
+    
     required property var barWindow
 
     RowLayout {
@@ -29,17 +19,10 @@ Item {
 
         Text {
             id: label
-            // Nerd Font glyph (package-variant) normally, matching the old
-            // waybar custom/updater module's icon — not a Material Symbols
-            // ligature name like the rest of this bar, so it needs the Nerd
-            // Font instead of iconFontFamilyRounded. While a check is running
-            // (the periodic poll or a right-click-triggered refresh) this
-            // swaps to the same spinner glyph/animation as
-            // BluetoothIndicator.qml's scan spinner.
             font.family: SystemUpdates.checking ? Appearance.iconFontFamilyRounded : Appearance.fontFamily
             font.variableAxes: Appearance.iconFontAxes
             font.pixelSize: SystemUpdates.checking ? 15 : 22
-            color: SystemUpdates.updateCount > 0 ? Colors.primary : Colors.foreground
+            color: Colors.foreground
             text: SystemUpdates.checking ? "progress_activity" : "󰏖"
 
             RotationAnimation on rotation {
@@ -48,9 +31,6 @@ Item {
                 from: 0
                 to: 360
                 duration: 900
-                // Otherwise the icon is left tilted at whatever angle the
-                // spin stopped on once checking finishes and it swaps back
-                // to the static glyph.
                 onRunningChanged: if (!running) label.rotation = 0
             }
         }
@@ -81,9 +61,6 @@ Item {
         id: panel
         visible: false
         color: "transparent"
-        // Same contentWidth/contentPadding split as the other panels
-        // (Volume.qml, PowerButton.qml, etc.) rather than a single magic
-        // implicitWidth.
         readonly property int contentWidth: 200
         readonly property int contentPadding: 16
         implicitWidth: contentWidth + contentPadding * 2
@@ -91,11 +68,6 @@ Item {
 
         anchor {
             window: root.barWindow
-            // Unlike anchor.item, anchor.window doesn't default rect to the
-            // window's own bounds — set it explicitly so edges/gravity below
-            // resolve against the full bar. Bottom alone (no Left/Right)
-            // anchors to the bar's bottom-center, which lines up with this
-            // icon since it sits in the bar's centered RowLayout.
             rect.x: 0
             rect.y: 0
             rect.width: root.barWindow.width
@@ -159,10 +131,6 @@ Item {
                     }
                 }
 
-                // Same selectable-row shape as this project's other panel
-                // actions (e.g. PowerButton.qml's menu entries): radius 0,
-                // fixed-width icon column, fillWidth label, offset hover
-                // halo rather than one drawn on the row's own edge.
                 Rectangle {
                     id: updateBtn
                     width: parent.width

dotfiles/.ssh/config

@@ -0,0 +1,14 @@
+Host 192.168.1.87
+  HostName 192.168.1.87
+  User thoams
+  ForwardAgent yes
+
+Host 192.168.1.83
+  HostName 192.168.1.83
+  User thoams
+  ForwardAgent yes
+
+Host 192.168.1.86
+  HostName 192.168.1.86
+  User thoams
+  ForwardAgent yes

dotfiles/.zshrc

@@ -23,7 +23,7 @@ source $ZSH/oh-my-zsh.sh
 
 # My alias
 
-alias cl='clear'
+alias cl='clear && fastfetch'
 alias zed='zeditor'
 alias ssh-gavin='ssh thoams@192.168.1.83'
 alias ssh-raspberry-pi='ssh thoams@192.168.1.86'