diff --git a/.forgejo/workflows/runner-image.yml b/.forgejo/workflows/runner-image.yml index 33889dd..2603866 100644 --- a/.forgejo/workflows/runner-image.yml +++ b/.forgejo/workflows/runner-image.yml @@ -7,7 +7,7 @@ on: - main env: - registry: git.amarth.cloud + registry: ${{ forge.server_url }} owner: chris image: default tag: latest @@ -32,7 +32,7 @@ jobs: run: podman --version - name: Log into registry - run: podman login ${{ env.registry }} + run: podman login --username "${{ forge.actor }}" --password "${{ forge.token }}" ${{ env.registry }} - name: Build image run: >- diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 14060bf..3104ecd 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -15,10 +15,10 @@ in nix = { package = pkgs.nixVersions.latest; - extraOptions = "experimental-features = nix-command flakes pipe-operator"; + extraOptions = "experimental-features = nix-command flakes pipe-operators"; settings = { - experimental-features = [ "nix-command" "flakes" "pipe-operator" ]; + experimental-features = [ "nix-command" "flakes" "pipe-operators" ]; allowed-users = [ "@wheel" ]; trusted-users = [ "@wheel" ]; diff --git a/modules/nixos/services/development/forgejo/Dockerfile.default b/modules/nixos/services/development/forgejo/Dockerfile.default index 799cd67..b252554 100644 --- a/modules/nixos/services/development/forgejo/Dockerfile.default +++ b/modules/nixos/services/development/forgejo/Dockerfile.default @@ -1,5 +1,6 @@ FROM nixos/nix:latest RUN nix-env -iA nixpkgs.nodejs_24 +RUN echo "experimental-features = nix-command flakes pipe-operators" >> /etc/nix/nix.conf CMD ["/bin/bash"] \ No newline at end of file