From ff1da9803efcd5bee443424ad4b55af51ab4bd9a Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 12:33:33 -0400 Subject: [PATCH 01/10] add sqlite for restores Signed-off-by: ahuston-0 --- .github/workflows/cache-merge.yml | 6 +++++- .github/workflows/flake-health-checks.yml | 4 ++++ .github/workflows/flake-update.yml | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index 1a8abc4..e473b1c 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -29,6 +29,8 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main + - run: nix profile install nixpkgs#sqlite + - uses: nix-community/cache-nix-action@v6 name: create and purge common cache with: @@ -80,7 +82,9 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main + - run: nix profile install nixpkgs#sqlite + - name: Restore Nix store - - uses: nix-community/cache-nix-action@v6 + uses: nix-community/cache-nix-action@v6 with: primary-key: similar-cache-${{ matrix.os }}-common-${{ hashFiles('flake.lock') }} diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index 344be26..6f02172 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -18,6 +18,8 @@ jobs: - uses: actions/checkout@v4 + - run: nix profile install nixpkgs#sqlite + - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 @@ -50,6 +52,8 @@ jobs: - uses: actions/checkout@v4 + - run: nix profile install nixpkgs#sqlite + - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 4183801..921a1f9 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -15,6 +15,8 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main + - run: nix profile install nixpkgs#sqlite + - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 -- 2.48.1 From 511335fda39efef6d59f1d8168d12ab6e0073518 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:04 -0400 Subject: [PATCH 02/10] Revert "add sqlite for restores" This reverts commit 474184baa70694ecd8e87bdb32555bc1ffdf5f79. --- .github/workflows/cache-merge.yml | 6 +----- .github/workflows/flake-health-checks.yml | 4 ---- .github/workflows/flake-update.yml | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index e473b1c..1a8abc4 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -29,8 +29,6 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - run: nix profile install nixpkgs#sqlite - - uses: nix-community/cache-nix-action@v6 name: create and purge common cache with: @@ -82,9 +80,7 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - run: nix profile install nixpkgs#sqlite - - name: Restore Nix store - uses: nix-community/cache-nix-action@v6 + - uses: nix-community/cache-nix-action@v6 with: primary-key: similar-cache-${{ matrix.os }}-common-${{ hashFiles('flake.lock') }} diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index 6f02172..344be26 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -18,8 +18,6 @@ jobs: - uses: actions/checkout@v4 - - run: nix profile install nixpkgs#sqlite - - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 @@ -52,8 +50,6 @@ jobs: - uses: actions/checkout@v4 - - run: nix profile install nixpkgs#sqlite - - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 921a1f9..4183801 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -15,8 +15,6 @@ jobs: - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - run: nix profile install nixpkgs#sqlite - - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 -- 2.48.1 From 588d9fe2c774aad57efc68940d65db9bb0f2608f Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:22 -0400 Subject: [PATCH 03/10] Revert "add token to cache-merge" This reverts commit fd826be6da97bd6042d0cd577340df4fa30ec930. --- .github/workflows/cache-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index 1a8abc4..934db37 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -45,7 +45,6 @@ jobs: purge-created: 0 # except the version with the `primary-key`, if it exists purge-primary-key: never - token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} - uses: nix-community/cache-nix-action@v6 name: purge some individual caches -- 2.48.1 From 81fc9dfb750da3249a83758819c8ccde0d9b1aa1 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:32 -0400 Subject: [PATCH 04/10] Revert "add token to cache-merge" This reverts commit ea16a83c2e885f46d136c4ec335747ebf755f16d. --- .github/workflows/cache-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index 934db37..ee7a5f9 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -62,7 +62,6 @@ jobs: purge-created: 259200 # except the version with the `primary-key`, if it exists purge-primary-key: never - token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} # Check that the `common` cache is restored correctly merge-similar-caches-check: -- 2.48.1 From ed44ba20d9a49a47b87375e6f9a5fb8bcfa822af Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:40 -0400 Subject: [PATCH 05/10] Revert "reorder oops" This reverts commit 050b4c9b2f75fe9c64bbe29607095fd93722981f. --- .github/workflows/flake-health-checks.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index 344be26..a3fc849 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -16,8 +16,6 @@ jobs: steps: - uses: DeterminateSystems/nix-installer-action@main - - uses: actions/checkout@v4 - - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 @@ -35,6 +33,8 @@ jobs: token: ${{ secrets.ATTIC_TOKEN }} skip-push: "true" + - uses: actions/checkout@v4 + - run: nix flake check --accept-flake-config - run: nix ./utils/attic-push.bash @@ -48,8 +48,6 @@ jobs: steps: - uses: DeterminateSystems/nix-installer-action@main - - uses: actions/checkout@v4 - - name: Restore Nix store id: restore uses: nix-community/cache-nix-action@v6 @@ -67,6 +65,8 @@ jobs: token: ${{ secrets.ATTIC_TOKEN }} skip-push: "true" + - uses: actions/checkout@v4 + - name: Build all outputs run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . -- 2.48.1 From 0761442b776ebd7d481e1325e9524dcb340cbc5c Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:52 -0400 Subject: [PATCH 06/10] Revert "fix os matrix?" This reverts commit 2a0fe0b106fae625dbb34cd1c4b173ef7498aa53. --- .github/workflows/cache-merge.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index ee7a5f9..b6e84b6 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -20,7 +20,8 @@ jobs: name: Merge similar caches strategy: matrix: - os: [ubuntu-latest] + os: + - [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout this repo @@ -69,7 +70,8 @@ jobs: needs: merge-similar-caches strategy: matrix: - os: [ubuntu-latest] + os: + - [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout this repo -- 2.48.1 From d8d84102ea072e6480b9b6012eec126c72419bf0 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:55:59 -0400 Subject: [PATCH 07/10] Revert "remove dependencies for cache" This reverts commit dcd8b60085772da6114019c24affce905d38db24. --- .github/workflows/cache-merge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml index b6e84b6..013586d 100644 --- a/.github/workflows/cache-merge.yml +++ b/.github/workflows/cache-merge.yml @@ -7,6 +7,8 @@ on: - "**" branches: - main + pull_request: + branches: ["main"] merge_group: schedule: - cron: 0 0 * * * @@ -18,6 +20,7 @@ jobs: # Save new `common` caches merge-similar-caches: name: Merge similar caches + needs: make-similar-caches strategy: matrix: os: -- 2.48.1 From 0b4c86104d549f9077b2815047fcdee81b36e598 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 10 Mar 2025 23:56:07 -0400 Subject: [PATCH 08/10] Revert "add build cache action" This reverts commit d53981c94b045e18f6b7fda3ab52af20de35c6fb. --- .github/workflows/cache-merge.yml | 89 ----------------------- .github/workflows/flake-health-checks.yml | 42 ----------- .github/workflows/flake-update.yml | 88 +++++++++++++--------- 3 files changed, 54 insertions(+), 165 deletions(-) delete mode 100644 .github/workflows/cache-merge.yml diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml deleted file mode 100644 index 013586d..0000000 --- a/.github/workflows/cache-merge.yml +++ /dev/null @@ -1,89 +0,0 @@ -name: Nix CI -on: - push: - # don't run on tags, run on commits - # https://github.com/orgs/community/discussions/25615 - tags-ignore: - - "**" - branches: - - main - pull_request: - branches: ["main"] - merge_group: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - # Merge similar `individual` caches - # Purge `individual` caches and old `common` caches - # Save new `common` caches - merge-similar-caches: - name: Merge similar caches - needs: make-similar-caches - strategy: - matrix: - os: - - [ubuntu-latest] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout this repo - uses: actions/checkout@v4 - - - name: Install nix - uses: https://github.com/DeterminateSystems/nix-installer-action@main - - - uses: nix-community/cache-nix-action@v6 - name: create and purge common cache - with: - primary-key: similar-cache-${{ matrix.os }}-common-${{ hashFiles('flake.lock') }} - # if no hit on the primary key, restore individual caches that match `ci.yaml` - restore-prefixes-all-matches: | - similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # do purge caches - purge: true - # purge old versions of the `common` cache and any versions of individual caches - purge-prefixes: | - similar-cache-${{ matrix.os }}-common- - # created more than 0 seconds ago relative to the start of the `Post Restore` phase - purge-created: 0 - # except the version with the `primary-key`, if it exists - purge-primary-key: never - - - uses: nix-community/cache-nix-action@v6 - name: purge some individual caches - with: - primary-key: similar-cache-${{ matrix.os }}-common-${{ hashFiles('flake.lock') }} - # if no hit on the primary key, restore individual caches that match `ci.yaml` - restore-prefixes-all-matches: | - similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # do purge caches - purge: true - # purge old versions of the `common` cache and any versions of individual caches - purge-prefixes: | - similar-cache-${{ matrix.os }}-individual- - # created more than 0 seconds ago relative to the start of the `Post Restore` phase - purge-created: 259200 - # except the version with the `primary-key`, if it exists - purge-primary-key: never - - # Check that the `common` cache is restored correctly - merge-similar-caches-check: - name: Check a `common` cache is restored correctly - needs: merge-similar-caches - strategy: - matrix: - os: - - [ubuntu-latest] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout this repo - uses: actions/checkout@v4 - - - name: Install nix - uses: https://github.com/DeterminateSystems/nix-installer-action@main - - - name: Restore Nix store - - uses: nix-community/cache-nix-action@v6 - with: - primary-key: similar-cache-${{ matrix.os }}-common-${{ hashFiles('flake.lock') }} diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index a3fc849..4035df0 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -15,16 +15,6 @@ jobs: os: [ubuntu-latest] steps: - uses: DeterminateSystems/nix-installer-action@main - - - name: Restore Nix store - id: restore - uses: nix-community/cache-nix-action@v6 - with: - # save a new cache every time `ci.yaml` changes - primary-key: similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # otherwise, restore a common cache if and only if it matches the current `ci.yaml` - restore-prefixes-first-match: similar-cache-${{ matrix.os }}-common- - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: @@ -32,13 +22,9 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} skip-push: "true" - - uses: actions/checkout@v4 - - run: nix flake check --accept-flake-config - - run: nix ./utils/attic-push.bash - build-checks: name: "Build nix outputs" runs-on: ${{ matrix.os }} @@ -47,16 +33,6 @@ jobs: os: [ubuntu-latest] steps: - uses: DeterminateSystems/nix-installer-action@main - - - name: Restore Nix store - id: restore - uses: nix-community/cache-nix-action@v6 - with: - # save a new cache every time `ci.yaml` changes - primary-key: similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # otherwise, restore a common cache if and only if it matches the current `ci.yaml` - restore-prefixes-first-match: similar-cache-${{ matrix.os }}-common- - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: @@ -64,27 +40,9 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} skip-push: "true" - - uses: actions/checkout@v4 - - name: Build all outputs run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . - - name: Push to Attic run: nix ./utils/attic-push.bash continue-on-error: true - - - name: Save Nix store - if: steps.restore.outputs.hit == 'false' - uses: nix-community/cache-nix-action@v6 - with: - # save a new cache every time `ci.yaml` changes - primary-key: similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # do purge caches - purge: true - # purge all versions of the individual cache - purge-prefixes: similar-cache-${{ matrix.os }}-individual- - # created more than 0 seconds ago relative to the start of the `Post Restore` phase - purge-created: 0 - # except the version with the `primary-key`, if it exists - purge-primary-key: never diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 4183801..4c26304 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -5,25 +5,68 @@ on: schedule: - cron: "00 12 * * *" jobs: + createPullRequest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + # - name: Login to Docker Hub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Install Nix + uses: cachix/install-nix-action@v24 + with: + extra_nix_config: | + experimental-features = nix-command flakes auto-allocate-uids configurable-impure-env + - name: Calculate pre-drv + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . + # - name: Pull latest docker images + # run: nix ./utils/fetch-docker.sh + - name: Update flake.lock (part 1) + run: nix flake update + - name: Calculate post-drv + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . + # - name: Calculate diff + # run: nix ./utils/diff-evals.sh + # - name: Read diff into environment + # run: | + # delimiter="$(openssl rand -hex 8)" + # { + # echo "POSTDIFF<<${delimiter}" + # cat post-diff + # echo "${delimiter}" + # } >> $GITHUB_ENV + + + # - name: Restore flake.lock for next step + # run: git restore flake.lock + # - name: Update flake.lock + # id: update + # uses: DeterminateSystems/update-flake-lock@main + # with: + # token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} + # pr-body: | + # Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action. + + # ``` + # {{ env.GIT_COMMIT_MESSAGE }} + # ``` + + # ``` + # {{ env.POSTDIFF }} + # ``` + # pr-labels: | # Labels to be set on the PR + # dependencies + # automated update_lockfile: runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' # ensure workflow_dispatch only runs on main steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - - name: Restore Nix store - id: restore - uses: nix-community/cache-nix-action@v6 - with: - # save a new cache every time `ci.yaml` changes - primary-key: similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # otherwise, restore a common cache if and only if it matches the current `ci.yaml` - restore-prefixes-first-match: similar-cache-${{ matrix.os }}-common- - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: @@ -31,10 +74,8 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} skip-push: "true" - - name: Get pre-snapshot of evaluations run: nix ./utils/eval-to-drv.sh pre - - name: Update flake.lock id: update run: | @@ -49,13 +90,10 @@ jobs: echo "EOF" >> $GITHUB_ENV rm update.log - - name: Get post-snapshot of evaluations run: nix ./utils/eval-to-drv.sh post - - name: Calculate diff run: nix ./utils/diff-evals.sh - - name: Read diff into environment run: | delimiter="$(openssl rand -hex 8)" @@ -64,7 +102,6 @@ jobs: cat post-diff echo "${delimiter}" } >> $GITHUB_ENV - - name: Write PR body template uses: https://github.com/DamianReeves/write-file-action@v1.3 with: @@ -91,7 +128,6 @@ jobs: with: files: "pr_body.template" output-filename: "pr_body.md" - - name: Save PR body id: pr_body uses: juliangruber/read-file-action@v1 @@ -125,25 +161,9 @@ jobs: pr-labels: | # Labels to be set on the PR dependencies automated - - name: Push to Attic run: nix ./utils/attic-push.bash continue-on-error: true - - - name: Save Nix store - uses: nix-community/cache-nix-action@v6 - with: - # save a new cache every time `ci.yaml` changes - primary-key: similar-cache-${{ matrix.os }}-individual-${{ hashFiles('flake.lock', '*.nix') }} - # do purge caches - purge: true - # purge all versions of the individual cache - purge-prefixes: similar-cache-${{ matrix.os }}-individual- - # created more than 0 seconds ago relative to the start of the `Post Restore` phase - purge-created: 0 - # except the version with the `primary-key`, if it exists - purge-primary-key: never - - name: Print PR number run: | echo "Pull request number is ${{ steps.create-pull-request.outputs.pull-request-number }}." -- 2.48.1 From 5b1ff49a543f943463b8c417165231b338371a7e Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 11 Mar 2025 00:08:51 -0400 Subject: [PATCH 09/10] mount /nix in act runner by default Signed-off-by: ahuston-0 --- systems/palatine-hill/docker/act-runner.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/systems/palatine-hill/docker/act-runner.nix b/systems/palatine-hill/docker/act-runner.nix index 428a285..ccd22dd 100644 --- a/systems/palatine-hill/docker/act-runner.nix +++ b/systems/palatine-hill/docker/act-runner.nix @@ -23,6 +23,7 @@ in "${act_path}/stable-latest-main/config.yaml:/config.yaml" "${act_path}/stable-latest-main/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; @@ -45,6 +46,7 @@ in "${act_path}/stable-latest-1/config.yaml:/config.yaml" "${act_path}/stable-latest-1/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; @@ -67,6 +69,7 @@ in "${act_path}/stable-latest-2/config.yaml:/config.yaml" "${act_path}/stable-latest-2/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; @@ -89,6 +92,7 @@ in "${act_path}/stable-latest-3/config.yaml:/config.yaml" "${act_path}/stable-latest-3/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; @@ -111,6 +115,7 @@ in "${act_path}/stable-latest-4/config.yaml:/config.yaml" "${act_path}/stable-latest-4/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; @@ -133,6 +138,7 @@ in "${act_path}/stable-latest-5/config.yaml:/config.yaml" "${act_path}/stable-latest-5/data:/data" "/var/run/docker.sock:/var/run/docker.sock" + "/nix:/nix" ]; environment = { CONFIG_FILE = "/config.yaml"; -- 2.48.1 From 96f4f72ff0c2dcc45c0ece87d5c18aaf21038558 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 11 Mar 2025 13:15:11 -0400 Subject: [PATCH 10/10] add UWSM to hyprland Signed-off-by: ahuston-0 --- systems/artemision/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/artemision/desktop.nix b/systems/artemision/desktop.nix index a8e4065..207b75f 100644 --- a/systems/artemision/desktop.nix +++ b/systems/artemision/desktop.nix @@ -7,6 +7,7 @@ hyprland = { enable = true; xwayland.enable = true; + withUWSM = true; }; hyprlock.enable = true; gnupg.agent = { -- 2.48.1