diff --git a/flake.nix b/flake.nix index 05abd2c0..1cebe3a6 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ }; }; - outputs = { self, nixpkgs, ... } @ attrs: + outputs = { self, nixpkgs, mobile-nixos, ... } @ attrs: let inherit (nixpkgs.lib) nixosSystem; inherit (nixpkgs.legacyPackages.x86_64-linux) nixpkgs-fmt callPackage; @@ -77,10 +77,22 @@ then "aarch64-linux" else "x86_64-linux"; specialArgs = attrs // { nix-config = self; }; - modules = [ - ./${file} - ./${directory}/${file} - ]; + modules = + [ + ./${file} + ./${directory}/${file} + ] ++ nixpkgs.lib.optionals (file == "phone.nix") [ + (import "${mobile-nixos}/lib/configuration.nix" { + device = "pine64-pinephone"; + }) + + { + mobile.beautification = { + silentBoot = nixpkgs.lib.mkDefault true; + splash = nixpkgs.lib.mkDefault true; + }; + } + ]; } else import ./${directory}/${file}; }) diff --git a/modules/desktop.nix b/modules/desktop.nix index 3f33e5ed..93d5fd5c 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -43,7 +43,7 @@ in config = { hardware = { - opengl.driSupport32Bit = true; + opengl.driSupport32Bit = mkIf (!phone) true; pulseaudio = mkIf phone { enable = true;