From f3319cbfc2c0f84552943233f0d35b666d2e35c1 Mon Sep 17 00:00:00 2001
From: Curt Spark <git@cspark.dev>
Date: Wed, 3 Dec 2025 22:32:03 +0000
Subject: [PATCH] Small config fix/cleanup and add amazing wayland OCR global
 link hint feature

---
 global.nix                                    | 106 +++++++-----------
 .../home-manager/.config/niri/config.kdl      |   7 +-
 2 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/global.nix b/global.nix
index 7d4dd91b..78b1c0f1 100644
--- a/global.nix
+++ b/global.nix
@@ -25,69 +25,6 @@
 	  gtk-pipe-viewer
     mpdcron
 	];
-
-  # Enable OpenGL/Vulkan hardware acceleration etc
-  hardware = {
-    ## radv: an open-source Vulkan driver from freedesktop
-    graphics = {
-      enable = true;
-      enable32Bit = true;
-      driSupport = true;
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [
-        #gfxreconstruct # Issue with cmake
-        glslang
-        spirv-cross
-        spirv-headers
-        spirv-tools
-        vulkan-extension-layer
-        vulkan-headers
-        vulkan-loader
-        vulkan-tools
-        vulkan-tools-lunarg
-        vulkan-utility-libraries
-        vulkan-validation-layers
-        vkdisplayinfo
-        vkd3d
-        vkd3d-proton
-        vk-bootstrap
-	rocmPackages.clr.icd
-      ];
-    };
-
-    services.xserver = {
-      # Enable touchpad support (enabled default in most desktopManager).
-      libinput.enable = true;
-    };
-
-    ## amdvlk: an open-source Vulkan driver from AMD
-    #amdgpu.amdvlk = {
-    #    enable = true;
-    #    support32Bit.enable = true;
-    #    extraPackages = with pkgs; [
-    #      gfxreconstruct
-    #      glslang
-    #      spirv-cross
-    #      spirv-headers
-    #      spirv-tools
-    #      vulkan-extension-layer
-    #      vulkan-headers
-    #      vulkan-loader
-    #      vulkan-tools
-    #      vulkan-tools-lunarg
-    #      vulkan-utility-libraries
-    #      vulkan-validation-layers
-    #      vkdisplayinfo
-    #      vkd3d
-    #      vkd3d-proton
-    #      vk-bootstrap
-    #    ];
-    #};
-  };
-
-  # Enable proper support for USB wifi/Wwan adapters.
-  hardware.usbWwan.enable = true;
-
   # You can specify here what python packages you waint available to python
   # Custom Python package with all the (Python) imports I need
   my-python-packages = python-packages: with python-packages; [ # ...
@@ -353,6 +290,7 @@
 
       yazi
       ueberzugpp # To display images in yazi via alacritty
+      wl-kbptr # Controlling the mouse using the keyboard + optical recognition
 
       ncdu
       
@@ -366,6 +304,48 @@
 
   	] ++ stablePackages;
 
+  # Enable OpenGL/Vulkan hardware acceleration etc
+  hardware = {
+    ## radv: an open-source Vulkan driver from freedesktop
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
+    ## amdvlk: an open-source Vulkan driver from AMD
+    #amdgpu.amdvlk = {
+    #    enable = true;
+    #    support32Bit.enable = true;
+    #    extraPackages = with pkgs; [
+    #      gfxreconstruct
+    #      glslang
+    #      spirv-cross
+    #      spirv-headers
+    #      spirv-tools
+    #      vulkan-extension-layer
+    #      vulkan-headers
+    #      vulkan-loader
+    #      vulkan-tools
+    #      vulkan-tools-lunarg
+    #      vulkan-utility-libraries
+    #      vulkan-validation-layers
+    #      vkdisplayinfo
+    #      vkd3d
+    #      vkd3d-proton
+    #      vk-bootstrap
+    #    ];
+    #};
+
+    # Enable proper support for USB wifi/Wwan adapters.
+    usbWwan.enable = true;
+  };
+
+    services.xserver = {
+      # Enable touchpad support (enabled default in most desktopManager).
+      libinput.enable = true;
+    };
+
+
   # Steam Game Platform
   programs.steam = {
     enable = true;
diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl
index 2218be4c..82bf8fa4 100644
--- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl
+++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl
@@ -312,6 +312,9 @@ binds {
     Super+L { spawn "swaylock"; }
     Ctrl+Alt+P { spawn "fuzzel-pass"; }
 
+    // Link hints using OCR
+    Alt+F { spawn "wl-kbptr" "-o" "modes=floating,click" "-o" "mode_floating.source=detect"; }
+
     // You can also use a shell:
     // Alt+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
 
@@ -473,8 +476,8 @@ binds {
 
     // Alt+R { switch-preset-column-width; }
     // Alt+Shift+R { reset-window-height; }
-    Alt+F { maximize-column; }
-    Alt+Shift+F { fullscreen-window; }
+    Alt+Shift+F { maximize-column; }
+    Alt+F11 { fullscreen-window; }
     Alt+C { center-column; }
 
     // Finer width adjustments.