diff --git a/flake.nix b/flake.nix
index 888f1b4..976487d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,31 @@
 
   outputs = _: {
     nixosModules = {
-      default = import ./default;
-      smol = import ./smol;
+      default = {
+
+        imports = [
+          ./modules/audio.nix
+          ./modules/font.nix
+          ./modules/nix-settings.nix
+          ./modules/nvidia.nix
+          ./modules/services.nix
+          ./modules/vim.nix
+          ./modules/xconfig.nix
+          ./modules/zsh.nix
+          ./modules/usersettings.nix
+        ];
+
+      };
+      smol = {
+
+        imports = [
+          ./modules/nix-settings.nix
+          ./modules/vim.nix
+          ./modules/zsh.nix
+          ./modules/audio.nix
+        ];
+
+      };
     };
   };
 }