Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 1 addition & 38 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 1 addition & 39 deletions .github/workflows/publish-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/update-flake-lock.yaml
Original file line number Diff line number Diff line change
@@ -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"
49 changes: 0 additions & 49 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 8 additions & 0 deletions nix/modules/nvidia-graphics.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions nix/modules/prismlauncher.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ inputs, config, ... }:
{ config, ... }:
let
cfg = config.flake;
osModule = {
Expand All @@ -13,7 +13,7 @@ in
{ pkgs, ... }:
{
home.packages = [
(inputs.prismlauncher-cracked.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher.override {
(pkgs.prismlauncher.override {
jdks = [ pkgs.jdk25 ];
})
];
Expand Down