From 5d67f5cb587fa8a1f00d46b6732fa9b3eb3ff629 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 5 Dec 2025 17:33:37 +0100
Subject: [PATCH 1/4] Disco: Enable clamav

---
 hosts/Disco.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 07ca909..057c93c 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;

From 2796f070b853b971f84afeaa0925f18cee64c1de Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 5 Dec 2025 17:33:49 +0100
Subject: [PATCH 2/4] Disco: Add Mullvad VPN package

---
 hosts/Disco.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 057c93c..6fb8678 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -127,6 +127,11 @@
         localNetworkGameTransfers.openFirewall = true;
     };
 
+    services.mullvad-vpn = {
+        enable = true;
+        package = pkgs.mullvad-vpn;
+    };
+
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
         "steam"
         "steam-original"

From 4cd870076c016acf97fc59cee6bab37f7ac26d7a Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 5 Dec 2025 17:34:00 +0100
Subject: [PATCH 3/4] Disco: Exclude ~/.rustup from backups

---
 hosts/Disco.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 6fb8678..affffe6 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -114,6 +114,7 @@
             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

From 96bb01aad34f26e177d516f0349fd7a9b655d47d Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 5 Dec 2025 18:29:17 +0100
Subject: [PATCH 4/4] Disco: Add changes for 25.11

---
 hosts/Disco.nix | 11 +++++------
 hosts/xfce.nix  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index affffe6..c69a278 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -76,10 +76,9 @@
 
         vscodium
         marktext
-        tor-browser-bundle-bin
+        tor-browser
         libreoffice-fresh
-        tdesktop
-        signal-desktop
+        telegram-desktop signal-desktop
         horizon-eda
         kicad-small
         # cura
@@ -186,9 +185,9 @@
             ExecStart = lib.mkForce "systemd-inhibit --what=sleep:handle-lid-switch --why='NixOS upgrade' ${updateScript}/bin/nixos-upgrade";
         };
     };
-    services.logind.extraConfig = ''
-        LidSwitchIgnoreInhibited = no
-    '';
+    services.logind.settings.Login = {
+        LidSwitchIgnoreInhibited = "no";
+    };
 
     services.earlyoom = {
         enable = true;
diff --git a/hosts/xfce.nix b/hosts/xfce.nix
index a9d5128..b44492b 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";