diff --git a/.forgejo/workflows/push.yaml b/.forgejo/workflows/push.yaml index 8903e5e..cbf6be3 100644 --- a/.forgejo/workflows/push.yaml +++ b/.forgejo/workflows/push.yaml @@ -3,7 +3,6 @@ jobs: test: runs-on: ubuntu-latest steps: - # - uses: DeterminateSystems/nix-installer-action@main - # - uses: DeterminateSystems/magic-nix-cache-action@main - # - run: nix flake check . - - run: echo hi + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main + - run: nix flake check . diff --git a/configurations/nixos/base/default.nix b/configurations/nixos/base-image/default.nix similarity index 80% rename from configurations/nixos/base/default.nix rename to configurations/nixos/base-image/default.nix index 1ccb343..480fe19 100644 --- a/configurations/nixos/base/default.nix +++ b/configurations/nixos/base-image/default.nix @@ -12,7 +12,7 @@ in { imports = [ self.nixosModules.default - # "${modulesPath}/virtualisation/lxc-container.nix" + "${modulesPath}/virtualisation/lxc-container.nix" ]; deploy = { enable = false; @@ -22,7 +22,7 @@ in }; networking = { - hostName = "base"; + hostName = "tofu"; }; environment.systemPackages = [ ]; diff --git a/configurations/nixos/forgejo-runner/default.nix b/configurations/nixos/forgejo-runner/default.nix deleted file mode 100644 index 8403bce..0000000 --- a/configurations/nixos/forgejo-runner/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - flake, - modulesPath, - config, - pkgs, - ... -}: - -let - inherit (flake) inputs; - inherit (inputs) self; -in -{ - imports = [ - self.nixosModules.default - "${modulesPath}/virtualisation/lxc-container.nix" - ]; - - nix.settings = { - allowed-users = [ "gitea-runner" ]; - trusted-users = [ "gitea-runner" ]; - }; - - services.gitea-actions-runner = { - package = pkgs.forgejo-runner; - instances = { - native = { - enable = true; - url = "https://git.skdevstuios.com"; - name = "nix"; - labels = [ "native:host" ]; - tokenFile = config.sops.secrets.forgejo-runners-token.path; - hostPackages = with pkgs; [ - nix - nodejs - git - bash - coreutils - curl - ]; - }; - }; - }; - deploy = { - enable = false; - }; - services = { - tty-ips.enable = true; - }; - networking = { - hostName = "base"; - }; - environment.systemPackages = [ - ]; - system.stateVersion = "25.05"; -}