diff --git a/hosts/nixos-work/default.nix b/hosts/nixos-work/default.nix
index 5135c41..caf74db 100644
--- a/hosts/nixos-work/default.nix
+++ b/hosts/nixos-work/default.nix
@@ -11,6 +11,8 @@
       ./hardware-configuration.nix
     ];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   my.profiles = {
     desktop.enable = true;
     work.enable = true;
@@ -50,12 +52,14 @@
     keyMap = "de";
   };
 
-  # Configure keymap in X11
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "caps:escape"; # map caps to escape.
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.xserver = {
+    # Configure keymap in X11
+    layout = "de";
+    # map caps to escape.
+    xkbOptions = "caps:escape";
+    # Enable touchpad support (enabled default in most desktopManager).
+    libinput.enable = true;
+  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.moritz = {
@@ -107,6 +111,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.05"; # Did you read the comment?
-
 }
-
diff --git a/hosts/nixos-work/hardware-configuration.nix b/hosts/nixos-work/hardware-configuration.nix
index 01a0be2..becc935 100644
--- a/hosts/nixos-work/hardware-configuration.nix
+++ b/hosts/nixos-work/hardware-configuration.nix
@@ -9,53 +9,46 @@
       (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
-  fileSystems."/" =
-    {
+  fileSystems = {
+    "/" = {
       device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
       fsType = "btrfs";
       options = [ "subvol=@" "compress=zstd" "noatime" ];
     };
-
-  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/1958da8c-d506-49a6-b983-dc8477d25b7c";
-
-  fileSystems."/home" =
-    {
+    "/home" = {
       device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
       fsType = "btrfs";
       options = [ "subvol=@home" "compress=zstd" "noatime" ];
     };
-
-  fileSystems."/swap" =
-    {
+    "/swap" = {
       device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
       fsType = "btrfs";
       options = [ "subvol=@swap" "compress=zstd" "noatime" ];
     };
-
-  fileSystems."/nix" =
-    {
+    "/nix" = {
       device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
       fsType = "btrfs";
       options = [ "subvol=@nix" "compress=zstd" "noatime" ];
     };
-
-  fileSystems."/var/log" =
-    {
+    "/var/log" = {
       device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
       fsType = "btrfs";
       options = [ "subvol=@log" "compress=zstd" "noatime" ];
     };
-
-  fileSystems."/boot" =
-    {
+    "/boot" = {
       device = "/dev/disk/by-uuid/8EFC-70D8";
       fsType = "vfat";
     };
+  };
+
+  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/1958da8c-d506-49a6-b983-dc8477d25b7c";
 
   swapDevices = [{
     device = "/swap/swapfile";
diff --git a/hosts/nixos-work/system.nix b/hosts/nixos-work/system.nix
deleted file mode 100644
index 132026a..0000000
--- a/hosts/nixos-work/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"x86_64-linux"