From 52c84814e87bd89841d36d50bec4f12b5b286f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Sat, 4 Jan 2025 19:56:10 +0100
Subject: [PATCH] modules/flake: flatten

---
 modules/default.nix       | 14 +++++++++++++-
 modules/flake/default.nix | 21 +++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index e8e95f8..4d9af70 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,11 +1,23 @@
+{
+  inputs,
+  ...
+}:
+let
+  flakeModule = import ./flake { inherit (inputs) nixpkgs darwin home-manager; };
+in
 {
   imports = [
     ./system
-    ./flake
+    flakeModule
   ];
 
   flake.homeModules = rec {
     settei = ./home;
     default = settei;
   };
+
+  flake.flakeModules = rec {
+    settei = flakeModule;
+    default = settei;
+  };
 }
diff --git a/modules/flake/default.nix b/modules/flake/default.nix
index a255829..2d83b08 100644
--- a/modules/flake/default.nix
+++ b/modules/flake/default.nix
@@ -1,19 +1,12 @@
 {
-  flake-parts-lib,
-  lib,
-  inputs,
-  ...
+  nixpkgs,
+  darwin,
+  home-manager,
 }:
-let
-  inherit (flake-parts-lib) importApply;
-  flakeModules = {
-    configurations = importApply ./configurations.nix { inherit (inputs) nixpkgs darwin home-manager; };
-  };
-in
 {
-  imports = lib.attrValues flakeModules;
+  _file = ./default.nix;
 
-  flake = {
-    inherit flakeModules;
-  };
+  imports = [
+    (import ./configurations.nix { inherit nixpkgs darwin home-manager; })
+  ];
 }