From 4f9289a35cfeb9aa6298f02b0aab5f4369b8d242 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 11 Oct 2024 13:15:10 -0400 Subject: [PATCH] meta: move mobile-nixos imports out of flake This is part of making the flake easier to understand by separating concerns a bit more. --- flake.nix | 11 ----------- hosts/phone/configuration.nix | 15 +++++++-------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 8c7c8f1c..9d50f665 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ { self, nixpkgs, - mobile-nixos, ... }@attrs: let @@ -113,16 +112,6 @@ modules = [ ./hosts/phone/configuration.nix ./hosts/phone/hardware-configuration.nix - - mobile-nixos.nixosModules.pine64-pinephone - mobile-nixos.nixosModules.module-list - - { - mobile.beautification = { - silentBoot = true; - splash = true; - }; - } ]; }; diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix index 26779eb6..014827ad 100644 --- a/hosts/phone/configuration.nix +++ b/hosts/phone/configuration.nix @@ -1,16 +1,10 @@ -{ - self, - pkgs, - lib, - ... -}: +{ self, ... }: let - inherit (lib) mkIf mkForce; inherit (builtins) attrValues; in { - imports = attrValues self.nixosModules; + imports = attrValues self.nixosModules ++ attrValues self.inputs.mobile-nixos.nixosModules; nixpkgs = { overlays = with self.overlays; [ phinger-cursors ]; @@ -47,4 +41,9 @@ in phone.enable = true; }; + + mobile.beautification = { + silentBoot = true; + splash = true; + }; }