diff --git a/flake.nix b/flake.nix index caf4657..7d45123 100644 --- a/flake.nix +++ b/flake.nix @@ -111,20 +111,16 @@ specialArgs = ulib; - importConfigurations = hosts: builtins.concatMap (host: { - ${host} = lib.nixosSystem { - inherit specialArgs; + importConfiguration = host: lib.nixosSystem { + inherit specialArgs; - modules = [ - homeManager.nixosModules.default - (defaultConfiguration host) - ./machines/${host} - ]; - }; - }) hosts; + modules = [ + homeManager.nixosModules.default + (defaultConfiguration host) + ./machines/${host} + ]; + }; in { - nixosConfigurations = importConfigurations [ - "enka" - ]; + nixosConfigurations.enka = importConfiguration "enka"; }); } diff --git a/machines/enka/default.nix b/machines/enka/default.nix index eca3324..1e271f0 100644 --- a/machines/enka/default.nix +++ b/machines/enka/default.nix @@ -1,4 +1,4 @@ -{ lib, systemConfiguration, homeConfiguration, imports, ... }: lib.recursiveUpdate3 +{ recursiveUpdate3, systemConfiguration, homeConfiguration, imports, ... }: recursiveUpdate3 (systemConfiguration { boot.loader = { diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix index f2d2ad3..391d4ef 100644 --- a/machines/enka/hyprland/default.nix +++ b/machines/enka/hyprland/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, hyprland, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate3 +{ pkgs, recursiveUpdate3, hyprland, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3 (systemConfiguration { hardware.opengl = enabled {}; diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix index c52ca16..23b8a22 100644 --- a/machines/enka/nushell/default.nix +++ b/machines/enka/nushell/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate3 +{ pkgs, recursiveUpdate3, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3 (systemConfiguration { users.defaultUserShell = pkgs.nushell;