add nixgl

devices/deck/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, config, ... }:
 
 {
   imports = [
@@ -19,7 +19,7 @@
 
   home.stateVersion = "24.05";
 
-  home.packages = with pkgs;[ ];
+  home.packages = with pkgs;[ (config.lib.nixGL.wrap nextcloud-client) ];
 
   home.file = {
     # # Building this configuration will create a copy of 'dotfiles/screenrc' in
@@ -33,4 +33,20 @@
     #   org.gradle.daemon.idletimeout=3600000
     # '';
   };
+
+  nixGL = {
+    packages = inputs.nixgl.packages;
+    # vulkan.enable = true;
+  };
+
+  programs.kodi = {
+    enable = true;
+    package = config.lib.nixGL.wrap (pkgs.kodi.withPackages (exts: [ exts.jellycon exts.joystick ]));
+  };
+
+  systemd.user.services.nextcloud-client = {
+    Unit = {
+      After = pkgs.lib.mkForce "graphical-session.target";
+    };
+  };
 }

flake.lock

@@ -54,6 +54,21 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -96,6 +111,25 @@
         "type": "github"
       }
     },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1713543440,
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1739798439,
@@ -145,6 +179,21 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1660551188,
+        "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1739758141,
         "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
@@ -165,8 +214,9 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "nix-vscode-extensions": "nix-vscode-extensions",
+        "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?rev=a81daa13ca23440d8ae219d765140769c4d2f117";
+    nixgl.url = "github:nix-community/nixGL";
   };
 
   outputs = { self, nixpkgs, nixos-hardware, home-manager, ... }@inputs:

home-manager-update.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-home-manager switch --flake "/home/worble/Projects/nixos#$(whoami)"
+home-manager switch --flake "/home/$(whoami)/Projects/nixos#$(whoami)"

home-manager/base.nix

@@ -1,23 +1,23 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 
 {
   imports = [
-    ./fonts.nix
+    ./base/fonts.nix
-    ./terminal.nix
+    ./base/terminal.nix
     ./firefox/firefox.nix
   ];
 
   home.packages = with pkgs;[
     # general
-    thunderbird
+    (config.lib.nixGL.wrap thunderbird)
-    keepassxc
+    (config.lib.nixGL.wrap keepassxc)
-    qbittorrent
+    (config.lib.nixGL.wrap qbittorrent)
-    libreoffice-qt
+    (config.lib.nixGL.wrap libreoffice-qt)
-    joplin-desktop
+    (config.lib.nixGL.wrap joplin-desktop)
 
     # comms   
-    teamspeak_client
+    (config.lib.nixGL.wrap teamspeak_client)
-    vesktop
+    (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
+    (config.lib.nixGL.wrap bottles)
-    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev
+    (config.lib.nixGL.wrap inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev)
   ];
 }

steam-run-nix.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "unset LD_PRELOAD"
+unset LD_PRELOAD
+source /etc/profile.d/nix.sh
+exec "$@"