diff options
| -rw-r--r-- | modules/nixos/server/default.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/server/services/hercules.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index f1ef1db..9866cd0 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, nixpkgs, ... }: let @@ -16,6 +17,8 @@ in { ]; config = mkIf cfg.enable { + _module.args.unstable = nixpkgs.legacyPackages.${pkgs.system}; + base = { enable = true; documentation.enable = false; @@ -32,8 +35,6 @@ in { settings.allowed-users = [config.networking.hostName]; }; - nixpkgs.overlays = [(_: prev: {unstable = import nixpkgs {inherit (prev) system;};})]; - programs = { git.enable = mkDefault true; vim.defaultEditor = mkDefault true; diff --git a/modules/nixos/server/services/hercules.nix b/modules/nixos/server/services/hercules.nix index eff2b51..4833791 100644 --- a/modules/nixos/server/services/hercules.nix +++ b/modules/nixos/server/services/hercules.nix @@ -1,8 +1,8 @@ { config, lib, - pkgs, self, + unstable, ... }: let cfg = config.server.services.hercules-ci; @@ -45,7 +45,7 @@ in { services = { hercules-ci-agent = { enable = true; - package = pkgs.unstable.hercules-ci-agent; + package = unstable.hercules-ci-agent; settings = { binaryCachesPath = config.age.secrets.binaryCache.path; clusterJoinTokenPath = config.age.secrets.clusterToken.path; |