diff --git a/modules/base/base.nix b/modules/base/base.nix
new file mode 100644
index 0000000..2d10fde
--- /dev/null
+++ b/modules/base/base.nix
@@ -0,0 +1,14 @@
+{ inputs, ... }: {
+  flake.nixosModules.base = {
+    imports = with inputs.self.nixosModules; [
+      boot
+      firmware
+      locale
+      networking
+      security
+      shellapps
+      version
+      zsh
+    ];
+  };
+}
diff --git a/modules/base/firmware/firmware.nix b/modules/base/firmware/firmware.nix
new file mode 100644
index 0000000..67b3465
--- /dev/null
+++ b/modules/base/firmware/firmware.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  flake.nixosModules.firmware = {
+    services.fwupd.enable = true;
+    hardware.enableAllFirmware = true;
+  };
+}
diff --git a/modules/base/locale/locale.nix b/modules/base/locale/locale.nix
new file mode 100644
index 0000000..8d1e48e
--- /dev/null
+++ b/modules/base/locale/locale.nix
@@ -0,0 +1,19 @@
+{ ... }: {
+  flake.nixosModules.locale = {
+    time.timeZone = "Europe/Berlin";
+    i18n.defaultLocale = "de_DE.UTF-8";
+    console.keyMap = "de";
+    services.xserver.xkb.layout = "de";
+    i18n.extraLocaleSettings = {
+      LC_ADDRESS = "de_DE.UTF-8";
+      LC_IDENTIFICATION = "de_DE.UTF-8";
+      LC_MEASUREMENT = "de_DE.UTF-8";
+      LC_MONETARY = "de_DE.UTF-8";
+      LC_NAME = "de_DE.UTF-8";
+      LC_NUMERIC = "de_DE.UTF-8";
+      LC_PAPER = "de_DE.UTF-8";
+      LC_TELEPHONE = "de_DE.UTF-8";
+      LC_TIME = "de_DE.UTF-8";
+    };
+  };
+}
diff --git a/modules/base/security/security.nix b/modules/base/security/security.nix
new file mode 100644
index 0000000..ec63538
--- /dev/null
+++ b/modules/base/security/security.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.security = {
+    security.rtkit.enable = true;
+  };
+}
diff --git a/modules/base/version/version.nix b/modules/base/version/version.nix
new file mode 100644
index 0000000..77bbc01
--- /dev/null
+++ b/modules/base/version/version.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.version = {
+   system.stateVersion = "25.11";
+  };
+}
diff --git a/modules/base/zsh/zsh.nix b/modules/base/zsh/zsh.nix
new file mode 100644
index 0000000..b04410a
--- /dev/null
+++ b/modules/base/zsh/zsh.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+  flake.nixosModules.zsh = {pkgs, ... }:{
+    programs.zsh.enable = true;
+    programs.zsh.enableCompletion = true;
+    programs.zsh.syntaxHighlighting.enable = true;
+    programs.zsh.autosuggestions.enable = true;
+    programs.zsh.autosuggestions.async = true;
+    programs.zsh.ohMyZsh.enable = true;
+    programs.zsh.ohMyZsh.theme = "agnoster";
+    users.defaultUserShell = pkgs.zsh;    
+  };
+}
diff --git a/modules/hosts/computer-mo/configuration.nix b/modules/hosts/computer-mo/configuration.nix
index 295b1c4..bc4cf39 100644
--- a/modules/hosts/computer-mo/configuration.nix
+++ b/modules/hosts/computer-mo/configuration.nix
@@ -3,10 +3,7 @@
   flake.nixosModules.computer-mo = {
     imports = with inputs.self.modules.nixos; [
       base
-      gnome
-      gnome-apps
-      steam
-      overclocking
+      home-manager
     ];
   };
 }
diff --git a/modules/hosts/computer-mo/hardware.nix b/modules/hosts/computer-mo/hardware.nix
index c779620..45b94d1 100644
--- a/modules/hosts/computer-mo/hardware.nix
+++ b/modules/hosts/computer-mo/hardware.nix
@@ -4,6 +4,6 @@
     boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3"  ];
     nixpkgs.hostPlatform = "x86_64-linux";
     hardware.cpu.amd.updateMicrocode = true;
-    networking.hostName = computer-mo;
+    networking.hostName = "computer-mo";
   };
 }
diff --git a/modules/platform/nixsettings.nix b/modules/platform/nixsettings.nix
index eede17e..5481352 100644
--- a/modules/platform/nixsettings.nix
+++ b/modules/platform/nixsettings.nix
@@ -14,4 +14,8 @@
       config.allowUnfree = true;
     };
   };
+  
+  flake.nixosModules.nix-settings = {
+    nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  };
 }