refactor: Tidy flake.nix and break it apart

This commit is contained in:
Madeleine Sydney
2024-12-30 19:24:07 -07:00
parent 2e3b262d05
commit c6170d5284
6 changed files with 164 additions and 97 deletions

111
flake.nix
View File

@@ -22,117 +22,34 @@
(nixpkgs.lib.filterAttrs
(k: _v: nixpkgs.lib.hasSuffix ".nix" k)
(builtins.readDir dir));
# Given a path to a directory, return a module that imports «path»/*.nix
collectModules = path:
let modules = list-nix-directory path;
in { pkgs, lib, ... }: {
imports =
lib.debug.traceVal
(builtins.map (m: ./${path}/${m}) modules);
};
in {
# REVIEW: Why don't we put each module under nixosModules.<name>?
# TODO: Deduplicate.
nixosModules.default =
let modules = list-nix-directory ./modules/nixos;
in { ... }: {
in { pkgs, lib, ... }: {
imports =
builtins.map (m: ./modules/nixos/${m}) modules;
};
# TODO: Deduplicate.
homeManagerModules.default =
let modules = list-nix-directory ./modules/home;
in { ... }: {
in { pkgs, lib, ... }: {
imports =
builtins.map (m: ./modules/home/${m}) modules;
};
nixosConfigurations = (
let mkHost = k: v: nixpkgs.lib.nixosSystem {
specialArgs = inputs;
system = import ./hosts/${k}/system.nix;
# TODO: This is very ad-hoc, and I don't like it. Organise this better.
modules = [
./hosts/${k}/configuration.nix
inputs.self.nixosModules.default
inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops
inputs.impermanence.nixosModules.impermanence
nixosConfigurations = import ./outputs/nixosConfigurations.nix inputs;
# Directory name should always match host name.
({ ... }: { networking.hostName = k; })
# Get system users
({ config, lib, ... }: {
users.users =
(lib.mapAttrs
(k: v: (import ./users/${k}).systemConfiguration)
(lib.filterAttrs
(k: _v: builtins.elem k config.sydnix.users.users)
(builtins.readDir ./users)));
})
# Nixpkgs configuration
({ pkgs, ... }: {
nixpkgs.config.allowUnfree = true;
documentation = {
man.enable = true;
info.enable = true;
};
environment.systemPackages = with pkgs; [
man-pages
stdman
man-pages-posix
stdmanpages
];
})
# home-manager configuration.
inputs.home-manager.nixosModules.home-manager
({ config, lib, self, ... }: {
home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
home-manager.users =
lib.filterAttrs
(k: _v: builtins.elem k config.sydnix.users.users)
self.homeConfigurations;
home-manager.extraSpecialArgs = {
utils = import ./lib/utils.nix {
inherit config lib;
pkgs = nixpkgs;
};
};
})
];
};
in
builtins.mapAttrs mkHost (builtins.readDir ./hosts)
);
homeConfigurations =
let users = builtins.readDir ./users;
mkUser = username: _v: {
# TODO: This is very ad-hoc, and I don't like it. Organise this
# better.
imports = [
(import ./users/${username}/default.nix).homeConfiguration
inputs.self.homeManagerModules.default
({ lib, ... }: {
home.username = username;
})
({ pkgs, lib, ... }: {
nix = {
settings.experimental-features =
lib.mkDefault
[ "nix-command" "flakes" ];
};
})
inputs.sops-nix.homeManagerModules.sops
inputs.impermanence.homeManagerModules.impermanence
];
};
in
builtins.mapAttrs mkUser users;
homeConfigurations = import ./outputs/homeConfigurations.nix inputs;
};
}