From a1920f771c58819425ceddcae086b77a1fcb9caa Mon Sep 17 00:00:00 2001
From: LunarAkai <akai@lunarakai.de>
Date: Fri, 14 Mar 2025 23:05:09 +0100
Subject: [PATCH] a

---
 flake.nix                                     | 23 ++++-----------
 home-manager/luna/common/default.nix          |  6 ++--
 .../luna/{hummingbird.nix => home.nix}        |  3 +-
 hosts/common/default.nix                      |  4 ---
 hosts/hummingbird/configuration.nix           |  2 ++
 myLib/default.nix                             | 28 +++++++++++++++++++
 6 files changed, 41 insertions(+), 25 deletions(-)
 rename home-manager/luna/{hummingbird.nix => home.nix} (84%)
 create mode 100644 myLib/default.nix

diff --git a/flake.nix b/flake.nix
index e42f135..4666283 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,30 +34,19 @@
         }
     );
   in {
-    inherit lib;
-    nixosModules = import ./modules/nixos;
-    homeManagerModules = import ./modules/home-manager;
-
+    with myLib;
     formatter = forEachSystem (pkgs: pkgs.alejandra);
 
+    homeManagerModules.default = ./modules/home-manager;
+    nixosModules.default = ./modules/nixos;
+
     nixosConfigurations = {
       # Main desktop for games & workstation
-      hummingbird = lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          ./hosts/hummingbird
-        ];
-      };
+      hummingbird = mkSystem ./hosts/hummingbird;
     };
 
     homeConfigurations = {
-      "luna" = lib.homeManagerConfiguration {
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {inherit inputs outputs;};
-        modules = [
-          ./home-manager/luna/hummingbird.nix
-        ];
-      };
+      "luna@hummingbird" = mkHome "x86_64-linux" ./home-manager/luna/home.nix;
     };
   };
 }
diff --git a/home-manager/luna/common/default.nix b/home-manager/luna/common/default.nix
index 10d34c9..ca9f56e 100644
--- a/home-manager/luna/common/default.nix
+++ b/home-manager/luna/common/default.nix
@@ -5,14 +5,16 @@
   config,
   outputs,
   ...
-}: {
+}: 
+let
+  debug = builtins.trace "Heloooo";
+in {
   imports = [
   ];
 
   programs = {
     home-manager.enable = true;
   };
-
   home = {
     username = lib.mkDefault "luna";
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
diff --git a/home-manager/luna/hummingbird.nix b/home-manager/luna/home.nix
similarity index 84%
rename from home-manager/luna/hummingbird.nix
rename to home-manager/luna/home.nix
index e90f757..b044026 100644
--- a/home-manager/luna/hummingbird.nix
+++ b/home-manager/luna/home.nix
@@ -13,7 +13,6 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = [
-    alejandra # formatter
-    fd-find
+
   ];
 }
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index d4360be..29fd773 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -6,10 +6,6 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
-
   home-manager.useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = {
-    inherit inputs outputs;
-  };
 
 }
diff --git a/hosts/hummingbird/configuration.nix b/hosts/hummingbird/configuration.nix
index b397fc1..1b740ef 100644
--- a/hosts/hummingbird/configuration.nix
+++ b/hosts/hummingbird/configuration.nix
@@ -102,9 +102,11 @@
       neovim
       rustup
       vscode.fhs
+      nix-inspect
     ];
   };
 
+
   # flatpak
   services.flatpak.enable = true;
 
diff --git a/myLib/default.nix b/myLib/default.nix
new file mode 100644
index 0000000..4989695
--- /dev/null
+++ b/myLib/default.nix
@@ -0,0 +1,28 @@
+{inputs}: let
+  myLib = (import ./default.nix) {inherit inputs;};
+  outputs = inputs.self.outputs;
+in rec {
+
+  mkSystem = config:
+    inputs.nixpkgs.lib.nixosSystem {
+      specialArgs = {
+        inherit inputs outputs myLib;
+      };
+      modules = [
+        config
+        outputs.nixosModules.default
+      ];
+    };
+
+  mkHome = sys: config:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = pkgsFor sys;
+      extraSpecialArgs = {
+        inherit inputs myLib outputs;
+      };
+      modules = [
+        config
+        outputs.homeManagerModules.default
+      ];
+    };
+}
\ No newline at end of file