From c867dd3ea21816e69de08088385d0d9246433765 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Mon, 24 Feb 2025 12:08:53 -0500 Subject: fixed nixGL wrapper --- modules/global.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'modules/global.nix') diff --git a/modules/global.nix b/modules/global.nix index e187685..f26be5f 100644 --- a/modules/global.nix +++ b/modules/global.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ...}: +{ config, lib, pkgs, inputs, ...}: let cfg = config.modules.global; in @@ -20,11 +20,18 @@ in foot.enable = true; sway = { enable = true; - package = if cfg.notNixOS then - config.lib.nixGL.wrap pkgs.sway else pkgs.sway; + wrapWithNixGL = true; +# package = if cfg.notNixOS then + # (config.lib.nixGL.wrap pkgs.sway) else pkgs.sway; +# package = config.lib.nixGL.wrap pkgs.sway; }; }; + nixGL = lib.mkIf cfg.notNixOS { + packages = inputs.nixgl.packages; + defaultWrapper = "mesa"; + }; + programs = { home-manager.enable = true; }; @@ -44,6 +51,7 @@ in wl-clipboard mako wmenu + cmatrix ]); }; -- cgit v1.2.3