diff --git a/hosts/best/default.nix b/hosts/best/default.nix index e4e73df..1b959ec 100644 --- a/hosts/best/default.nix +++ b/hosts/best/default.nix @@ -1,4 +1,4 @@ -lib: lib.nixosSystem ({ config, keys, lib, ... }: let +lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { imports = collectNix ./. |> remove ./default.nix; diff --git a/hosts/disk/default.nix b/hosts/disk/default.nix index d85c6a0..8e6cdcd 100644 --- a/hosts/disk/default.nix +++ b/hosts/disk/default.nix @@ -1,4 +1,4 @@ -lib: lib.nixosSystem ({ config, keys, lib, ... }: let +lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { imports = collectNix ./. |> remove ./default.nix; diff --git a/hosts/nine/default.nix b/hosts/nine/default.nix index 51b814c..2d06ed6 100644 --- a/hosts/nine/default.nix +++ b/hosts/nine/default.nix @@ -1,4 +1,4 @@ -lib: lib.nixosSystem ({ config, keys, lib, ... }: let +lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { imports = collectNix ./. |> remove ./default.nix; diff --git a/hosts/pala/default.nix b/hosts/pala/default.nix index f4afdb5..d0f1b58 100644 --- a/hosts/pala/default.nix +++ b/hosts/pala/default.nix @@ -1,4 +1,4 @@ -lib: lib.darwinSystem ({ lib, ... }: let +lib: lib.darwinSystem' ({ lib, ... }: let inherit (lib) collectNix remove; in { imports = collectNix ./. |> remove ./default.nix; diff --git a/lib/system.nix b/lib/system.nix index 0aed4cd..cec5a59 100644 --- a/lib/system.nix +++ b/lib/system.nix @@ -24,7 +24,7 @@ inputs: self: super: let lib = self; }; in { - nixosSystem = module: super.nixosSystem { + nixosSystem' = module: super.nixosSystem { inherit specialArgs; modules = [ @@ -35,7 +35,7 @@ in { ++ inputModulesLinux; }; - darwinSystem = module: super.darwinSystem { + darwinSystem' = module: super.darwinSystem { inherit specialArgs; modules = [ diff --git a/modules/linux/restic/default.nix b/modules/linux/restic/default.nix index 5834311..7596bfa 100644 --- a/modules/linux/restic/default.nix +++ b/modules/linux/restic/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let inherit (lib) genAttrs mkConst mkIf remove; in{ - options.services.restic.hosts = mkConst remove config.networking.hostName [ "nine" "best" ]; + options.services.restic.hosts = mkConst <| remove config.networking.hostName [ "nine" "best" ]; config.secrets.resticPassword.file = mkIf config.isServer ./password.age;