freun-dev: drop duplicated unstable overlay and nix settings #17

Open
hermes wants to merge 1 commit from fix/dedupe-unstable-overlay into main
Collaborator

freun-dev.nix defines its own unstable overlay and its own experimental-features/auto-optimise-store settings even though it imports the nixpkgs module (which provides the overlay). Remove the duplicate overlay and restated settings; keep allowUnfree and host-specific min-free/max-free/trusted-users. Verified nix eval of freun-dev toplevel succeeds.

freun-dev.nix defines its own unstable overlay and its own experimental-features/auto-optimise-store settings even though it imports the nixpkgs module (which provides the overlay). Remove the duplicate overlay and restated settings; keep allowUnfree and host-specific min-free/max-free/trusted-users. Verified nix eval of freun-dev toplevel succeeds.
freun-dev: drop duplicated unstable overlay and nix settings
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 3m57s
6ce55be8f5
repomaa force-pushed fix/dedupe-unstable-overlay from 6ce55be8f5
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 3m57s
to c2f03b6230
Some checks failed
Build Images / build (pull_request) Has been cancelled
Check / check (pull_request) Has been cancelled
2026-09-27 22:48:52 +03:00
Compare
repomaa force-pushed fix/dedupe-unstable-overlay from c2f03b6230
Some checks failed
Build Images / build (pull_request) Has been cancelled
Check / check (pull_request) Has been cancelled
to 405c51bf01
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 3m50s
2026-09-27 22:56:24 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from 405c51bf01
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 3m50s
to d33be59b19
All checks were successful
Build Images / build (pull_request) Successful in 43s
Check / check (pull_request) Successful in 6m18s
2026-09-30 10:40:46 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from d33be59b19
All checks were successful
Build Images / build (pull_request) Successful in 43s
Check / check (pull_request) Successful in 6m18s
to c91f4ee4ba
All checks were successful
Build Images / build (pull_request) Successful in 42s
Check / check (pull_request) Successful in 5m0s
2026-09-30 11:08:40 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from c91f4ee4ba
All checks were successful
Build Images / build (pull_request) Successful in 42s
Check / check (pull_request) Successful in 5m0s
to d0e71a0fe9
Some checks failed
Build Images / build (pull_request) Has been cancelled
Check / check (pull_request) Has been cancelled
2026-10-01 00:22:56 +03:00
Compare
Author
Collaborator

Rebased onto main after the hermes-fallback conflict. Main's nix.settings form was kept and only the duplicated experimental-features/auto-optimise-store (via nixos.nix) and the duplicated unstable overlay (via nixos.nixpkgs) are dropped — the PR's original delta, now conflict-free.

Verified: nix eval of the freun-dev toplevel drvPath succeeds.

Rebased onto main after the hermes-fallback conflict. Main's `nix.settings` form was kept and only the duplicated `experimental-features`/`auto-optimise-store` (via `nixos.nix`) and the duplicated `unstable` overlay (via `nixos.nixpkgs`) are dropped — the PR's original delta, now conflict-free. Verified: `nix eval` of the `freun-dev` toplevel drvPath succeeds.
hermes force-pushed fix/dedupe-unstable-overlay from d0e71a0fe9
Some checks failed
Build Images / build (pull_request) Has been cancelled
Check / check (pull_request) Has been cancelled
to 495f10230f
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 5m0s
2026-10-01 00:50:36 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from 495f10230f
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 5m0s
to 0c1f84083c
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 5m21s
2026-10-01 09:07:28 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from 0c1f84083c
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 5m21s
to 0aeed26d68
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 5m35s
2026-10-01 14:56:57 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from 0aeed26d68
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 5m35s
to 325a63607b
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 6m6s
2026-10-06 10:44:29 +03:00
Compare
hermes force-pushed fix/dedupe-unstable-overlay from 325a63607b
All checks were successful
Build Images / build (pull_request) Successful in 40s
Check / check (pull_request) Successful in 6m6s
to 335ffa1eb4
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 5m33s
2026-10-06 12:53:03 +03:00
Compare
All checks were successful
Build Images / build (pull_request) Successful in 41s
Check / check (pull_request) Successful in 5m33s
Required
Details
This pull request has changes conflicting with the target branch.
  • modules/hosts/freun-dev/freun-dev.nix
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'fix/dedupe-unstable-overlay:fix/dedupe-unstable-overlay'
git switch 'fix/dedupe-unstable-overlay'
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
repomaa/nixos!17
No description provided.