añade fix de nixGL

This commit is contained in:
Fabián Montero 2022-11-29 17:28:53 -06:00
parent e18fc7ff28
commit 04a58457f8
7 changed files with 33 additions and 7 deletions

View file

@ -4,6 +4,7 @@
unstable.url = "github:nixos/nixpkgs/master";
nur.url = "github:nix-community/NUR";
hm-isolation.url = "github:3442/hm-isolation";
nixGL.url = "github:guibou/nixGL";
home-manager = {
url = "github:nix-community/home-manager/release-22.11"; # actualizar esto para actualizar
@ -11,7 +12,7 @@
};
};
outputs = {self, nixpkgs, unstable, home-manager, nur, hm-isolation, ...}:
outputs = {self, nixpkgs, unstable, home-manager, nur, hm-isolation, nixGL, ...}:
let
system = "x86_64-linux";
@ -38,7 +39,7 @@
modules = [
(import ./home {
inherit self nixpkgs unstable hm-isolation;
inherit self nixpkgs unstable hm-isolation nixGL;
})
./home/platforms/${platform}.nix

View file

@ -1,4 +1,4 @@
{ self, nixpkgs, unstable, hm-isolation }:
{ self, nixpkgs, unstable, hm-isolation, nixGL }:
{ config, pkgs, lib, ... } :
with lib;
{
@ -7,12 +7,12 @@ with lib;
./allowUnfreeWhitelist.nix
./gui
./isolation.nix
./local.nix
./options.nix
./path.nix
./systemd
];
nixpkgs.overlays = [ self.overlay ];
nixpkgs.overlays = [ self.overlay nixGL.overlay ];
home = {
stateVersion = "21.11"; # No tocar esto

View file

@ -6,8 +6,6 @@ with lib;
config = mkIf ( !config.home.isolation.active ) {
xsession.enable = true;
services.picom = {
enable = true;
};

19
home/gui/startx.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, pkgs, lib, ... } :
with lib;
{
config = mkIf ( !config.home.isolation.active ) {
xsession.enable = true;
home.files.".xinitrc".source = let
content = if config.local.nixos then ''
exec ~/.xsession
'' else ''
exec ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel ~/.xsession
'';
in
pkgs.writeShellScript "xinitrc" content;
};
}

View file

@ -15,5 +15,9 @@ with lib;
type = nullOr str;
};
};
nixos = {
type = bool;
};
};
}

View file

@ -3,4 +3,6 @@
"0" = "DisplayPort-0";
"1" = "DisplayPort-1";
};
config.local.nixos = true;
}

View file

@ -3,4 +3,6 @@
"0" = "eDP-1";
"1" = null;
};
config.local.nixos = false;
}