Remove nixGL

This commit is contained in:
Geoffrey Preud'homme 2024-03-26 16:49:09 +01:00
parent 7973e2ccd7
commit fe468eebd7
No known key found for this signature in database
GPG key ID: A8F1DA9A7F67BECA
3 changed files with 1 additions and 14 deletions

View file

@ -30,19 +30,12 @@
# url = "github:nix-community/nixvim"; # url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixgl = {
url = "github:guibou/nixGL";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = "github:nix-community/NUR"; 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 let
nixpkgsConfig = { nixpkgsConfig = {
overlays = [
nixgl.overlay
];
config = { config = {
allowUnfree = true; allowUnfree = true;
# TODO Not sure why, HM needs nixos-option which needs an old Nix? # TODO Not sure why, HM needs nixos-option which needs an old Nix?

View file

@ -1,8 +1,4 @@
{ pkgs, config, lib, ... }: { 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 = [ imports = [
./audio ./audio
@ -25,7 +21,6 @@ in
scriptPath = ".config/xsession"; scriptPath = ".config/xsession";
profilePath = ".config/xprofile"; profilePath = ".config/xprofile";
windowManager = { windowManager = {
command = lib.mkForce "${wmPrefix} ${config.xsession.windowManager.i3.package}/bin/i3";
i3.enable = true; i3.enable = true;
}; };
numlock.enable = config.frogeye.desktop.numlock; numlock.enable = config.frogeye.desktop.numlock;

View file

@ -17,7 +17,6 @@
description = "A list of xrandr screen names from left to right."; description = "A list of xrandr screen names from left to right.";
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
}; };
nixGLIntel = lib.mkEnableOption "Enable nixGLIntel/nixVulkanIntel for windows manager";
maxVideoHeight = lib.mkOption { maxVideoHeight = lib.mkOption {
type = lib.types.int; type = lib.types.int;
description = "Maximum video height in pixel the machine can reasonably watch"; description = "Maximum video height in pixel the machine can reasonably watch";