From fe468eebd7a48d1327b7fa2b4ccb919e315f1030 Mon Sep 17 00:00:00 2001 From: Geoffrey Preud'homme Date: Tue, 26 Mar 2024 16:49:09 +0100 Subject: [PATCH] Remove nixGL --- flake.nix | 9 +-------- hm/desktop/default.nix | 5 ----- options.nix | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 46d8381..911dfe3 100644 --- a/flake.nix +++ b/flake.nix @@ -30,19 +30,12 @@ # url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixgl = { - url = "github:guibou/nixGL"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nur.url = "github:nix-community/NUR"; }; - outputs = { self, nixpkgs, disko, nix-on-droid, stylix, nixgl, ... }@attrs: + outputs = { self, nixpkgs, disko, nix-on-droid, stylix, ... }@attrs: let nixpkgsConfig = { - overlays = [ - nixgl.overlay - ]; config = { allowUnfree = true; # TODO Not sure why, HM needs nixos-option which needs an old Nix? diff --git a/hm/desktop/default.nix b/hm/desktop/default.nix index 5450552..7852207 100644 --- a/hm/desktop/default.nix +++ b/hm/desktop/default.nix @@ -1,8 +1,4 @@ { pkgs, config, lib, ... }: -let - nixGLIntelPrefix = "${pkgs.nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel "; - wmPrefix = "${lib.optionalString config.frogeye.desktop.nixGLIntel nixGLIntelPrefix}"; -in { imports = [ ./audio @@ -25,7 +21,6 @@ in scriptPath = ".config/xsession"; profilePath = ".config/xprofile"; windowManager = { - command = lib.mkForce "${wmPrefix} ${config.xsession.windowManager.i3.package}/bin/i3"; i3.enable = true; }; numlock.enable = config.frogeye.desktop.numlock; diff --git a/options.nix b/options.nix index 14afd6f..180c3cb 100644 --- a/options.nix +++ b/options.nix @@ -17,7 +17,6 @@ description = "A list of xrandr screen names from left to right."; type = lib.types.listOf lib.types.str; }; - nixGLIntel = lib.mkEnableOption "Enable nixGLIntel/nixVulkanIntel for windows manager"; maxVideoHeight = lib.mkOption { type = lib.types.int; description = "Maximum video height in pixel the machine can reasonably watch";