diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix
index 25574d3..9a10baa 100644
--- a/hosts/tartarus/configuration.nix
+++ b/hosts/tartarus/configuration.nix
@@ -17,11 +17,11 @@ in {
   blockYoutube = false;
   blockTwitter = true;
 
+  enableKDE = true;
+
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
   nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
 
-
-
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.osbm = import ../../modules/home.nix {
@@ -59,20 +59,6 @@ in {
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.osbm = {
-    isNormalUser = true;
-    description = "osbm";
-    extraGroups = ["networkmanager" "wheel" "docker"];
-    packages = with pkgs; [
-    ];
-    openssh.authorizedKeys.keys = [
-     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"
-    ];
-  };
 
   environment.systemPackages = with pkgs; [
   ];
diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index 2ce668d..41aba55 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -14,6 +14,11 @@ in {
     ../../modules
   ];
 
+  blockYoutube = false;
+  blockTwitter = true;
+
+  enableKDE = true;
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -114,28 +119,6 @@ in {
     };
   };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-
-  users.users = {
-    osbm = {
-      isNormalUser = true;
-      description = "osbm";
-      extraGroups = ["networkmanager" "wheel" "docker"];
-      packages = with pkgs; [
-      ];
-    };
-    bayram = {
-      isNormalUser = true;
-      description = "bayram";
-      initialPassword = "changeme";
-      extraGroups = ["networkmanager"];
-      packages = with pkgs; [
-      ];
-    };
-  };
-
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/default.nix b/modules/default.nix
index 0c24b5e..a49bfd1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,5 +9,6 @@
     ./i18n.nix
     ./nix-settings.nix
     ./secrets.nix
+    ./users.nix
   ];
 }
diff --git a/modules/users.nix b/modules/users.nix
new file mode 100644
index 0000000..471385a
--- /dev/null
+++ b/modules/users.nix
@@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  users.users = {
+    osbm = {
+      isNormalUser = true;
+      description = "osbm";
+      extraGroups = ["networkmanager" "wheel" "docker"];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"
+      ];
+      packages = with pkgs; [
+      ];
+    };
+    bayram = {
+      isNormalUser = true;
+      description = "bayram";
+      initialPassword = "changeme";
+      extraGroups = ["networkmanager"];
+      packages = with pkgs; [
+      ];
+    };
+  };
+}