Merge pull request 'refactor-overlays' (#14) from refactor-overlays into trunk

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/14

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 = [
+                      overlays = with (import ../overlays); [
-                        (import ./nix/overlays)
+                        packages
-                        (import ./nix/overlays/packages.nix)
                       ];
                     };
                  in pkgs.callPackage ./nix/environments/{{ name }}.nix {}

default.nix

@@ -15,9 +15,5 @@
   };
 
   packages = import ./nix/packages;
-
+  overlays = import ./nix/overlays;
-  overlays = {
-    default = import ./nix/overlays;
-    packages = import ./nix/overlays/packages.nix;
-  };
 }

nix/configurations/tungsten.nix

@@ -31,9 +31,12 @@ in
       {
         nixpkgs = {
           hostPlatform = system;
-          overlays = map import [
+          overlays = with (import ../overlays); [
-            ../overlays
+            agenix
-            ../overlays/packages.nix
+            disko
+            nur
+            wired-notify
+            packages
           ];
 
           # Set NIX_PATH and flake registry at the same time

nix/configurations/vanadium.nix

@@ -37,10 +37,14 @@ in
           };
 
           hostPlatform = system;
-          overlays = map import [
+          overlays = with (import ../overlays); [
-            ../overlays
+            agenix
-            ../overlays/packages.nix
+            disko
-            ./vanadium/nixos/overlay.nix
+            nur
+            wired-notify
+            packages
+
+            (import ./vanadium/nixos/overlay.nix)
           ];
 
           # Set NIX_PATH and flake registry at the same time

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)
+  )

nix/overlays/by-name/agenix/overlay.nix

@@ -0,0 +1,5 @@
+{sources}:
+#
+final: prev: {
+  inherit (final.callPackage sources.agenix {}) agenix;
+}

nix/overlays/by-name/disko/overlay.nix

@@ -0,0 +1,7 @@
+{sources}:
+#
+final: _: {
+  disko =
+    final.callPackage (sources.disko + "/package.nix")
+    {diskoVersion = sources.disko.version;};
+}

nix/overlays/by-name/nur/overlay.nix

@@ -0,0 +1,8 @@
+{sources}:
+#
+_: prev: {
+  nur = import sources.nur {
+    nurpkgs = prev;
+    pkgs = prev;
+  };
+}

nix/overlays/by-name/pin-isabelle-2023/overlay.nix

@@ -0,0 +1,6 @@
+{sources}:
+#
+_: _: {
+  # Isabelle version 2023
+  isabelle-2023 = (import sources.pin-isabelle {}).isabelle;
+}

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;
+}

nix/overlays/by-name/wired-notify/overlay.nix

@@ -0,0 +1,2 @@
+{sources}:
+(import sources.wired-notify).overlays.default

nix/overlays/default.nix

@@ -1,31 +1,2 @@
-let
+import ./by-name.nix
-  sources = import ../sources.nix;
+// {packages = import ./packages.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)
-  ]