flake.nix

@@ -1,4 +1,3 @@
-# vim: set foldmethod=marker:
 {
   description = "NixOS Configuration";
 
@@ -110,27 +109,11 @@
     flake-parts,
     ...
   } @ inputs:
-    flake-parts.lib.mkFlake {inherit inputs;} (
+    flake-parts.lib.mkFlake {inherit inputs;} ({
-      {
         inputs,
         self,
-        config,
-        lib,
         ...
-      } @ flakeArgs: {
+      } @ flakeArgs: let
-        # flake-parts imports
-        imports = [
-          ./flake
-        ];
-
-        config = {
-          # flake-parts systems (still uses nix-systems)
-          systems = import inputs.systems;
-
-          debug = lib.mkDefault true;
-
-          flake = let
-            # {{{
         inherit (inputs) nixpkgs nixpkgs-unstable;
         inherit (self) outputs;
         # inputs is already defined
@@ -417,8 +400,8 @@
               }
               // builtins.removeAttrs args
               ["system" "nixpkgs" "home-manager" "modules" "username" "homeDirectory" "stateVersion" "entrypoint" "config"]);
-            # }}}
       in {
+        flake = {
           # for repl debugging via :lf .
           inherit inputs vars;
 
@@ -572,9 +555,8 @@
             };
           };
         };
-        };
+        systems = (import inputs.systems);
-      }
+      }); # end outputs
-    ); # end outputs
 }
 # end flake
 

flake/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./packages.nix
-  ];
-}

flake/packages.nix

@@ -1,2 +0,0 @@
-{ ... }: {
-}