From bbcc1433dedd20b729be32f145ebdefb4f92dae0 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:25:30 -0500 Subject: [PATCH] nix fmt --- .github/workflows/build-machines-and-homes.yml | 15 --------------- .github/workflows/build-packages.yml | 7 ------- home/niri/default.nix | 9 ++++++++- overlay/kernel.nix | 6 ++++-- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index 6ae6746..f5de126 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -13,7 +13,6 @@ jobs: - titan os: - ubuntu-latest - runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -28,28 +27,23 @@ jobs: remove-codeql: 'true' remove-docker-images: 'true' build-mount-path: /nix - - uses: nixbuild/nix-quick-install-action@master - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -67,9 +61,7 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel - build-homes: strategy: matrix: @@ -79,7 +71,6 @@ jobs: os: - ubuntu-latest # - macos-latest - runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -94,28 +85,23 @@ jobs: remove-codeql: 'true' remove-docker-images: 'true' build-mount-path: /nix - - uses: nixbuild/nix-quick-install-action@master - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -133,5 +119,4 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index a177078..4408d30 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -6,7 +6,6 @@ on: description: "package to build" required: false type: string - jobs: build-packages: strategy: @@ -19,32 +18,27 @@ jobs: - ubuntu-latest - macos-latest - ubuntu-24.04-arm - runs-on: ${{ matrix.os }} continue-on-error: true steps: - name: Install Nix uses: cachix/install-nix-action@v30 - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -62,5 +56,4 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L ${{ matrix.package }} diff --git a/home/niri/default.nix b/home/niri/default.nix index 40c53d6..af7b3ba 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -32,7 +32,14 @@ in ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } - { command = [ "wl-paste" "--watch" "cliphist" "store"]; } + { + command = [ + "wl-paste" + "--watch" + "cliphist" + "store" + ]; + } ]; hotkey-overlay.skip-at-startup = true; diff --git a/overlay/kernel.nix b/overlay/kernel.nix index e845a1e..be2404e 100644 --- a/overlay/kernel.nix +++ b/overlay/kernel.nix @@ -1,6 +1,8 @@ -final: prev: let +final: prev: +let inherit (prev) lib; -in { +in +{ linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: { extraStructuredConfig = with lib.kernel; { CONFIG_SCHED_MUQSS = yes;