colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

flake: remove extraneous toplevel items from outputs

Browse Source
This commit is contained in:
colin
2022-06-23 15:57:20 -07:00
parent f7da8e2218
commit fe51bb9ab4
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
flake.nix
View File

@@ -19,16 +19,10 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
}; };
outputs = { self, nixpkgs, mobile-nixos, home-manager, nurpkgs, sops-nix, impermanence }: { outputs = { self, nixpkgs, mobile-nixos, home-manager, nurpkgs, sops-nix, impermanence }:
machines.servo = self.decl-bootable-machine { name = "servo"; system = "aarch64-linux"; }; let
machines.desko = self.decl-bootable-machine { name = "desko"; system = "x86_64-linux"; }; decl-machine = { name, system }:
machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; }; let
machines.moby = self.decl-bootable-machine { name = "moby"; system = "aarch64-linux"; };
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) self.machines;
imgs = builtins.mapAttrs (name: value: value.img) self.machines;
decl-machine = { name, system }: let
patchedPkgs = nixpkgs.legacyPackages.${system}.applyPatches { patchedPkgs = nixpkgs.legacyPackages.${system}.applyPatches {
name = "nixpkgs-patched-uninsane"; name = "nixpkgs-patched-uninsane";
src = nixpkgs; src = nixpkgs;
@@ -53,27 +47,27 @@
]; ];
}; };
nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix"); nixosSystem = import (patchedPkgs + "/nixos/lib/eval-config.nix");
in (nixosSystem { in (nixosSystem {
inherit system; inherit system;
specialArgs = { inherit nixpkgs mobile-nixos home-manager nurpkgs impermanence; }; specialArgs = { inherit nixpkgs mobile-nixos home-manager nurpkgs impermanence; };
modules = [ modules = [
./modules ./modules
./machines/${name} ./machines/${name}
(import ./helpers/set-hostname.nix name) (import ./helpers/set-hostname.nix name)
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
nurpkgs.overlay nurpkgs.overlay
(import "${mobile-nixos}/overlay/overlay.nix") (import "${mobile-nixos}/overlay/overlay.nix")
(import ./pkgs/overlay.nix) (import ./pkgs/overlay.nix)
]; ];
} }
]; ];
}); });
decl-bootable-machine = { name, system }: rec { decl-bootable-machine = { name, system }: rec {
nixosConfiguration = self.decl-machine { inherit name system; }; nixosConfiguration = decl-machine { inherit name system; };
# this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition). # this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
# after building this: # after building this:
# - flash it to a bootable medium (SD card, flash drive) # - flash it to a bootable medium (SD card, flash drive)
@@ -82,6 +76,13 @@
# - `nixos-rebuild --flake './#<machine>' switch` # - `nixos-rebuild --flake './#<machine>' switch`
img = nixosConfiguration.config.system.build.img; img = nixosConfiguration.config.system.build.img;
}; };
machines.servo = decl-bootable-machine { name = "servo"; system = "aarch64-linux"; };
machines.desko = decl-bootable-machine { name = "desko"; system = "x86_64-linux"; };
machines.lappy = decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
machines.moby = decl-bootable-machine { name = "moby"; system = "aarch64-linux"; };
in {
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
imgs = builtins.mapAttrs (name: value: value.img) machines;
}; };
} }