trim toplevel further

srid · Sep 28, 2024 · 32b5ca0 · 32b5ca0
1 parent 168569e
commit 32b5ca0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/flake-parts/devshell.nix b/flake-parts/devshell.nix
@@ -1,4 +1,8 @@
+{ inputs, ... }:
 {
+  imports = [
+    inputs.treefmt-nix.flakeModule
+  ];
   perSystem = { inputs', config, pkgs, ... }: {
     devShells.default = pkgs.mkShell {
       name = "nixos-config-shell";

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

diff --git a/flake.nix b/flake.nix
@@ -42,18 +42,16 @@
           (attrNames (readDir ./flake-parts))) ++
       [
         ./flake-module.nix
-        inputs.treefmt-nix.flakeModule
-        inputs.nixos-flake.flakeModule
-        inputs.nixos-flake.flakeModule
         ./users
         ./home
         ./nixos
         ./nix-darwin
       ];
 
-
       perSystem = { self', pkgs, 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
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
           overlays = lib.attrValues self.overlays;