From dcb03fa8959c92975ba1ea1eb7c9351bb807916c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 5 Nov 2023 22:28:38 +0100 Subject: [PATCH] nix: Make alacritty and other GL apps runnable Not everyone works, but already something. --- config/nix/hm/desktop.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/config/nix/hm/desktop.nix b/config/nix/hm/desktop.nix index d1d136a..cd56666 100644 --- a/config/nix/hm/desktop.nix +++ b/config/nix/hm/desktop.nix @@ -3,7 +3,6 @@ xsession = { enable = true; windowManager = { - command = "${config.xsession.windowManager.i3.package}/bin/i3"; i3 = { enable = true; config = @@ -439,14 +438,24 @@ }; home = { - file = { - ".xinitrc" = { - source = pkgs.writeShellScript "xinitrc" '' - ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path} - ${config.xsession.windowManager.command} - ''; + file = + let + nixgl = import + (builtins.fetchGit { + url = "https://github.com/nix-community/nixGL"; + rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5"; + }) + { }; + in + { + ".xinitrc" = { + # TODO Configurable + source = pkgs.writeShellScript "xinitrc" '' + ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path} + ${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ${config.xsession.windowManager.command} + ''; + }; }; - }; packages = with pkgs; [ # remote tigervnc