From 0fcbb8064dbdcf2ce54cc46cd344d0b740ba88e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 17:58:05 +0200 Subject: [PATCH 01/12] overlays: create indirection --- default.nix | 6 +----- nix/overlays/default.nix | 36 +++++------------------------------- nix/overlays/top-level.nix | 31 +++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 nix/overlays/top-level.nix diff --git a/default.nix b/default.nix index 4b0c6093..95921f55 100644 --- a/default.nix +++ b/default.nix @@ -15,9 +15,5 @@ }; packages = import ./nix/packages; - - overlays = { - default = import ./nix/overlays; - packages = import ./nix/overlays/packages.nix; - }; + overlays = import ./nix/overlays; } diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index b8331e22..d08ea8b6 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -1,31 +1,5 @@ -let - sources = import ../sources.nix; - lib = import (sources.nixpkgs + "/lib"); -in - lib.composeManyExtensions [ - (final: _: { - # Isabelle version 2023 - inherit (import sources.pin-isabelle {}) isabelle; - - # Wireshark bug - # https://gitlab.com/wireshark/wireshark/-/issues/19574 - inherit (import sources.pin-wireshark {}) wireshark; - - wallpapers = final.callPackage sources.wallpapers {}; - - inherit (final.callPackage sources.agenix {}) agenix; - - disko = - final.callPackage (sources.disko + "/package.nix") - {diskoVersion = sources.disko.version;}; - }) - - (_: prev: { - nur = import sources.nur { - nurpkgs = prev; - pkgs = prev; - }; - }) - - ((import sources.wired-notify).overlays.default) - ] +{ + default = import ./top-level.nix; +} +// import ./by-name.nix +// {packages = import ./packages.nix;} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix new file mode 100644 index 00000000..b8331e22 --- /dev/null +++ b/nix/overlays/top-level.nix @@ -0,0 +1,31 @@ +let + sources = import ../sources.nix; + lib = import (sources.nixpkgs + "/lib"); +in + lib.composeManyExtensions [ + (final: _: { + # Isabelle version 2023 + inherit (import sources.pin-isabelle {}) isabelle; + + # Wireshark bug + # https://gitlab.com/wireshark/wireshark/-/issues/19574 + inherit (import sources.pin-wireshark {}) wireshark; + + wallpapers = final.callPackage sources.wallpapers {}; + + inherit (final.callPackage sources.agenix {}) agenix; + + disko = + final.callPackage (sources.disko + "/package.nix") + {diskoVersion = sources.disko.version;}; + }) + + (_: prev: { + nur = import sources.nur { + nurpkgs = prev; + pkgs = prev; + }; + }) + + ((import sources.wired-notify).overlays.default) + ] From 1a9dceb9817577a28259e8919b3e706bfdadc8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 17:51:43 +0200 Subject: [PATCH 02/12] overlays: init by-name structure --- nix/overlays/by-name.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 nix/overlays/by-name.nix diff --git a/nix/overlays/by-name.nix b/nix/overlays/by-name.nix new file mode 100644 index 00000000..432b01e0 --- /dev/null +++ b/nix/overlays/by-name.nix @@ -0,0 +1,12 @@ +let + sources = import ../sources.nix; + lib = import (sources.nixpkgs + "/lib"); +in + lib.mapAttrs + ( + name: _: + import (./by-name + "/${name}/overlay.nix") {inherit sources;} + ) + ( + lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name) + ) From e875c361db06832a99f6d52fde512f273d9b9f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 17:58:28 +0200 Subject: [PATCH 03/12] overlay/isabelle-2023: migrate to by-name --- nix/overlays/by-name/pin-isabelle-2023/overlay.nix | 6 ++++++ nix/overlays/top-level.nix | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 nix/overlays/by-name/pin-isabelle-2023/overlay.nix diff --git a/nix/overlays/by-name/pin-isabelle-2023/overlay.nix b/nix/overlays/by-name/pin-isabelle-2023/overlay.nix new file mode 100644 index 00000000..6084bf40 --- /dev/null +++ b/nix/overlays/by-name/pin-isabelle-2023/overlay.nix @@ -0,0 +1,6 @@ +{sources}: +# +_: _: { + # Isabelle version 2023 + isabelle-2023 = (import sources.pin-isabelle {}).isabelle; +} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index b8331e22..e7fa65ff 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -4,9 +4,6 @@ let in lib.composeManyExtensions [ (final: _: { - # Isabelle version 2023 - inherit (import sources.pin-isabelle {}) isabelle; - # Wireshark bug # https://gitlab.com/wireshark/wireshark/-/issues/19574 inherit (import sources.pin-wireshark {}) wireshark; From 6bd36e99707e8bcc1b779b29bbb1758fd9206b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 17:59:20 +0200 Subject: [PATCH 04/12] overlay/wireshark: migrate to by-name --- nix/overlays/by-name/pin-wireshark/overlay.nix | 7 +++++++ nix/overlays/top-level.nix | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 nix/overlays/by-name/pin-wireshark/overlay.nix diff --git a/nix/overlays/by-name/pin-wireshark/overlay.nix b/nix/overlays/by-name/pin-wireshark/overlay.nix new file mode 100644 index 00000000..499b2cfc --- /dev/null +++ b/nix/overlays/by-name/pin-wireshark/overlay.nix @@ -0,0 +1,7 @@ +{sources}: +# +_: _: { + # Wireshark bug + # https://gitlab.com/wireshark/wireshark/-/issues/19574 + inherit (import sources.pin-wireshark {}) wireshark; +} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index e7fa65ff..4e3baef9 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -4,10 +4,6 @@ let in lib.composeManyExtensions [ (final: _: { - # Wireshark bug - # https://gitlab.com/wireshark/wireshark/-/issues/19574 - inherit (import sources.pin-wireshark {}) wireshark; - wallpapers = final.callPackage sources.wallpapers {}; inherit (final.callPackage sources.agenix {}) agenix; From 5ace920975323d0d37d3173d395a1b7883234ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:00:35 +0200 Subject: [PATCH 05/12] overlay/wallpapers: drop --- nix/overlays/top-level.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index 4e3baef9..844bf4eb 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -4,8 +4,6 @@ let in lib.composeManyExtensions [ (final: _: { - wallpapers = final.callPackage sources.wallpapers {}; - inherit (final.callPackage sources.agenix {}) agenix; disko = From 6bda62ae45c801b7a8a80e43bfbe17aa9f3e2e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:01:25 +0200 Subject: [PATCH 06/12] overlays: agenix: migrate to by-name --- nix/overlays/by-name/agenix/overlay.nix | 5 +++++ nix/overlays/top-level.nix | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 nix/overlays/by-name/agenix/overlay.nix diff --git a/nix/overlays/by-name/agenix/overlay.nix b/nix/overlays/by-name/agenix/overlay.nix new file mode 100644 index 00000000..c517561a --- /dev/null +++ b/nix/overlays/by-name/agenix/overlay.nix @@ -0,0 +1,5 @@ +{sources}: +# +final: prev: { + inherit (final.callPackage sources.agenix {}) agenix; +} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index 844bf4eb..2651568d 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -4,8 +4,6 @@ let in lib.composeManyExtensions [ (final: _: { - inherit (final.callPackage sources.agenix {}) agenix; - disko = final.callPackage (sources.disko + "/package.nix") {diskoVersion = sources.disko.version;}; From e47f1009fabe724ba0efa6baeb0c3e27ac9e95e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:02:22 +0200 Subject: [PATCH 07/12] overlay/disko: migrate to by-name --- nix/overlays/by-name/disko/overlay.nix | 7 +++++++ nix/overlays/top-level.nix | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 nix/overlays/by-name/disko/overlay.nix diff --git a/nix/overlays/by-name/disko/overlay.nix b/nix/overlays/by-name/disko/overlay.nix new file mode 100644 index 00000000..92e12968 --- /dev/null +++ b/nix/overlays/by-name/disko/overlay.nix @@ -0,0 +1,7 @@ +{sources}: +# +final: _: { + disko = + final.callPackage (sources.disko + "/package.nix") + {diskoVersion = sources.disko.version;}; +} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index 2651568d..e0875d21 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -3,12 +3,6 @@ let lib = import (sources.nixpkgs + "/lib"); in lib.composeManyExtensions [ - (final: _: { - disko = - final.callPackage (sources.disko + "/package.nix") - {diskoVersion = sources.disko.version;}; - }) - (_: prev: { nur = import sources.nur { nurpkgs = prev; From 624a7d4e042b249dd4fb0973f0abe3f3e9df9057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:03:05 +0200 Subject: [PATCH 08/12] overlay/nur: migrate to by-name --- nix/overlays/by-name/nur/overlay.nix | 8 ++++++++ nix/overlays/top-level.nix | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 nix/overlays/by-name/nur/overlay.nix diff --git a/nix/overlays/by-name/nur/overlay.nix b/nix/overlays/by-name/nur/overlay.nix new file mode 100644 index 00000000..e4bc5308 --- /dev/null +++ b/nix/overlays/by-name/nur/overlay.nix @@ -0,0 +1,8 @@ +{sources}: +# +_: prev: { + nur = import sources.nur { + nurpkgs = prev; + pkgs = prev; + }; +} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix index e0875d21..7858f621 100644 --- a/nix/overlays/top-level.nix +++ b/nix/overlays/top-level.nix @@ -3,12 +3,5 @@ let lib = import (sources.nixpkgs + "/lib"); in lib.composeManyExtensions [ - (_: prev: { - nur = import sources.nur { - nurpkgs = prev; - pkgs = prev; - }; - }) - ((import sources.wired-notify).overlays.default) ] From 1b6aa25cc9a90e08d4c1a05c290c5188d172c1e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:08:45 +0200 Subject: [PATCH 09/12] overlay/wired-notify: migrate to by-name --- nix/overlays/by-name/wired-notify/overlay.nix | 2 ++ nix/overlays/default.nix | 5 +---- nix/overlays/top-level.nix | 7 ------- 3 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 nix/overlays/by-name/wired-notify/overlay.nix delete mode 100644 nix/overlays/top-level.nix diff --git a/nix/overlays/by-name/wired-notify/overlay.nix b/nix/overlays/by-name/wired-notify/overlay.nix new file mode 100644 index 00000000..507c90c6 --- /dev/null +++ b/nix/overlays/by-name/wired-notify/overlay.nix @@ -0,0 +1,2 @@ +{sources}: +(import sources.wired-notify).overlays.default diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index d08ea8b6..e9a740a0 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -1,5 +1,2 @@ -{ - default = import ./top-level.nix; -} -// import ./by-name.nix +import ./by-name.nix // {packages = import ./packages.nix;} diff --git a/nix/overlays/top-level.nix b/nix/overlays/top-level.nix deleted file mode 100644 index 7858f621..00000000 --- a/nix/overlays/top-level.nix +++ /dev/null @@ -1,7 +0,0 @@ -let - sources = import ../sources.nix; - lib = import (sources.nixpkgs + "/lib"); -in - lib.composeManyExtensions [ - ((import sources.wired-notify).overlays.default) - ] From 4979218e5efd1f926ae08da3000c07c58f60fdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:14:55 +0200 Subject: [PATCH 10/12] vanadium: adapt configuration to new overlay --- nix/configurations/vanadium.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 32f520b8..81e36471 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -37,10 +37,14 @@ in }; hostPlatform = system; - overlays = map import [ - ../overlays - ../overlays/packages.nix - ./vanadium/nixos/overlay.nix + overlays = with (import ../overlays); [ + agenix + disko + nur + wired-notify + packages + + (import ./vanadium/nixos/overlay.nix) ]; # Set NIX_PATH and flake registry at the same time From a0181249755c2bbcece04ea69f3da65118e42a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:15:23 +0200 Subject: [PATCH 11/12] tungsten: adapt configuration to new overlay --- nix/configurations/tungsten.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index b47ead14..5fbbee95 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -31,9 +31,12 @@ in { nixpkgs = { hostPlatform = system; - overlays = map import [ - ../overlays - ../overlays/packages.nix + overlays = with (import ../overlays); [ + agenix + disko + nur + wired-notify + packages ]; # Set NIX_PATH and flake registry at the same time From c68631b3aa938a6b645bcd4a5f58b636d1b816be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:16:39 +0200 Subject: [PATCH 12/12] Just: update overlay used in nix-env setup --- Justfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Justfile b/Justfile index e5729137..1a049073 100644 --- a/Justfile +++ b/Justfile @@ -30,9 +30,8 @@ env name action profilePath="~/.environments": drv=$(nix-build -E " let sources = import ./nix/sources.nix {}; pkgs = import sources.nixpkgs { - overlays = [ - (import ./nix/overlays) - (import ./nix/overlays/packages.nix) + overlays = with (import ../overlays); [ + packages ]; }; in pkgs.callPackage ./nix/environments/{{ name }}.nix {}