From b4f9db9a678bb2b31bb8d761a9eb28b5bc616ea8 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 31 Oct 2024 14:09:23 +0000 Subject: [PATCH 1/3] flake: add 'nixgl' There's now a home-manager module for it, let's try it out. --- flake.lock | 25 +++++++++++++++++++++++++ flake.nix | 11 +++++++++++ 2 files changed, 36 insertions(+) diff --git a/flake.lock b/flake.lock index 0f205ab..ad01b76 100644 --- a/flake.lock +++ b/flake.lock @@ -173,6 +173,30 @@ "type": "github" } }, + "nixgl": { + "inputs": { + "flake-utils": [ + "futils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1752644555, @@ -221,6 +245,7 @@ "futils": "futils", "git-hooks": "git-hooks", "home-manager": "home-manager", + "nixgl": "nixgl", "nixpkgs": "nixpkgs", "nur": "nur", "systems": "systems" diff --git a/flake.nix b/flake.nix index 5076729..403f308 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,17 @@ }; }; + nixgl = { + type = "github"; + owner = "nix-community"; + repo = "nixGL"; + ref = "main"; + inputs = { + flake-utils.follows = "futils"; + nixpkgs.follows = "nixpkgs"; + }; + }; + nixpkgs = { type = "github"; owner = "NixOS"; From 84c49405b6500739b08addaf590b1ff59d0abd11 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 31 Oct 2024 14:14:59 +0000 Subject: [PATCH 2/3] home: add 'nix-gl' --- modules/home/default.nix | 1 + modules/home/nix-gl/default.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/home/nix-gl/default.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 1c40377..c85e34f 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -28,6 +28,7 @@ ./mail ./mpv ./nix + ./nix-gl ./nix-index ./nixpkgs ./nm-applet diff --git a/modules/home/nix-gl/default.nix b/modules/home/nix-gl/default.nix new file mode 100644 index 0000000..e7b9a4f --- /dev/null +++ b/modules/home/nix-gl/default.nix @@ -0,0 +1,17 @@ +{ config, inputs, lib, ... }: +let + cfg = config.my.home.nix-gl; +in +{ + options.my.home.nix-gl = with lib; { + enable = mkEnableOption "nixGL configuration"; + }; + + config = lib.mkIf cfg.enable (lib.mkMerge [ + { + nixGL = { + inherit (inputs.nixgl) packages; + }; + } + ]); +} From 22efa99f5f0a7aae1ceaedcfd0f0be10ca8cef95 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 7 Apr 2025 16:15:16 +0000 Subject: [PATCH 3/3] WIP: nixgl wrappers --- modules/home/nix-gl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/home/nix-gl/default.nix b/modules/home/nix-gl/default.nix index e7b9a4f..0f261f9 100644 --- a/modules/home/nix-gl/default.nix +++ b/modules/home/nix-gl/default.nix @@ -11,6 +11,10 @@ in { nixGL = { inherit (inputs.nixgl) packages; + + defaultWrapper = "mesa"; + + installScripts = [ "mesa" ]; }; } ]);