diff --git a/nix/system/linux.nix b/nix/system/linux.nix
index d905ff6..7335e87 100644
--- a/nix/system/linux.nix
+++ b/nix/system/linux.nix
@@ -4,6 +4,23 @@
     zsh.enable = true;
   };
 
+  boot = {
+    consoleLogLevel = 0;
+  };
+
+  hardware = {
+    graphics.enable = true;
+
+    bluetooth.enable = true;
+    bluetooth.powerOnBoot = true;
+    bluetooth.settings = {
+      General = {
+        Enable = "Source,Sink,Media,Socket";
+        Experimental = true;
+      };
+    };
+  };
+
   networking = {
     firewall = {
       enable = true;
@@ -34,6 +51,7 @@
     };
     timesyncd.enable = true;
     mullvad-vpn.enable = true;
+    xserver.enable = true;
   };
 
   time = {
@@ -54,9 +72,34 @@
     ];
   };
 
-  environment.systemPackages = with pkgs; [
-    vim
-    home-manager
-    swaylock-effects
-  ];
+  environment = {
+    systemPackages = with pkgs; [
+      home-manager
+      swaylock-effects
+    ];
+
+    variables = {
+      NIXOS_OZONE_WL = "1";
+    };
+  };
+
+  networking = {
+    wireless.iwd = {
+      enable = true;
+      settings.General.EnableNetworkConfiguration = true;
+    };
+    networkmanager = {
+      enable = true;
+      wifi.backend = "iwd";
+      wifi.powersave = true;
+    };
+  };
+
+  users.users.larssonmartin = {
+    isNormalUser = true;
+    home = "/home/larssonmartin";
+    extraGroups = [ "wheel" ];
+    packages = [ ];
+    shell = pkgs.zsh;
+  };
 }
diff --git a/nix/system/linux_aarch.nix b/nix/system/linux_aarch.nix
index 6565667..ed45825 100644
--- a/nix/system/linux_aarch.nix
+++ b/nix/system/linux_aarch.nix
@@ -13,54 +13,20 @@
   };
 
   boot = {
-    consoleLogLevel = 0;
-    kernelParams = [ "apple_dcp.show_notch=1" ];
+    kernelParams = [ "apple_dcp.show_notch=0" ];
     loader.efi.canTouchEfiVariables = false;
   };
 
-  hardware = {
-    asahi = {
-      peripheralFirmwareDirectory = ./firmware;
-      useExperimentalGPUDriver = true;
-      setupAsahiSound = true;
-      withRust = true;
-    };
-
-    graphics.enable = true;
-
-    bluetooth.enable = true;
-    bluetooth.powerOnBoot = true;
-    bluetooth.settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Experimental = true;
-      };
-    };
+  hardware.asahi = {
+    peripheralFirmwareDirectory = ./firmware;
+    useExperimentalGPUDriver = true;
+    setupAsahiSound = true;
+    withRust = true;
   };
 
   networking.hostName = "asahi-nixos";
 
-  networking = {
-    wireless.iwd = {
-      enable = true;
-      settings.General.EnableNetworkConfiguration = true;
-    };
-    networkmanager = {
-      enable = true;
-      wifi.backend = "iwd";
-      wifi.powersave = true;
-    };
-  };
-
   services = {
     tlp.enable = true;
   };
-
-  users.users.larssonmartin = {
-    isNormalUser = true;
-    home = "/home/larssonmartin";
-    extraGroups = [ "wheel" ];
-    packages = [ ];
-    shell = pkgs.zsh;
-  };
 }
diff --git a/nix/system/linux_x86.nix b/nix/system/linux_x86.nix
index e7dcfe0..732c224 100644
--- a/nix/system/linux_x86.nix
+++ b/nix/system/linux_x86.nix
@@ -5,7 +5,6 @@
   ];
 
   boot = {
-    consoleLogLevel = 0;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -33,34 +32,11 @@
         finegrained = false;
       };
       nvidiaPersistenced = true;
-
-    };
-    graphics.enable = true;
-
-    bluetooth.enable = true;
-    bluetooth.powerOnBoot = true;
-    bluetooth.settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Experimental = true;
-      };
     };
   };
 
   networking.hostName = "walnut-nixos";
 
-  networking = {
-    wireless.iwd = {
-      enable = true;
-      settings.General.EnableNetworkConfiguration = true;
-    };
-    networkmanager = {
-      enable = true;
-      wifi.backend = "iwd";
-      wifi.powersave = true;
-    };
-  };
-
   programs = {
     xwayland.enable = true;
     sway = {
@@ -75,23 +51,11 @@
   environment.variables = {
     GBM_BACKEND = "nvidia-drm";
     __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-    NIXOS_OZONE_WL = "1";
     WLR_NO_HARDWARE_CURSORS = "1";
     WLR_RENDERER = "vulkan";
   };
 
   services = {
-    xserver = {
-      enable = true;
-      videoDrivers = [ "nvidia" ];
-    };
-  };
-
-  users.users.larssonmartin = {
-    isNormalUser = true;
-    home = "/home/larssonmartin";
-    extraGroups = [ "wheel" ];
-    packages = [ ];
-    shell = pkgs.zsh;
+    xserver.videoDrivers = [ "nvidia" ];
   };
 }