diff --git a/hosts/minoxy-workstation/configuration.nix b/hosts/minoxy-workstation/configuration.nix
index e096815..3a753ab 100644
--- a/hosts/minoxy-workstation/configuration.nix
+++ b/hosts/minoxy-workstation/configuration.nix
@@ -1,17 +1,18 @@
-{ pkgs, config, inputs, ... }:
+{ ... }:
 
 {
 	imports = [
 		./hardware-configuration.nix
+
 		./../../user/users.nix
 
 		./../../modules/common.nix
 
 		./../../modules/hardware/xremap.nix
 		./../../modules/services/webdav.nix
-		#./../../modules/hardware/nvidia.nix
+		./../../modules/graphics/workstation.nix
 
-		inputs.sops-nix.nixosModules.sops
+		./../../modules/hardware/nvidia.nix
 	];
 
 	networking.hostName = "minoxy";
@@ -19,20 +20,12 @@
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
 
-	services.xserver.displayManager.gdm.enable = true; # We are pre 25.11
-
 	systemd.targets.sleep.enable = true;
 	systemd.targets.suspend.enable = true;
 
 	virtualisation.docker.enable = true;
 	virtualisation.docker.storageDriver = "btrfs";
 
-	programs = {
-		hyprland.enable = true;
-		hyprlock.enable = true;
-		firefox.enable = true;
-	};
-
 	# Never change this!
 	system.stateVersion = "25.05";
 }
diff --git a/modules/common.nix b/modules/common.nix
index 9ed72b5..131e8eb 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -3,7 +3,6 @@
 {
 	# Basic services
 	services.locate.enable  = true;
-	services.printing.enable = true;
 
 	# Nix fun
 	nixpkgs.config.allowUnfree = true;
@@ -13,14 +12,6 @@
 	programs.nix-ld.enable = true;
 
 	environment = {
-		sessionVariables = {
-			NIXOS_OZONE_WL = "1";
-			QTWEBENGINE_CHROMIUM_FLAGS="--blink-settings=darkModeEnabled=true";
-			QT_QPA_PLATFORMTHEME = "qt6ct";
-			WLR_NO_HARDWARE_CURSORS= "1";
-			QT_STYLE_OVERRIDE = "kvantum";
-			QT_QPA_PLATFORM="xcb";
-		};
 		systemPackages = with pkgs; [
 			git
 			starship
@@ -38,10 +29,6 @@
 		};
 	};
 
-	fonts.packages = with pkgs; [
-		nerd-fonts.fira-code
-	];
-
 	i18n.defaultLocale = "en_US.UTF-8";
 	console = {
 		font = "Lat2-Terminus16";
diff --git a/modules/graphics/workstation.nix b/modules/graphics/workstation.nix
new file mode 100644
index 0000000..3089299
--- /dev/null
+++ b/modules/graphics/workstation.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+{
+	# Basic services
+	services.printing.enable = true;
+
+	environment = {
+		sessionVariables = {
+			NIXOS_OZONE_WL = "1";
+			QTWEBENGINE_CHROMIUM_FLAGS="--blink-settings=darkModeEnabled=true";
+			QT_QPA_PLATFORMTHEME = "qt6ct";
+			WLR_NO_HARDWARE_CURSORS= "1";
+			QT_STYLE_OVERRIDE = "kvantum";
+			QT_QPA_PLATFORM="xcb";
+		};
+	};
+
+
+	fonts.packages = with pkgs; [
+		nerd-fonts.fira-code
+	];
+
+	services.xserver.displayManager.gdm.enable = true; # We are pre 25.11
+
+	programs = {
+		hyprland.enable = true;
+		firefox.enable = true;
+	};
+}
diff --git a/modules/other/minecraft.nix b/modules/other/minecraft.nix
deleted file mode 100644
index e8c8e7c..0000000
--- a/modules/other/minecraft.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-
-{
-	services.minecraft-server = {
-		enable = true;
-		eula = true;
-		openFirewall = true;
-		declarative = true;
-		serverProperties = {
-			server-port = 25565;
-			gamemode = 0;
-			max-players = 7;
-			motd = "NixOS Minecraft!";
-			allow-cheats = true;
-		};
-	};
-}
diff --git a/modules/server/email.nix b/modules/server/email.nix
deleted file mode 100644
index 18c5416..0000000
--- a/modules/server/email.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ ... }: {
-	imports = [
-		(builtins.fetchTarball {
-			url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz";
-			sha256 = "0jpp086m839dz6xh6kw5r8iq0cm4nd691zixzy6z11c4z2vf8v85";
-		})
-	];
-
-	mailserver = {
-		enable = true;
-		fqdn = "mail.hahn1.one";
-		domains = [ "hahn1.one" ];
-
-		# A list of all login accounts. To create the password hashes, use
-		# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
-		loginAccounts = {
-			"jonas@hahn1.one" = {
-				hashedPassword = "$2b$05$aOMZAUvp4p42su99UwQ0FeKPTVKrHBJX1w7IBG9J39rSjSqyT5Y7C";
-				aliases = ["postmaster@hahn1.one" "j@hahn1.one"];
-			};
-		};
-
-		certificateScheme = "acme-nginx";
-	};
-}
diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix
deleted file mode 100644
index 62f11a4..0000000
--- a/modules/server/nextcloud.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	# For this a disk with the label nextcloud is required
-
-	# Setting the filesystem for nextcloud
-	fileSystems."/mnt/nextcloudStorage" = {
-		device = "/dev/disk/by-label/nextcloud";
-		options = [
-			"users"
-		];
-	};
-
-	# Activating the nextcloud servce not optimized
-	environment.etc."nextcloud-admin-pass".text = "PWD";
-	services.nextcloud = {
-		enable = true;
-		home = "/mnt/nextcloudStorage";
-		package = pkgs.nextcloud30;
-		hostName = "cloud.hahn1.one";
-		settings = {
-			trusted_domains = ["misox"];
-		};
-		config = {
-			adminpassFile = "/etc/nextcloud-admin-pass";
-			dbtype = "sqlite";
-		};
-		extraApps = {inherit (config.services.nextcloud.package.packages.apps) richdocuments news contacts calendar tasks;};
-		extraAppsEnable = true;
-		https = true;
-		configureRedis = true;
-		maxUploadSize = "1G";
-	};
-}
-