diff --git a/flake.nix b/flake.nix
index 162f109..aa0c9f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,8 +4,8 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
     import-tree.url = "github:vic/import-tree";
-    disko.url = "github:nix-community/disko";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
   
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; }
diff --git a/modules/base/base.nix b/modules/base/base.nix
index 2d10fde..4632798 100644
--- a/modules/base/base.nix
+++ b/modules/base/base.nix
@@ -3,8 +3,10 @@
     imports = with inputs.self.nixosModules; [
       boot
       firmware
+      home-manager
       locale
-      networking
+      network
+      nix-settings
       security
       shellapps
       version
diff --git a/modules/platform/home-manager.nix b/modules/base/home-manager/home-manager.nix
similarity index 100%
rename from modules/platform/home-manager.nix
rename to modules/base/home-manager/home-manager.nix
diff --git a/modules/base/networking/networking.nix b/modules/base/network/network.nix
similarity index 100%
rename from modules/base/networking/networking.nix
rename to modules/base/network/network.nix
diff --git a/modules/base/nix-settings/nix-settings.nix b/modules/base/nix-settings/nix-settings.nix
new file mode 100644
index 0000000..552ee66
--- /dev/null
+++ b/modules/base/nix-settings/nix-settings.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  flake.nixosModules.nix-settings = {
+    nixpkgs.config.allowUnfree = true;
+    nix.settings.experimental-features = [ "nix-command" "flakes" ;
+  };
+}
diff --git a/modules/platform/nixsettings.nix b/modules/platform/nixsettings.nix
index 5481352..eede17e 100644
--- a/modules/platform/nixsettings.nix
+++ b/modules/platform/nixsettings.nix
@@ -14,8 +14,4 @@
       config.allowUnfree = true;
     };
   };
-  
-  flake.nixosModules.nix-settings = {
-    nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  };
 }