This commit is contained in:
cy 2025-01-21 04:25:30 -05:00
parent ae71a8a779
commit bbcc1433de
4 changed files with 12 additions and 25 deletions

View file

@ -13,7 +13,6 @@ jobs:
- titan - titan
os: os:
- ubuntu-latest - ubuntu-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
continue-on-error: true continue-on-error: true
steps: steps:
@ -28,28 +27,23 @@ jobs:
remove-codeql: 'true' remove-codeql: 'true'
remove-docker-images: 'true' remove-docker-images: 'true'
build-mount-path: /nix build-mount-path: /nix
- uses: nixbuild/nix-quick-install-action@master - uses: nixbuild/nix-quick-install-action@master
- name: Sync repository - name: Sync repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
persist-credentials: false persist-credentials: false
- uses: cachix/cachix-action@v14 - uses: cachix/cachix-action@v14
with: with:
name: cything name: cything
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
useDaemon: false useDaemon: false
installCommand: nix profile install nixpkgs#cachix installCommand: nix profile install nixpkgs#cachix
- name: Setup Attic cache - name: Setup Attic cache
uses: ryanccn/attic-action@v0 uses: ryanccn/attic-action@v0
with: with:
endpoint: ${{ vars.ATTIC_ENDPOINT }} endpoint: ${{ vars.ATTIC_ENDPOINT }}
cache: ${{ vars.ATTIC_CACHE }} cache: ${{ vars.ATTIC_CACHE }}
token: ${{ secrets.ATTIC_TOKEN }} token: ${{ secrets.ATTIC_TOKEN }}
- name: Restore and cache Nix store - name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0 uses: nix-community/cache-nix-action@v5.1.0
with: with:
@ -67,9 +61,7 @@ jobs:
purge-primary-key: never purge-primary-key: never
# always save the cache # always save the cache
save-always: true save-always: true
- run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
build-homes: build-homes:
strategy: strategy:
matrix: matrix:
@ -79,7 +71,6 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
# - macos-latest # - macos-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
continue-on-error: true continue-on-error: true
steps: steps:
@ -94,28 +85,23 @@ jobs:
remove-codeql: 'true' remove-codeql: 'true'
remove-docker-images: 'true' remove-docker-images: 'true'
build-mount-path: /nix build-mount-path: /nix
- uses: nixbuild/nix-quick-install-action@master - uses: nixbuild/nix-quick-install-action@master
- name: Sync repository - name: Sync repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
persist-credentials: false persist-credentials: false
- uses: cachix/cachix-action@v14 - uses: cachix/cachix-action@v14
with: with:
name: cything name: cything
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
useDaemon: false useDaemon: false
installCommand: nix profile install nixpkgs#cachix installCommand: nix profile install nixpkgs#cachix
- name: Setup Attic cache - name: Setup Attic cache
uses: ryanccn/attic-action@v0 uses: ryanccn/attic-action@v0
with: with:
endpoint: ${{ vars.ATTIC_ENDPOINT }} endpoint: ${{ vars.ATTIC_ENDPOINT }}
cache: ${{ vars.ATTIC_CACHE }} cache: ${{ vars.ATTIC_CACHE }}
token: ${{ secrets.ATTIC_TOKEN }} token: ${{ secrets.ATTIC_TOKEN }}
- name: Restore and cache Nix store - name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0 uses: nix-community/cache-nix-action@v5.1.0
with: with:
@ -133,5 +119,4 @@ jobs:
purge-primary-key: never purge-primary-key: never
# always save the cache # always save the cache
save-always: true save-always: true
- run: nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage - run: nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage

View file

@ -6,7 +6,6 @@ on:
description: "package to build" description: "package to build"
required: false required: false
type: string type: string
jobs: jobs:
build-packages: build-packages:
strategy: strategy:
@ -19,32 +18,27 @@ jobs:
- ubuntu-latest - ubuntu-latest
- macos-latest - macos-latest
- ubuntu-24.04-arm - ubuntu-24.04-arm
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
continue-on-error: true continue-on-error: true
steps: steps:
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v30 uses: cachix/install-nix-action@v30
- name: Sync repository - name: Sync repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
persist-credentials: false persist-credentials: false
- uses: cachix/cachix-action@v14 - uses: cachix/cachix-action@v14
with: with:
name: cything name: cything
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
useDaemon: false useDaemon: false
installCommand: nix profile install nixpkgs#cachix installCommand: nix profile install nixpkgs#cachix
- name: Setup Attic cache - name: Setup Attic cache
uses: ryanccn/attic-action@v0 uses: ryanccn/attic-action@v0
with: with:
endpoint: ${{ vars.ATTIC_ENDPOINT }} endpoint: ${{ vars.ATTIC_ENDPOINT }}
cache: ${{ vars.ATTIC_CACHE }} cache: ${{ vars.ATTIC_CACHE }}
token: ${{ secrets.ATTIC_TOKEN }} token: ${{ secrets.ATTIC_TOKEN }}
- name: Restore and cache Nix store - name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0 uses: nix-community/cache-nix-action@v5.1.0
with: with:
@ -62,5 +56,4 @@ jobs:
purge-primary-key: never purge-primary-key: never
# always save the cache # always save the cache
save-always: true save-always: true
- run: nix build -L ${{ matrix.package }} - run: nix build -L ${{ matrix.package }}

View file

@ -32,7 +32,14 @@ in
]; ];
} }
{ command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; }
{ command = [ "wl-paste" "--watch" "cliphist" "store"]; } {
command = [
"wl-paste"
"--watch"
"cliphist"
"store"
];
}
]; ];
hotkey-overlay.skip-at-startup = true; hotkey-overlay.skip-at-startup = true;

View file

@ -1,6 +1,8 @@
final: prev: let final: prev:
let
inherit (prev) lib; inherit (prev) lib;
in { in
{
linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: { linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: {
extraStructuredConfig = with lib.kernel; { extraStructuredConfig = with lib.kernel; {
CONFIG_SCHED_MUQSS = yes; CONFIG_SCHED_MUQSS = yes;