diff --git a/lib/default.nix b/lib/default.nix index 8e3727e..0c9de1a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,11 +1,11 @@ inputs@{ - stable, + unstable, self, disko, ... }: let - inherit (stable) lib; + inherit (unstable) lib; in # Only good use case for rec rec { @@ -173,12 +173,12 @@ rec { hostName: # Whats lib.nixosSystem? never heard of her lib.evalModules { - specialArgs.modulesPath = "${stable}/nixos/modules"; + specialArgs.modulesPath = "${unstable}/nixos/modules"; modules = builtins.concatLists [ (builtins.attrValues self.nixosModules) (map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}")) - (import "${stable}/nixos/modules/module-list.nix") + (import "${unstable}/nixos/modules/module-list.nix") (lib.singleton { networking = { inherit hostName; diff --git a/modules/hardware.nix b/modules/hardware.nix index 4617787..cc8a20e 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -9,15 +9,13 @@ in }; config = lib.mkMerge [ (lib.mkIf (!cfg.gpuAcceleration.disable) { - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; }) (lib.mkIf (!cfg.sound.disable) { security.rtkit.enable = true; - sound.enable = lib.mkForce false; # disable alsa hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio services.pipewire = { enable = true;