mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-02-07 12:19:07 +00:00
flake.nix: refactor
This commit is contained in:
parent
2f294e257c
commit
d9b8598897
22
flake.nix
22
flake.nix
@ -81,7 +81,7 @@
|
|||||||
|
|
||||||
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
|
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
|
||||||
|
|
||||||
libExtended = nixpkgs.lib.extend (final: prev:
|
lib' = nixpkgs.lib.extend (final: prev:
|
||||||
(import ./lib { lib = prev; }) // {
|
(import ./lib { lib = prev; }) // {
|
||||||
flakeUtils = (import ./lib/flake-utils.nix {
|
flakeUtils = (import ./lib/flake-utils.nix {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
@ -194,24 +194,24 @@
|
|||||||
|
|
||||||
# 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 = libExtended.mapAttrsRecursive
|
nixosConfigurations = lib'.mapAttrsRecursive
|
||||||
(host: path: libExtended.flakeUtils.mkHost path hostDefaultConfig)
|
(host: path: lib'.flakeUtils.mkHost path hostDefaultConfig)
|
||||||
(libExtended.filesToAttr ./hosts);
|
(lib'.filesToAttr ./hosts);
|
||||||
|
|
||||||
# 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.
|
||||||
nixosModules = libExtended.mapAttrsRecursive (_: path: import path)
|
nixosModules = lib'.mapAttrsRecursive (_: path: import path)
|
||||||
(libExtended.filesToAttr ./modules/nixos);
|
(lib'.filesToAttr ./modules/nixos);
|
||||||
|
|
||||||
# I can now install home-manager users in non-NixOS systems.
|
# I can now install home-manager users in non-NixOS systems.
|
||||||
# NICE!
|
# NICE!
|
||||||
homeManagerConfigurations = libExtended.mapAttrs
|
homeManagerConfigurations = lib'.mapAttrs
|
||||||
(_: path: libExtended.flakeUtils.mkUser path userDefaultConfig)
|
(_: path: lib'.flakeUtils.mkUser path userDefaultConfig)
|
||||||
(libExtended.filesToAttr ./users/home-manager);
|
(lib'.filesToAttr ./users/home-manager);
|
||||||
|
|
||||||
# Extending home-manager with my custom modules, if anyone cares.
|
# Extending home-manager with my custom modules, if anyone cares.
|
||||||
homeManagerModules = libExtended.mapAttrsRecursive (_: path: import path)
|
homeManagerModules = lib'.mapAttrsRecursive (_: path: import path)
|
||||||
(libExtended.filesToAttr ./modules/home-manager);
|
(lib'.filesToAttr ./modules/home-manager);
|
||||||
|
|
||||||
# My custom packages, available in here as well. Though, I mainly support
|
# My custom packages, available in here as well. Though, I mainly support
|
||||||
# "x86_64-linux". I just want to try out supporting other systems.
|
# "x86_64-linux". I just want to try out supporting other systems.
|
||||||
|
Loading…
Reference in New Issue
Block a user