foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-31 04:58:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

config: refactor image and user listing

Browse Source
This commit is contained in:
Gabriel Arazas 2023-08-04 10:03:38 +08:00
parent 0e6f3cea8c
commit e9ff0dc7fa
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.nix
View File

@ -77,10 +77,10 @@
# A set of images with their metadata that is usually built for usual # A set of images with their metadata that is usually built for usual
# purposes. The format used here is whatever formats nixos-generators # purposes. The format used here is whatever formats nixos-generators
# support. # support.
images = lib'.importTOML ./images.toml; images = listImagesWithSystems (lib'.importTOML ./images.toml);
# A set of users with their metadata to be deployed with home-manager. # A set of users with their metadata to be deployed with home-manager.
users = lib'.importTOML ./users.toml; users = listImagesWithSystems (lib'.importTOML ./users.toml);
# A set of image-related utilities for the flake outputs. # A set of image-related utilities for the flake outputs.
inherit (import ./lib/images.nix { inherit inputs; lib = lib'; }) mkHost mkHome mkImage listImagesWithSystems; inherit (import ./lib/images.nix { inherit inputs; lib = lib'; }) mkHost mkHome mkImage listImagesWithSystems;
@ -303,9 +303,6 @@
# A list of NixOS configurations from the `./hosts` folder. It also has # A list of NixOS configurations from the `./hosts` folder. It also has
# some sensible default configurations. # some sensible default configurations.
nixosConfigurations = nixosConfigurations =
let
images' = listImagesWithSystems images;
in
lib'.mapAttrs lib'.mapAttrs
(filename: host: (filename: host:
let let
@ -330,7 +327,7 @@
system = host._system; system = host._system;
nixpkgs-channel = host.nixpkgs-channel or "nixpkgs"; nixpkgs-channel = host.nixpkgs-channel or "nixpkgs";
}) })
(lib'.filterAttrs (_: host: (host.format or "iso") == "iso") images'); (lib'.filterAttrs (_: host: (host.format or "iso") == "iso") images);
# We're going to make our custom modules available for our flake. Whether # We're going to make our custom modules available for our flake. Whether
# or not this is a good thing is debatable, I just want to test it. # or not this is a good thing is debatable, I just want to test it.
@ -339,9 +336,6 @@
# I can now install home-manager users in non-NixOS systems. # I can now install home-manager users in non-NixOS systems.
# NICE! # NICE!
homeConfigurations = homeConfigurations =
let
users' = listImagesWithSystems users;
in
lib'.mapAttrs lib'.mapAttrs
(filename: metadata: (filename: metadata:
let let
@ -350,7 +344,7 @@
pkgs = import inputs."${metadata.nixpkgs-channel or "nixpkgs"}" { pkgs = import inputs."${metadata.nixpkgs-channel or "nixpkgs"}" {
inherit system overlays; inherit system overlays;
}; };
path = ./users/home-manager/${filename}; path = ./users/home-manager/${name};
extraModules = [ extraModules = [
({ pkgs, config, ... }: { ({ pkgs, config, ... }: {
# To be able to use the most of our config as possible, we want # To be able to use the most of our config as possible, we want
@ -378,7 +372,7 @@
inherit pkgs system extraModules extraArgs; inherit pkgs system extraModules extraArgs;
home-manager-channel = metadata.home-manager-channel or "home-manager"; home-manager-channel = metadata.home-manager-channel or "home-manager";
}) })
users'; users;
# Extending home-manager with my custom modules, if anyone cares. # Extending home-manager with my custom modules, if anyone cares.
homeModules = homeModules =