From 63398d5b19fef29a259ff62edf835aaafeb0d406 Mon Sep 17 00:00:00 2001
From: LunarAkai <akai@lunarakai.de>
Date: Fri, 14 Mar 2025 17:06:05 +0100
Subject: [PATCH] huh

---
 flake.nix                                    | 21 +++++++++++++++++---
 {hosts => home-manager}/hummingbird/home.nix |  0
 hosts/hummingbird/configuration.nix          |  7 ++++---
 modules/home-manager/default.nix             |  2 ++
 modules/nixos/default.nix                    |  2 ++
 5 files changed, 26 insertions(+), 6 deletions(-)
 rename {hosts => home-manager}/hummingbird/home.nix (100%)
 create mode 100644 modules/home-manager/default.nix
 create mode 100644 modules/nixos/default.nix

diff --git a/flake.nix b/flake.nix
index 524fc6d..ce303c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,10 +22,16 @@
     nvf,
     alejandra,
     ...
-  } @ inputs: {
+  } @ inputs: let
+    inherit (self) outputs;
+  in {
     # use "nixos", or your hostname as the name of the configuration
     # it's a better practice than "default" shown in the video
 
+    nixosModules = import ./modules/nixos;
+
+    homeManagerModules = import ./modules/home-manager;
+
     packages."x86_64-linux".default =
       (nvf.lib.neovimConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
@@ -34,7 +40,7 @@
       .neovim;
 
     nixosConfigurations = {
-      nixos = nixpkgs.lib.nixosSystem {
+      hummingbird = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
         modules = [
           {
@@ -42,11 +48,20 @@
           }
 
           ./hosts/hummingbird/configuration.nix
-          inputs.home-manager.nixosModules.default
           nvf.nixosModules.default
           ./nvf-configuration.nix
         ];
       };
     };
+
+    homeConfigurations = {
+      "luna@hummingbird" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages."x86_64-linux";
+        extraSpecialArgs = {inherit inputs outputs;};
+        modules = [
+          ./home-manager/hummingbird/home.nix
+        ];
+      };
+    };
   };
 }
diff --git a/hosts/hummingbird/home.nix b/home-manager/hummingbird/home.nix
similarity index 100%
rename from hosts/hummingbird/home.nix
rename to home-manager/hummingbird/home.nix
diff --git a/hosts/hummingbird/configuration.nix b/hosts/hummingbird/configuration.nix
index 98b5f33..d909941 100644
--- a/hosts/hummingbird/configuration.nix
+++ b/hosts/hummingbird/configuration.nix
@@ -11,7 +11,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.default
+    #inputs.home-manager.nixosModules.default
   ];
 
   # Bootloader.
@@ -19,9 +19,10 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # mask dev-tpmrm0.device
-  systemd.services.dev-tpmrm0.wantedBy = lib.mkForce [];
+  #systemd.services.dev-tpmrm0.wantedBy = lib.mkForce [];
+  systemd.units."dev-tpmrm0.device".enable = false;
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "hummingbird"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # flakes
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,2 @@
+{
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/modules/nixos/default.nix
@@ -0,0 +1,2 @@
+{
+}