From a29a5eb23ca171eefa84123c492242cf965d0786 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 29 Aug 2025 18:46:36 -0400 Subject: [PATCH] add app with nom, rework overlays --- clients/quadphone/gnome.nix | 14 ++++++++------ cross-overlays/quadphone/gnome.nix | 1 + flake.nix | 13 +++++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 cross-overlays/quadphone/gnome.nix diff --git a/clients/quadphone/gnome.nix b/clients/quadphone/gnome.nix index 792366d..6d18302 100644 --- a/clients/quadphone/gnome.nix +++ b/clients/quadphone/gnome.nix @@ -1,9 +1,11 @@ -{ - inputs, - crossPkgs, - ... -}: { - nixpkgs.overlays = [(self: super: inputs.gnome-mobile.overlays.default self crossPkgs)]; +{crossPkgs, ...}: { + nixpkgs.overlays = [ + (self: super: { + gnome-shell = crossPkgs.gnome-shell; + gnome-settings-daemon-mobile = crossPkgs.gnome-settings-daemon-mobile; + mutter = crossPkgs.mutter; + }) + ]; i18n.inputMethod = { enable = true; diff --git a/cross-overlays/quadphone/gnome.nix b/cross-overlays/quadphone/gnome.nix new file mode 100644 index 0000000..46ffb8a --- /dev/null +++ b/cross-overlays/quadphone/gnome.nix @@ -0,0 +1 @@ +inputs: inputs.gnome-mobile.overlays.default diff --git a/flake.nix b/flake.nix index 9dbaaf6..efe9b59 100755 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,11 @@ hostPlatform = info.system; localSystem = info.system; buildPlatform = "x86_64-linux"; + + overlays = let + overlays = lib.filesystem.listFilesRecursive ./cross-overlays/${info.hostname}; + in + map (file: import file inputs) overlays; }; }; @@ -108,6 +113,14 @@ perSystem = {pkgs, ...}: { formatter = pkgs.alejandra; + apps.image = { + type = "app"; + program = pkgs.writeShellApplication { + name = "image"; + runtimeInputs = with pkgs; [nix-output-monitor]; + text = "nix build .#nixosConfigurations.quadphone.config.system.build.image | nom"; + }; + }; }; flake.nixosConfigurations = builtins.mapAttrs (name: value: system ({system = "x86_64-linux";} // value // {hostname = name;})) {