diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 85f932ec..7834b388 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -41,44 +41,7 @@ jobs: uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 with: name: rrvsh - skipPush: true - - - name: Build output - timeout-minutes: 120 - run: nix build --print-build-logs "${{ matrix.target }}" - - darwin: - name: Darwin ${{ matrix.target }} - runs-on: macos-14 - strategy: - fail-fast: false - matrix: - target: - - .#packages.aarch64-darwin.site-bin - - .#packages.aarch64-darwin.site-deploy - - .#darwinConfigurations.alpha.system - - .#darwinConfigurations.auto.system - steps: - - name: Checkout repository - timeout-minutes: 5 - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - with: - persist-credentials: false - - - name: Install Nix - timeout-minutes: 5 - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31.9.0 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - - name: Check runner system - run: test "$(nix eval --impure --raw --expr builtins.currentSystem)" = aarch64-darwin - - - name: Use Cachix - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 - with: - name: rrvsh + extraPullNames: nix-community,hyprland,yazi,cuda-maintainers skipPush: true - name: Build output diff --git a/.github/workflows/publish-cache.yaml b/.github/workflows/publish-cache.yaml index 69ef9483..b853d5b0 100644 --- a/.github/workflows/publish-cache.yaml +++ b/.github/workflows/publish-cache.yaml @@ -42,45 +42,7 @@ jobs: uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 with: name: rrvsh - authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - - - name: Build and publish output - timeout-minutes: 120 - run: nix build --print-build-logs "${{ matrix.target }}" - - darwin: - name: Darwin ${{ matrix.target }} - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/prime' }} - runs-on: macos-14 - strategy: - fail-fast: false - matrix: - target: - - .#packages.aarch64-darwin.site-bin - - .#packages.aarch64-darwin.site-deploy - - .#darwinConfigurations.alpha.system - - .#darwinConfigurations.auto.system - steps: - - name: Checkout repository - timeout-minutes: 5 - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - with: - persist-credentials: false - - - name: Install Nix - timeout-minutes: 5 - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31.9.0 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - - name: Check runner system - run: test "$(nix eval --impure --raw --expr builtins.currentSystem)" = aarch64-darwin - - - name: Use Cachix - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 - with: - name: rrvsh + extraPullNames: nix-community,hyprland,yazi,cuda-maintainers authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - name: Build and publish output diff --git a/.github/workflows/update-flake-lock.yaml b/.github/workflows/update-flake-lock.yaml new file mode 100644 index 00000000..e83a0037 --- /dev/null +++ b/.github/workflows/update-flake-lock.yaml @@ -0,0 +1,44 @@ +name: Update Nix flake lock + +on: + workflow_dispatch: + schedule: + - cron: "0 8 * * 0" + +concurrency: + group: update-flake-lock-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: write + issues: write + pull-requests: write + +jobs: + update-flake-lock: + name: Update flake.lock + runs-on: ubuntu-latest + steps: + - name: Checkout repository + timeout-minutes: 5 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + with: + ref: prime + persist-credentials: false + + - name: Install Nix + timeout-minutes: 5 + uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31.9.0 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + + - name: Update flake.lock + id: update + uses: DeterminateSystems/update-flake-lock@b83e0671a67dfd774680fb1beaa1497ef7e58bfc + with: + token: ${{ secrets.GH_TOKEN_FOR_UPDATES || github.token }} + base: prime + branch: detsys-update-flake-lock + commit-msg: "build(flake.lock): update inputs" + pr-title: "build(flake.lock): update inputs" diff --git a/flake.lock b/flake.lock index 34770058..12a0c2bc 100644 --- a/flake.lock +++ b/flake.lock @@ -590,22 +590,6 @@ "type": "github" } }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1772016279, - "narHash": "sha256-7itkptyjoRcXfGLwg1/jxajetZ3a4mDc66+w4X6yW8s=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "687e43031df0dc641984b4256bcca50d5b3f7de3", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, "mac-app-util": { "inputs": { "cl-nix-lite": "cl-nix-lite", @@ -823,19 +807,6 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D4ely1FsBcvtj/qSrNhSWpq+CUZKNiKwJIxpxnfy9o4=", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre971119.8110df5ad7ab/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, "path-from-root-yazi": { "flake": false, "locked": { @@ -875,25 +846,6 @@ "type": "github" } }, - "prismlauncher-cracked": { - "inputs": { - "libnbtplusplus": "libnbtplusplus", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1776795718, - "narHash": "sha256-yaY/x2U2K/o2lT1ROkqmUzPlwne5pwJmCY5aoS59nLI=", - "owner": "Diegiwg", - "repo": "PrismLauncher-Cracked", - "rev": "0c20d448a3c89cbff85ef5dc7420bf60dc1e65ff", - "type": "github" - }, - "original": { - "owner": "Diegiwg", - "repo": "PrismLauncher-Cracked", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -910,7 +862,6 @@ "nixpkgs": "nixpkgs_5", "nixpkgs-firefox-darwin": "nixpkgs-firefox-darwin", "path-from-root-yazi": "path-from-root-yazi", - "prismlauncher-cracked": "prismlauncher-cracked", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "waybar-peek": "waybar-peek", diff --git a/flake.nix b/flake.nix index ecf015bc..5967d887 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - prismlauncher-cracked.url = "github:Diegiwg/PrismLauncher-Cracked"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/modules/nvidia-graphics.nix b/nix/modules/nvidia-graphics.nix index 4797cdf6..e1345184 100644 --- a/nix/modules/nvidia-graphics.nix +++ b/nix/modules/nvidia-graphics.nix @@ -8,6 +8,14 @@ config.flake.modules.nixos.nvidia-graphics = { config, ... }: { + nix.settings = { + extra-substituters = [ + "https://cuda-maintainers.cachix.org" + ]; + extra-trusted-public-keys = [ + "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + ]; + }; services.xserver.videoDrivers = [ "nvidia" ]; hardware = { graphics = { diff --git a/nix/modules/prismlauncher.nix b/nix/modules/prismlauncher.nix index 2702703f..c2b0faee 100644 --- a/nix/modules/prismlauncher.nix +++ b/nix/modules/prismlauncher.nix @@ -1,4 +1,4 @@ -{ inputs, config, ... }: +{ config, ... }: let cfg = config.flake; osModule = { @@ -13,7 +13,7 @@ in { pkgs, ... }: { home.packages = [ - (inputs.prismlauncher-cracked.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher.override { + (pkgs.prismlauncher.override { jdks = [ pkgs.jdk25 ]; }) ];