From 6444e6e89f7f826602ad46f1f5d26a4dcb4e7401 Mon Sep 17 00:00:00 2001
From: David Arnold <david.arnold@iohk.io>
Date: Mon, 31 Oct 2022 00:29:54 -0500
Subject: [PATCH] fix(blaggacao): use nixGL for proper OpenGL rendering outside
 of nixos

---
 comb/blaggacao/homeConfigurations.nix |  5 +++--
 comb/blaggacao/homeProfiles.nix       | 12 +++++++++---
 comb/blaggacao/homeSuites.nix         |  4 ++--
 flake.lock                            | 25 +++++++++++++++++++++++++
 flake.nix                             |  3 +++
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/comb/blaggacao/homeConfigurations.nix b/comb/blaggacao/homeConfigurations.nix
index b1dcaec..8e801f0 100644
--- a/comb/blaggacao/homeConfigurations.nix
+++ b/comb/blaggacao/homeConfigurations.nix
@@ -1,5 +1,6 @@
 let
   inherit (cell) homeSuites;
+  inherit (inputs) nixgl nixos; # home
 
   name = "David Arnold";
   # email = "dgx.arnold@gmail.com";
@@ -40,7 +41,7 @@ in {
       []
       ++ gui
       ++ shell
-      ++ nix;
+      ++ system;
   };
   server = {
     inherit programs bee home manual;
@@ -48,6 +49,6 @@ in {
     imports = with homeSuites;
       []
       ++ shell
-      ++ nix;
+      ++ system;
   };
 }
diff --git a/comb/blaggacao/homeProfiles.nix b/comb/blaggacao/homeProfiles.nix
index 6ad5c70..531e85f 100644
--- a/comb/blaggacao/homeProfiles.nix
+++ b/comb/blaggacao/homeProfiles.nix
@@ -1,11 +1,17 @@
 let
-  inherit (inputs) nixpkgs;
+  inherit (inputs) nixpkgs nixgl;
 in {
   shellPrograms.programs = import ./homeProfiles/shellPrograms.nix;
   guiPrograms.programs = import ./homeProfiles/guiPrograms.nix;
   shellPackages.home.packages = import ./homeProfiles/shellPackages.nix nixpkgs;
   guiPackages.home.packages = import ./homeProfiles/guiPackages.nix nixpkgs;
-  nixProfile.nix = {
-    package = nixpkgs.nix;
+  systemProfile = {
+    home.packages = [
+      nixpkgs.nix
+      nixgl.packages.nixGLIntel
+    ];
+    nix = {
+      package = nixpkgs.nix;
+    };
   };
 }
diff --git a/comb/blaggacao/homeSuites.nix b/comb/blaggacao/homeSuites.nix
index 3f5bd6b..5d27056 100644
--- a/comb/blaggacao/homeSuites.nix
+++ b/comb/blaggacao/homeSuites.nix
@@ -12,7 +12,7 @@ in {
     homeProfiles.guiPackages
     homeProfiles.guiPrograms
   ];
-  nix = [
-    homeProfiles.nixProfile
+  system = [
+    homeProfiles.systemProfile
   ];
 }
diff --git a/flake.lock b/flake.lock
index e7e06a4..b96e399 100644
--- a/flake.lock
+++ b/flake.lock
@@ -244,6 +244,30 @@
         "type": "github"
       }
     },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": [
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661367362,
+        "narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=",
+        "owner": "guibou",
+        "repo": "nixGL",
+        "rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "guibou",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixos-21-11": {
       "locked": {
         "lastModified": 1659446231,
@@ -351,6 +375,7 @@
         ],
         "home-21-11": "home-21-11",
         "home-22-05": "home-22-05",
+        "nixgl": "nixgl",
         "nixos": [
           "nixos-22-05"
         ],
diff --git a/flake.nix b/flake.nix
index 547d1db..e8c6dad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,9 @@
     colmena.inputs.nixpkgs.follows = "nixpkgs";
     colmena.inputs.stable.follows = "std/blank";
     colmena.inputs.flake-utils.follows = "std/flake-utils";
+    nixgl.url = "github:guibou/nixGL";
+    nixgl.inputs.nixpkgs.follows = "nixpkgs";
+    nixgl.inputs.flake-utils.follows = "std/flake-utils";
   };
 
   # nixpkgs & home-manager