Upstreamed flake-module.nix to nixos-flake

srid/nixos-unified#74
srid · Oct 1, 2024 · 19b0fe2 · 19b0fe2
1 parent 56c93e3
commit 19b0fe2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 62 deletions.
diff --git a/flake-module.nix b/flake-module.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
-    nixos-flake.url = "github:srid/nixos-flake";
+    nixos-flake.url = "github:srid/nixos-flake/autoWire"; # https://github.com/srid/nixos-flake/pull/74
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
     ragenix.url = "github:yaxitech/ragenix";
@@ -39,12 +39,9 @@
       imports = (with builtins;
         map
           (fn: ./modules/flake-parts/${fn})
-          (attrNames (readDir ./modules/flake-parts))) ++
-      [
-        ./flake-module.nix
-      ];
+          (attrNames (readDir ./modules/flake-parts)));
 
-      perSystem = { self', pkgs, lib, system, ... }: {
+      perSystem = { lib, system, ... }: {
         # Make our overlay available to the devShell
         # "Flake parts does not yet come with an endorsed module that initializes the pkgs argument.""
         # So we must do this manually; https://flake.parts/overlays#consuming-an-overlay

diff --git a/modules/flake-parts/nixos-flake.nix b/modules/flake-parts/nixos-flake.nix
@@ -1,7 +1,8 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.nixos-flake.flakeModule
+    inputs.nixos-flake.flakeModules.default
+    inputs.nixos-flake.flakeModules.autoWire
   ];
   perSystem = { self', ... }: {
     packages.default = self'.packages.activate;