From e33da6d8430fac7619634420be276c9cdfc2dad9 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Jul 2023 22:22:59 -0400 Subject: [PATCH] mkSystems -> mkHosts fixed nixosModules output --- flake.nix | 2 +- lib/default.nix | 7 ++++--- modules/nix.nix | 6 +----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 22dc0b9..9e852dd 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ in { inherit lib; nixosConfigurations = - lib.mkSystems + lib.mkHosts "x86_64-linux" [ "gerg-desktop" diff --git a/lib/default.nix b/lib/default.nix index 1e2cce0..07ea9dc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -20,8 +20,8 @@ inputs @ { name: { name = lib.pipe name [ toString - (lib.removePrefix "${path}/") (lib.removeSuffix ".nix") + (lib.removePrefix "${toString path}/") ]; value = import name inputs; } @@ -33,9 +33,10 @@ in { withSystem = f: lib.fold lib.recursiveUpdate {} - (map f ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]); + (map f ["x86_64-linux"]); + #"x86_64-darwin" "aarch64-linux" "aarch64-darwin" - mkSystems = system: names: + mkHosts = system: names: lib.genAttrs names ( name: lib.nixosSystem { diff --git a/modules/nix.nix b/modules/nix.nix index 2e06896..c690677 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,8 +1,4 @@ -inputs: { - pkgs, - config, - ... -}: { +inputs: {pkgs, ...}: { #other nix settings nix = { package = inputs.nix.packages.${pkgs.system}.default;