From 293819108351f65ca40f6bbb4815127a0eee098c Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 16 Jul 2024 21:58:54 +0200
Subject: [PATCH] Rename module and wrapper namespace

---
 flake/modules.nix           | 6 +++---
 flake/wrappers.nix          | 2 +-
 hosts/common.nix            | 4 ++--
 hosts/inspiron/hardware.nix | 1 -
 users/common.nix            | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake/modules.nix b/flake/modules.nix
index e9dcc65..05c18b9 100644
--- a/flake/modules.nix
+++ b/flake/modules.nix
@@ -3,8 +3,8 @@ let
   modulesOf = dir: map (name: "${dir}/${name}") (builtins.attrNames (builtins.readDir dir));
 in
 {
-  flake.nixosModules = {
-    system.imports = modulesOf "${self}/modules/system";
-    home.imports = modulesOf "${self}/modules/home";
+  flake = {
+    nixosModules.default.imports = modulesOf "${self}/modules/system";
+    homeManagerModules.default.imports = modulesOf "${self}/modules/home";
   };
 }
diff --git a/flake/wrappers.nix b/flake/wrappers.nix
index 6e07468..f0921b8 100644
--- a/flake/wrappers.nix
+++ b/flake/wrappers.nix
@@ -1,5 +1,5 @@
 {
-  flake.nixosModules.wrappers =
+  flake.wrappers.default =
     {
       self,
       inputs,
diff --git a/hosts/common.nix b/hosts/common.nix
index 9002ea1..30788cf 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,8 +1,8 @@
 { self, pkgs, ... }:
 {
   imports = [
-    self.nixosModules.system
-    self.nixosModules.wrappers
+    self.nixosModules.default
+    self.wrappers.default
   ];
 
   nix.settings = {
diff --git a/hosts/inspiron/hardware.nix b/hosts/inspiron/hardware.nix
index d264cf6..aba2dca 100644
--- a/hosts/inspiron/hardware.nix
+++ b/hosts/inspiron/hardware.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/92437114-de06-4a78-9ee3-c7d0ffcabf95";
diff --git a/users/common.nix b/users/common.nix
index bf4aa94..9486cf8 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -11,8 +11,8 @@
   };
 
   home-manager.sharedModules = [
-    self.nixosModules.home
-    self.nixosModules.wrappers
+    self.homeManagerModules.default
+    self.wrappers.default
 
     {
       programs.home-manager.enable = true;