configuration/common/default.nix

@@ -14,4 +14,8 @@
   ];
 
   services.fstrim.enable = true;
+
+  nixpkgs.overlays = [
+    (import ../../pkgs/overlay.nix)
+  ];
 }

flake.nix

@@ -86,16 +86,11 @@
       };
     } // helper.mapToColmenaHosts self.nixosConfigurations;
 
-    overlays = {
-      clerie = import ./pkgs/overlay.nix;
-      default = self.overlays.clerie;
-    };
-
     packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
-          self.overlays.clerie
+          (import ./pkgs/overlay.nix)
           (_: _: {
             inherit (agenix.packages.${system})
               agenix;

lib/flake-helper.nix

@@ -26,7 +26,6 @@ rec {
       ../users/clerie
       ({ ... }: {
         nixpkgs.overlays = [
-          self.overlays.clerie
           (_: _: {
             inherit (agenix.packages."x86_64-linux")
               agenix;

pkgs/default.nix

@@ -0,0 +1,5 @@
+import <nixpkgs> {
+  overlays = [
+    (import ./overlay.nix)
+  ];
+}

pkgs/overlay.nix

@@ -1,20 +1,20 @@
-final: prev: {
+self: super: {
-  anycast_healthchecker = final.python3.pkgs.callPackage ./anycast_healthchecker {};
+  anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {};
-  flask-excel = final.python3.pkgs.callPackage ./flask-excel {};
+  flask-excel = self.python3.pkgs.callPackage ./flask-excel {};
-  iot-data = final.python3.pkgs.callPackage ./iot-data {};
+  iot-data = self.python3.pkgs.callPackage ./iot-data {};
-  nixfiles-add-secret = final.callPackage ./nixfiles/nixfiles-add-secret.nix {};
+  nixfiles-add-secret = self.callPackage ./nixfiles/nixfiles-add-secret.nix {};
-  nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
+  nixfiles-auto-install = self.callPackage ./nixfiles/nixfiles-auto-install.nix {};
-  nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
+  nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
-  nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
+  nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {};
-  nixfiles-system-upgrade = final.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
+  nixfiles-system-upgrade = self.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
-  nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
+  nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
-  nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
+  nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
-  nixos-firewall-tool = final.callPackage ./nixos-firewall-tool {};
+  nixos-firewall-tool = self.callPackage ./nixos-firewall-tool {};
-  pyexcel-xlsx = final.python3.pkgs.callPackage ./pyexcel-xlsx {};
+  pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {};
-  pyexcel-webio = final.python3.pkgs.callPackage ./pyexcel-webio {};
+  pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
-  update-from-hydra = final.callPackage ./update-from-hydra {};
+  update-from-hydra = self.callPackage ./update-from-hydra {};
-  uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {};
+  uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};
-  wetter = final.python3.pkgs.callPackage ./wetter {
+  wetter = self.python3.pkgs.callPackage ./wetter {
-    inherit (final) pkg-config libsass;
+    inherit (self) pkg-config libsass;
   };
 }