diff --git a/modules/hosts/tux/filesystems.nix b/modules/hosts/tux/filesystems.nix
index 79280ee..d7bd959 100644
--- a/modules/hosts/tux/filesystems.nix
+++ b/modules/hosts/tux/filesystems.nix
@@ -1,20 +1,18 @@
 {
-	flake.modules.nixos.tux = {
-  fileSystems."/" =
-    { device = "/dev/mapper/luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
+  flake.modules.nixos.tux-filesystems = {
+    fileSystems."/" = {
+      device = "/dev/mapper/luks-9d836ef1-a7f9-430f-8fb8-f202f6336e5a";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/15FA-55CF";
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/15FA-55CF";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/mapper/luks-46e78828-ab23-48b8-8e2a-de7a21adbe24"; }
+    swapDevices = [
+      { device = "/dev/mapper/luks-46e78828-ab23-48b8-8e2a-de7a21adbe24"; }
     ];
-
-
-	};
+  };
 }
diff --git a/modules/hosts/tux/hardware.nix b/modules/hosts/tux/hardware.nix
index 6824437..9abeca0 100644
--- a/modules/hosts/tux/hardware.nix
+++ b/modules/hosts/tux/hardware.nix
@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-hardware = {
     imports = with inputs.self.modules.nixos; [
       intel-gpu
     ];
diff --git a/modules/hosts/tux/networking.nix b/modules/hosts/tux/networking.nix
index 45db07e..a04da8a 100644
--- a/modules/hosts/tux/networking.nix
+++ b/modules/hosts/tux/networking.nix
@@ -1,8 +1,8 @@
-{inputs, ...}: {
-	flake.modules.nixos.tux = {
-		imports = with inputs.self.modules.nixos; [
-			networkmanager
-		];
-		networking.hostName = "tux";
-	};
+{ inputs, ... }: {
+  flake.modules.nixos.tux-networking = {
+    imports = with inputs.self.modules.nixos; [
+      networkmanager
+    ];
+    networking.hostName = "tux";
+  };
 }
diff --git a/modules/hosts/tux/tux.nix b/modules/hosts/tux/tux.nix
index cf1859c..ed1377d 100644
--- a/modules/hosts/tux/tux.nix
+++ b/modules/hosts/tux/tux.nix
@@ -6,15 +6,19 @@
         systemd-boot
         bluetooth
         i18n-de
-        powermanagement
-
-        (autologin "weckyy702")
-
         home-vpn
         opentablet
-
         appimage
+        powermanagement
         mount-duke-smb
+        tux-hardware
+        tux-filesystems
+        tux-networking
+        tux-devtools
+
+        tux-weckyy702
+
+        (autologin "weckyy702")
       ];
   };
 }
diff --git a/modules/hosts/tux/users/weckyy702/weckyy702.nix b/modules/hosts/tux/users/weckyy702/weckyy702.nix
index b9e7df0..b4a68f2 100644
--- a/modules/hosts/tux/users/weckyy702/weckyy702.nix
+++ b/modules/hosts/tux/users/weckyy702/weckyy702.nix
@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-weckyy702 = {
     imports = with inputs.self.modules.nixos; [
       weckyy702
       upower