add nixgl

home-manager/base.nix

@@ -1,23 +1,23 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 
 {
   imports = [
-    ./fonts.nix
-    ./terminal.nix
+    ./base/fonts.nix
+    ./base/terminal.nix
     ./firefox/firefox.nix
   ];
 
   home.packages = with pkgs;[
     # general
-    thunderbird
-    keepassxc
-    qbittorrent
-    libreoffice-qt
-    joplin-desktop
+    (config.lib.nixGL.wrap thunderbird)
+    (config.lib.nixGL.wrap keepassxc)
+    (config.lib.nixGL.wrap qbittorrent)
+    (config.lib.nixGL.wrap libreoffice-qt)
+    (config.lib.nixGL.wrap joplin-desktop)
 
     # comms   
-    teamspeak_client
-    vesktop
+    (config.lib.nixGL.wrap teamspeak_client)
+    (config.lib.nixGL.wrap vesktop)
   ];
 
   home.sessionVariables = {
@@ -26,6 +26,7 @@
 
   services.nextcloud-client = {
     enable = true;
+    package = config.lib.nixGL.wrap pkgs.nextcloud-client;
     startInBackground = true;
   };
 
@@ -34,7 +35,7 @@
 
     chromium = {
       enable = true;
-      package = pkgs.brave;
+      package = config.lib.nixGL.wrap pkgs.brave;
     };
 
     mpv = lib.mkDefault {

home-manager/base/terminal.nix

@@ -3,7 +3,7 @@
 with lib;
 {
   imports = [
-    ./development/helix.nix
+    ../development/helix.nix
   ];
 
   options.terminal = {
@@ -170,6 +170,7 @@ with lib;
 
       alacritty = {
         enable = true;
+        package = config.lib.nixGL.wrap pkgs.alacritty;
         settings = {
           font = {
             normal = {

home-manager/firefox/firefox.nix

@@ -1,9 +1,10 @@
-{ ... }:
+{ pkgs, config, ... }:
 
 {
   programs = {
     firefox = {
       enable = true;
+      package = config.lib.nixGL.wrap pkgs.firefox;
       languagePacks = [
         "en-GB"
       ];
@@ -22,7 +23,6 @@
           listToAttrs [
             # Security / Privacy
             (extension "ublock-origin" "uBlock0@raymondhill.net")
-            (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}")
             (extension "canvasblocker" "CanvasBlocker@kkapsner.de")
             (extension "cookie-autodelete" "CookieAutoDelete@kennydo.com")
             (extension "happy-bonobo-disable-webrtc" "jid1-5Fs7iTLscUaZBgwr@jetpack")

home-manager/gaming.nix

@@ -1,9 +1,9 @@
-{ inputs, pkgs, ... }:
+{ inputs, pkgs, config, ... }:
 
 {
   home.packages = with pkgs;[
     steamguard-cli
-    bottles
-    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev
+    (config.lib.nixGL.wrap bottles)
+    (config.lib.nixGL.wrap inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev)
   ];
 }