diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index c69a278..07ca909 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -6,7 +6,7 @@
         ./x270.nix
         ./scanner.nix
         ./printer.nix
-        ./clamav.nix
+        # ./clamav.nix
     ];
 
     boot.loader.systemd-boot.enable = true;
@@ -76,9 +76,10 @@
 
         vscodium
         marktext
-        tor-browser
+        tor-browser-bundle-bin
         libreoffice-fresh
-        telegram-desktop signal-desktop
+        tdesktop
+        signal-desktop
         horizon-eda
         kicad-small
         # cura
@@ -113,7 +114,6 @@
             exclude_regex = /home/.*/\.mozilla
             exclude_regex = /home/.*/\.local
             exclude_regex = /home/.*/\.cargo
-            exclude_regex = /home/.*/\.rustup
             exclude_regex = /home/.*/\.texlive.*
             exclude_regex = /home/.*/\.vscode.*
             exclude_regex = sync_[0-9a-f]+\.db
@@ -127,11 +127,6 @@
         localNetworkGameTransfers.openFirewall = true;
     };
 
-    services.mullvad-vpn = {
-        enable = true;
-        package = pkgs.mullvad-vpn;
-    };
-
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
         "steam"
         "steam-original"
@@ -185,9 +180,9 @@
             ExecStart = lib.mkForce "systemd-inhibit --what=sleep:handle-lid-switch --why='NixOS upgrade' ${updateScript}/bin/nixos-upgrade";
         };
     };
-    services.logind.settings.Login = {
-        LidSwitchIgnoreInhibited = "no";
-    };
+    services.logind.extraConfig = ''
+        LidSwitchIgnoreInhibited = no
+    '';
 
     services.earlyoom = {
         enable = true;
diff --git a/hosts/xfce.nix b/hosts/xfce.nix
index b44492b..a9d5128 100644
--- a/hosts/xfce.nix
+++ b/hosts/xfce.nix
@@ -11,10 +11,10 @@
         };
         displayManager = {
             lightdm.enable = true;
+            gdm.wayland = false;
         };
     };
     services.displayManager = {
-        gdm.wayland = false;
         defaultSession = "xfce";
         autoLogin.enable = true;
         autoLogin.user = "fruchti";