diff options
| author | tdback <tyler@tdback.net> | 2024-12-24 17:08:23 -0500 |
|---|---|---|
| committer | tdback <tyler@tdback.net> | 2024-12-24 17:08:23 -0500 |
| commit | 3c50eaf6bed7e8fe65d8bd95df77554caa3280b9 (patch) | |
| tree | cf3a25b00f83b5683ce9392f96d38643f2beed75 | |
| parent | b10b5a159161b4e2eb715193693b34849983f092 (diff) | |
shorten from 'make' to 'mk'
| -rw-r--r-- | flake.nix | 14 | ||||
| -rw-r--r-- | modules/default.nix | 6 |
2 files changed, 10 insertions, 10 deletions
@@ -15,23 +15,23 @@ outputs = { ... }@inputs: let helpers = import ./modules { inherit inputs; }; - inherit (helpers) mergeSets makeSystem; + inherit (helpers) mergeSets mkSystem; in { nixosConfigurations = mergeSets [ - (makeSystem "woodpecker" inputs.nixpkgs [ + (mkSystem "woodpecker" inputs.nixpkgs [ { type = "profiles"; modules = [ "common" "fstrim" "libvirtd" "nvidia" "pipewire" "security" "steam" "wireshark" "x11" ]; } ]) - (makeSystem "sparrow" inputs.nixpkgs [ + (mkSystem "sparrow" inputs.nixpkgs [ { type = "profiles"; modules = [ "common" "pipewire" "security" "vpn" "x11" ]; } ]) - (makeSystem "raindog" inputs.nixpkgs [ + (mkSystem "raindog" inputs.nixpkgs [ { type = "profiles"; modules = [ "common" "security" "upgrade" ]; @@ -39,7 +39,7 @@ { type = "scripts"; modules = [ "motd" "pushover" ]; } { type = "services"; modules = [ "blocky" "searx" "ssh" ]; } ]) - (makeSystem "oasis" inputs.nixpkgs [ + (mkSystem "oasis" inputs.nixpkgs [ { type = "profiles"; modules = [ "common" "podman" "security" "upgrade" "wireguard" "zfs" ]; @@ -50,7 +50,7 @@ modules = [ "cgit" "proxy" "sftpgo" "ssh" ]; } ]) - (makeSystem "hive" inputs.nixpkgs [ + (mkSystem "hive" inputs.nixpkgs [ { type = "profiles"; modules = [ "common" "security" "upgrade" "wireguard" ]; @@ -61,7 +61,7 @@ modules = [ "fediverse" "proxy" "ssh" "web" ]; } ]) - (makeSystem "eden" inputs.nixpkgs [ + (mkSystem "eden" inputs.nixpkgs [ { type = "containers"; modules = [ "freshrss" "jellyfin" "pinchflat" "vaultwarden" "watchtower" ]; diff --git a/modules/default.nix b/modules/default.nix index 4930139..bfa1760 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,14 +3,14 @@ let genModules = { type, modules }: builtins.map (module: "${inputs.self}/modules/${type}/${module}") modules; - makeModules = moduleAttrList: + mkModules = moduleAttrList: builtins.concatMap (moduleAttr: genModules moduleAttr) moduleAttrList; in { - makeSystem = hostname: nixpkgsVersion: modules: { + mkSystem = hostname: nixpkgsVersion: modules: { ${hostname} = nixpkgsVersion.lib.nixosSystem { system = "x86_64-linux"; - modules = (makeModules modules) ++ [ + modules = (mkModules modules) ++ [ "${inputs.self}/hosts/${hostname}" "${inputs.self}/modules/users" inputs.home-manager.nixosModules.home-manager |