diff --git a/hosts/mandos/README.md b/hosts/mandos/README.md
new file mode 100644
index 0000000..3cf3db5
--- /dev/null
+++ b/hosts/mandos/README.md
@@ -0,0 +1,4 @@
+# Description
+
+My desktop, reasoning for the name being the following chain of thought:
+**Mandos -> brother of manwe -> manwe used to be main pc, now mandos is**
diff --git a/hosts/mandos/default.nix b/hosts/mandos/default.nix
new file mode 100644
index 0000000..5b7bf26
--- /dev/null
+++ b/hosts/mandos/default.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+{
+  fileSystems = {
+    "/home/chris/media" = {
+      device = "ulmo:/";
+      fsType = "nfs";
+    };
+  };
+
+  environment.systemPackages = [ pkgs.ventoy-full-qt ];
+  permittedInsecurePackages = [ "ventoy-qt5-1.1.05"];
+  boot.supportedFilesystems = [ "nfs" ];
+
+  modules = {
+    boot = {
+      silentBoot = true;
+      animatedBoot = true;
+    };
+
+    system.audio.enable = true;
+
+    root = {
+      user = {
+        full_name = "__ROOT__";
+        email = "__ROOT__@${config.networking.hostName}";
+      };
+
+      shell = {
+        default = "zsh";
+      };
+    };
+  };
+}
diff --git a/hosts/mandos/hardware.nix b/hosts/mandos/hardware.nix
new file mode 100644
index 0000000..24f6895
--- /dev/null
+++ b/hosts/mandos/hardware.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, modulesPath, ... }:
+let
+  inherit (lib.modules) mkDefault;
+in
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  fileSystems = {
+    "/" ={
+      device = "/dev/disk/by-uuid/8c4eaf57-fdb2-4c4c-bcc0-74e85a1c7985";
+      fsType = "ext4";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/C842-316A";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/0ddf001a-5679-482e-b254-04a1b9094794"; }
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    kernelParams = [];
+    extraModulePackages = [ ];
+  };
+
+  nixpkgs.hostPlatform = mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/mandos/users/chris/default.nix b/hosts/mandos/users/chris/default.nix
new file mode 100644
index 0000000..96461c8
--- /dev/null
+++ b/hosts/mandos/users/chris/default.nix
@@ -0,0 +1,65 @@
+{ ... }:
+{
+  user = {
+    full_name = "Chris Kruining";
+    email = "chris@kruining.eu";
+    is_trusted = true;
+  };
+
+  themes = {
+    enable = true;
+    theme = "everforest";
+    polarity = "dark";
+  };
+
+  develop = {
+    rust.enable = true;
+    js.enable = true;
+    dotnet.enable = true;
+  };
+
+  desktop = {
+    plasma = {
+      enable = true;
+      autoLogin = true;
+    };
+
+    applications = {
+      communication.enable = true;
+      email.enable = true;
+      office.enable = true;
+      steam.enable = true;
+      recording.enable = true;
+      studio.enable = true;
+    };
+
+    terminal = {
+      default = "ghostty";
+      alacritty.enable = true;
+      ghostty.enable = true;
+    };
+
+    editors = {
+      default = "zed";
+      vscodium.enable = true;
+      zed.enable = true;
+      nvim.enable = true;
+      nano.enable = true;
+      kate.enable = true;
+    };
+
+    browsers = {
+      default = "chromium";
+      chrome.enable = true;
+      ladybird.enable = true;
+    };
+
+    games = {
+      minecraft.enable = true;
+    };
+  };
+
+  shell = {
+    default = "zsh";
+  };
+}
diff --git a/hosts/manwe/README.md b/hosts/manwe/README.md
index 0cbea1b..1da7ab1 100644
--- a/hosts/manwe/README.md
+++ b/hosts/manwe/README.md
@@ -1,4 +1,3 @@
 # Description
 
-My desktop, reasoning for the name being the following chain of thought:  
-**Manwe -> the king of the valar -> leader -> desktop is main machine**
\ No newline at end of file
+My steambox.
diff --git a/hosts/manwe/default.nix b/hosts/manwe/default.nix
index 0207089..62bc7fe 100644
--- a/hosts/manwe/default.nix
+++ b/hosts/manwe/default.nix
@@ -11,24 +11,16 @@
       fsType = "ntfs-3g";
       options = [ "rw" "uid=chris" ];
     };
-
-    "/home/chris/media" = {
-      device = "ulmo:/";
-      fsType = "nfs";
-    };
   };
 
-  environment.systemPackages = [ pkgs.ventoy-full-qt ];
-  permittedInsecurePackages = [ "ventoy-qt5-1.1.05"];
-
-  boot.supportedFilesystems = [ "nfs" ];
-
   modules = {
     boot = {
       silentBoot = true;
       animatedBoot = true;
     };
 
+    desktop.gaming.enable = true;
+
     system.audio.enable = true;
 
     root = {
diff --git a/hosts/manwe/hardware.nix b/hosts/manwe/hardware.nix
index 856f139..35f6a44 100644
--- a/hosts/manwe/hardware.nix
+++ b/hosts/manwe/hardware.nix
@@ -5,15 +5,17 @@ in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8c4eaf57-fdb2-4c4c-bcc0-74e85a1c7985";
+  fileSystems = {
+    "/" ={
+      device = "/dev/disk/by-uuid/8c4eaf57-fdb2-4c4c-bcc0-74e85a1c7985";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/C842-316A";
-    fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
+    "/boot" = {
+      device = "/dev/disk/by-uuid/C842-316A";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
   };
 
   swapDevices = [
diff --git a/hosts/manwe/users/chris/default.nix b/hosts/manwe/users/chris/default.nix
index 96461c8..0598711 100644
--- a/hosts/manwe/users/chris/default.nix
+++ b/hosts/manwe/users/chris/default.nix
@@ -12,12 +12,6 @@
     polarity = "dark";
   };
 
-  develop = {
-    rust.enable = true;
-    js.enable = true;
-    dotnet.enable = true;
-  };
-
   desktop = {
     plasma = {
       enable = true;
@@ -25,27 +19,17 @@
     };
 
     applications = {
-      communication.enable = true;
-      email.enable = true;
-      office.enable = true;
       steam.enable = true;
-      recording.enable = true;
-      studio.enable = true;
     };
 
     terminal = {
       default = "ghostty";
-      alacritty.enable = true;
       ghostty.enable = true;
     };
 
     editors = {
-      default = "zed";
-      vscodium.enable = true;
-      zed.enable = true;
-      nvim.enable = true;
+      default = "nano";
       nano.enable = true;
-      kate.enable = true;
     };
 
     browsers = {
@@ -53,10 +37,6 @@
       chrome.enable = true;
       ladybird.enable = true;
     };
-
-    games = {
-      minecraft.enable = true;
-    };
   };
 
   shell = {