diff --git a/config/headless-home.nix b/config/headless-home.nix
new file mode 100644
index 0000000..0407e3b
--- /dev/null
+++ b/config/headless-home.nix
@@ -0,0 +1,40 @@
+# This is your home-manager configuration file
+# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  myhostname,
+  ...
+}:
+{
+  imports = [
+    ../shared/tmux.nix
+    ../shared/fish.nix
+    ../shared/git.nix
+    ../shared/nixpkgs.nix
+    ../shared/lazygit.nix
+    ../shared/ssh.nix
+    ../shared/oh-my-posh.nix
+  ];
+
+  nixpkgs = {
+    overlays = [ ];
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = _: true;
+    };
+  };
+
+  programs.home-manager.enable = true;
+  programs.fish.enable = true;
+  programs.man.generateCaches = false;
+
+  home.username = "fw";
+  home.homeDirectory = "/home/fw";
+
+  home.stateVersion = "25.05"; # Did you read the comment?
+
+  systemd.user.startServices = "sd-switch";
+}
diff --git a/flake.nix b/flake.nix
index 526d21e..456a22f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -189,7 +189,7 @@
           };
           # > Our main home-manager configuration file <
           modules = [
-            ./config/home.nix
+            ./config/headless-home.nix
             (
               { nixpkgs, ... }:
               {
diff --git a/maskiner/work-desktop/configuration.nix b/maskiner/work-desktop/configuration.nix
index 8685b66..199f70b 100644
--- a/maskiner/work-desktop/configuration.nix
+++ b/maskiner/work-desktop/configuration.nix
@@ -58,13 +58,6 @@
     liveRestore = false;
   };
 
-  security.rtkit.enable = true;
-  services = {
-    tailscale = {
-      enable = true;
-    };
-  };
-
   networking.networkmanager.enable = true;
 
   environment.sessionVariables = {
@@ -93,30 +86,15 @@
     LC_TIME = "sv_SE.UTF-8";
   };
 
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = false;
-    };
-    grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      device = "nodev";
-    };
-  };
   console.keyMap = "sv-latin1";
+boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.useOSProber = true;
+
 
-  services = {
-    xserver = {
-      enable = true;
-      xkb = {
-        layout = "se";
-        variant = "";
-      };
-    };
-  };
   networking.hostName = myhostname;
 
   services.xserver.dpi = 140;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "25.05";
 }
diff --git a/maskiner/work-desktop/hardware-configuration.nix b/maskiner/work-desktop/hardware-configuration.nix
index 3a39e3f..0d01336 100644
--- a/maskiner/work-desktop/hardware-configuration.nix
+++ b/maskiner/work-desktop/hardware-configuration.nix
@@ -5,36 +5,27 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "xhci_pci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ab96fcd1-cab1-43e1-aae2-161bd088bb46";
+    { device = "/dev/disk/by-uuid/a73a76fd-122b-4b72-904c-0c2ab22c36b1";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3F89-6CDD";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/5b889d43-0313-4fa2-ac22-5e303a3efb5b"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }