diff --git a/jasmine/default.nix b/jasmine/default.nix
index 46883183de0a85f436f4fde8f0eb4bf8dc8007a2..def7c1cbd70dcefdf91104a8ca809361c26583e9 100644
--- a/jasmine/default.nix
+++ b/jasmine/default.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 let
   username = "jolheiser";
   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7cgpIUaEY3q12xBct9a0gIl7rdckBBPsWQea7Wtj7P";
@@ -7,7 +6,6 @@ {
   imports = [
     ./beszel.nix
     ./cifs.nix
-    ./feh.nix
     ./homeassistant.nix
     ./hardware.nix
   ];
@@ -42,21 +40,18 @@   };
 
   services.xserver = {
     enable = true;
+    displayManager.lightdm.enable = true;
+    desktopManager.xfce.enable = true;
     layout = "us";
     xkbVariant = "";
-    displayManager = {
-      lightdm.enable = true;
-      autoLogin = {
-        enable = true;
-        user = username;
-      };
-      defaultSession = "none+i3";
-    };
-    windowManager.i3.enable = true;
   };
 
   services = {
-    tailscale.enable = true;
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "server";
+      extraSetFlags = [ "--advertise-exit-node" ];
+    };
     openssh.enable = true;
     fail2ban.enable = true;
   };
diff --git a/jasmine/feh.nix b/jasmine/feh.nix
deleted file mode 100644
index 5b0b5d699c8a8bff33bd09404724597f9ab470fa..0000000000000000000000000000000000000000
--- a/jasmine/feh.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  systemd.user.services.feh = {
-    description = "Autostart feh image viewer";
-    wantedBy = [ "graphical-session.target" ];
-    after = [ "graphical-session.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.lib.getExe pkgs.feh} --hide-pointer --borderless --quiet --slideshow-delay 5 --image-bg black --fullscreen --auto-zoom --randomize --recursive --reload 5 /mnt/feh";
-      Restart = "on-failure";
-    };
-  };
-}
diff --git a/shincha/default.nix b/shincha/default.nix
index ab95b4ed457cef2e64caed915d5c036f8f56ed92..27364a6479942c44d2490b6ae1e04f1d8f90d12d 100644
--- a/shincha/default.nix
+++ b/shincha/default.nix
@@ -50,11 +50,7 @@     xkbVariant = "";
   };
 
   services = {
-    tailscale = {
-      enable = true;
-      useRoutingFeatures = "server";
-      extraSetFlags = [ "--advertise-exit-node" ];
-    };
+    tailscale.enable = true;
     openssh.enable = true;
   };