diff --git a/flake.nix b/flake.nix
index e5f1eea8..8882c101 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,26 +46,7 @@
       DerGeret = import ./profiles/machines/manuel/DerGeret/Arch/config.nix;
       ManuSurface = import ./profiles/machines/manuel/ManuSurface/Arch/config.nix;
       server = import ./profiles/machines/manuel/server.nix;
-      clean = { ... }: {
-        imports = [
-          ./lib/modules/valhalla.nix
-        ];
-
-        config = {
-          valhalla = {
-            hostname = "Falcon";
-
-            windows = {
-              users.LocalAdmin = {
-                groups = [ "Administrators" ];
-                programs.oh-my-posh.theme.source = ./profiles/users/manuel/manuel.omp.json;
-              };
-            };
-
-            software.essential = true;
-          };
-        };
-      };
+      Office = import ./profiles/machines/manuel/office.nix;
     };
   };
 }
diff --git a/profiles/machines/manuel/office.nix b/profiles/machines/manuel/office.nix
new file mode 100644
index 00000000..e3df124b
--- /dev/null
+++ b/profiles/machines/manuel/office.nix
@@ -0,0 +1,39 @@
+{ lib, ... }: {
+  imports = [
+    ./defaults.nix
+    ./Generic/Arch/config.nix
+  ];
+
+  config = {
+    valhalla = {
+      hostname = "falcon";
+      hidpi = true;
+      linux.secureBoot = true;
+
+      windows = {
+        dualboot = {
+          enable = true;
+          linuxPercentage = 70;
+        };
+
+        users.manuel = {
+          groups = [ "Administrators" ];
+        };
+      };
+
+      fileSystems.diskSetup.devices.OS.partitions = {
+        # Keep Windows' boot partition
+        Boot.keepExisting = true;
+
+        Windows = {
+          index = 6;
+          label = "Windows";
+          format = "ntfs";
+          mountPoint = "/media/win";
+          mountOptions = [ "force" ];
+          keepExisting = true;
+        };
+      };
+    };
+  };
+}