diff --git a/configurations/nixos/base/default.nix b/configurations/nixos/base/default.nix index 8483cc4..1ccb343 100644 --- a/configurations/nixos/base/default.nix +++ b/configurations/nixos/base/default.nix @@ -14,7 +14,6 @@ in self.nixosModules.default # "${modulesPath}/virtualisation/lxc-container.nix" ]; - services.yggdrasil.persistentKeys = false; deploy = { enable = false; }; @@ -22,6 +21,7 @@ in tty-ips.enable = true; }; networking = { + hostName = "base"; }; environment.systemPackages = [ diff --git a/configurations/nixos/forgejo-runner/default.nix b/configurations/nixos/forgejo-runner/default.nix index 9f56b1a..8403bce 100644 --- a/configurations/nixos/forgejo-runner/default.nix +++ b/configurations/nixos/forgejo-runner/default.nix @@ -20,10 +20,7 @@ in allowed-users = [ "gitea-runner" ]; trusted-users = [ "gitea-runner" ]; }; - sops.secrets.forgejo-runners-token = { - owner = "gitea-runner"; - user = "gitea-runner"; - }; + services.gitea-actions-runner = { package = pkgs.forgejo-runner; instances = { @@ -31,7 +28,7 @@ in enable = true; url = "https://git.skdevstuios.com"; name = "nix"; - labels = [ "nix:host" ]; + labels = [ "native:host" ]; tokenFile = config.sops.secrets.forgejo-runners-token.path; hostPackages = with pkgs; [ nix diff --git a/modules/nixos/common/deployrs.nix b/modules/nixos/common/deployrs.nix index 61a6c68..b179f7e 100644 --- a/modules/nixos/common/deployrs.nix +++ b/modules/nixos/common/deployrs.nix @@ -1,9 +1,7 @@ { lib, config, ... }: { options.deploy = { - enable = lib.mkEnableOption "enable deployrs module" // { - default = true; - }; + enable = (lib.mkEnableOption // { default = true; }) "enable deployrs module"; address = lib.mkOption { type = lib.types.str; default = config.networking.hostName;