diff --git a/machines/levitation/home.nix b/machines/levitation/home.nix
index ed41ade..b663f6b 100644
--- a/machines/levitation/home.nix
+++ b/machines/levitation/home.nix
@@ -33,7 +33,6 @@
     master {
       mfact = 0.68
     }
-    exec-once=hyprpaper
   '';
   ################################################################################
 
@@ -74,6 +73,23 @@
       };
       Install = { WantedBy = [ "graphical-session.target" ]; };
     };
+    # Hyprpaper
+    # Run as service so we can easily restart it after kvm switching
+    hyprpaper = {
+      Unit = {
+        Description = "Hyprpaper";
+        After = [ "graphical-session.target" ];
+      };
+      Service = {
+        Type = "simple";
+        ExecStart = ''
+          ${
+            inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.hyprpaper
+          }/bin/hyprpaper
+        '';
+      };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+    };
     # Startup noisetorch on our USB mic
     noisetorch-startup = {
       Unit = {
@@ -87,7 +103,7 @@
           /run/wrappers/bin/noisetorch -i alsa_input.usb-18072020_JLAB_TALK_GO_MICROPHONE-00.analog-stereo
         '';
       };
-      Install = { WantedBy = [ "graphical-session.target" ]; };
+      # Install = { WantedBy = [ "graphical-session.target" ]; };
     };
   };
 
diff --git a/modules/linux/hyprland.nix b/modules/linux/hyprland.nix
index aac118a..5521362 100644
--- a/modules/linux/hyprland.nix
+++ b/modules/linux/hyprland.nix
@@ -22,7 +22,8 @@ in with lib; {
     (mkIf nc.hyprland.enable {
       # Turn on GDM for login
       services.xserver = {
-        enable = true;
+        # enable = true;
+	enable = false;
         autorun = true;
         # Enable plasma for the applications
         desktopManager.plasma5.enable = true;