diff --git a/.forgejo/workflows/inputs.yml b/.forgejo/workflows/inputs.yml deleted file mode 100644 index f4a5052..0000000 --- a/.forgejo/workflows/inputs.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Update Nix Flake Inputs" -on: - workflow_dispatch: - schedule: - - cron: "0 10 1,14 * *" -jobs: - update: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - name: Install Nix - uses: cachix/install-nix-action@v20 - - name: Update flake inputs - id: update - uses: DeterminateSystems/update-flake-lock@v19 - with: - pr-title: "chore: update flake.lock" - commit-msg: "chore: update flake.lock" - pr-reviewers: iofq - pr-labels: | - dependencies - automated - auto-merge - - name: Print PR number - run: echo Pull request number is ${{ steps.update.outputs.pull-request-number }}. diff --git a/.forgejo/workflows/main.yml b/.forgejo/workflows/main.yml index 36b3551..5b63c12 100644 --- a/.forgejo/workflows/main.yml +++ b/.forgejo/workflows/main.yml @@ -1,23 +1,22 @@ name: build on: - pull_request: - branches: [master] - types: [opened] push: branches: - - master + - main jobs: build: - runs-on: ubuntu-latest + runs-on: nix-latest strategy: matrix: - package_name: ["nvim-min"] + package_name: ["nvim"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/flakehub-cache-action@main + - name: check + run: nix flake check - name: Run `nix bundle` + if: github.ref == 'refs/heads/main' id: build run: | nix bundle \ @@ -27,11 +26,8 @@ jobs: --extra-experimental-features flakes .#${{ matrix.package_name }} echo "Done building AppImage for ${{ matrix.package_name }}" - name: Upload bundle to release - if: github.ref == 'refs/heads/master' - uses: svenstaro/upload-release-action@v2 + if: github.ref == 'refs/heads/main' + uses: https://data.forgejo.org/forgejo/upload-artifact@v4 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: "${{ matrix.package_name }}.AppImage" - asset_name: "${{ matrix.package_name }}-x86_64-linux.AppImage" - tag: latest - overwrite: true + path: "${{ matrix.package_name }}.AppImage" + name: "${{ matrix.package_name }}-x86_64-linux.AppImage" diff --git a/nixos/default.nix b/nixos/default.nix index 999878a..eec6a54 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -33,7 +33,7 @@ in ]; }; consensus = inputs.nixpkgs-stable.lib.nixosSystem { - pkgs = pkgs.stable; + pkgs = pkgs.nixos-stable; specialArgs = { pkgs-unstable = mkPkgs system; inherit inputs system attrs; @@ -47,7 +47,7 @@ in ]; }; zen = inputs.nixpkgs-stable.lib.nixosSystem { - pkgs = pkgs.stable; + pkgs = pkgs.nixos-stable; specialArgs = { inherit inputs system attrs; host = { @@ -60,7 +60,7 @@ in ]; }; oracle1 = inputs.nixpkgs-stable.lib.nixosSystem { - pkgs = pkgs.stable; + pkgs = pkgs.nixos-stable; specialArgs = { inherit inputs system attrs; host = {