From 4dd0576ed6f6feda14e7a5ec07cd7e6b59b11dcd Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Fri, 14 Nov 2025 19:22:24 +0100
Subject: [PATCH] clamav, fix turning tv off on dell

---
 modules/graphical/hyprland.nix          | 12 +++---
 modules/misc/tv-on-off.nix              | 11 +++---
 modules/services/clamav.nix             | 51 +++++++++++++++++++++++++
 modules/services/default.nix            |  1 +
 pkgs/ente-frontend/default.nix          |  2 +-
 systems/amd-server-vm/configuration.nix | 12 ++++++
 systems/dell/configuration.nix          |  5 +++
 7 files changed, 82 insertions(+), 12 deletions(-)
 create mode 100644 modules/services/clamav.nix

diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix
index 3d24e41..dd17944 100644
--- a/modules/graphical/hyprland.nix
+++ b/modules/graphical/hyprland.nix
@@ -24,12 +24,12 @@ in
     };
     services.displayManager.sddm.enable = !config.services.xserver.displayManager.gdm.enable;
 
-    nix.settings = {
-      substituters = [ "https://hyprland.cachix.org" ];
-      trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-    };
+    #nix.settings = {
+    #  substituters = [ "https://hyprland.cachix.org" ];
+    #  trusted-public-keys = [
+    #    "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+    #  ];
+    #};
 
     xdg.portal.enable = true;
     xdg.portal.extraPortals = lib.mkDefault [
diff --git a/modules/misc/tv-on-off.nix b/modules/misc/tv-on-off.nix
index 186dbd4..9035f59 100644
--- a/modules/misc/tv-on-off.nix
+++ b/modules/misc/tv-on-off.nix
@@ -11,9 +11,11 @@ let
   '';
   tvOff = pkgs.writeShellScriptBin "tvOff" ''
     if [ $(${cec} -A | ${pkgs.gnugrep}/bin/grep cec0 | ${pkgs.coreutils}/bin/wc -l) -gt 0 ]; then
+      ${cec} -C --skip-info
       ${cec} --tv --skip-info
-      ${cec} --skip-info --user-control-pressed ui-cmd=power-on-function --to TV
-      echo "Turning TV on!"
+      ${cec} --standby --skip-info --to TV
+      echo "Turning TV off!"
+      ${pkgs.coreutils}/bin/sleep 2
     fi
   '';
 in
@@ -24,15 +26,14 @@ in
   ];
   # after suspend, do `cec-ctl -A | grep cec0 | wc -l`, if >0, do `cec-ctl --standby --to TV`
   # similar on wakeup, if present send `cec-ctl --user-control-pressed ui-cmd=power-on-function --to TV`
-  # doesn't work on dell for some reason (KDE)
   environment.etc."systemd/system-sleep/sleep-turn-tv-off-on.sh".source =
     pkgs.writeShellScript "post-sleep-turn-tv-off.sh" ''
       case $1/$2 in
         pre/*)
-          ${tvOff}
+          ${tvOff}/bin/tvOff
           ;;
         post/*)
-          ${tvOn}
+          ${tvOn}/bin/tvOn
           ;;
       esac
     '';
diff --git a/modules/services/clamav.nix b/modules/services/clamav.nix
new file mode 100644
index 0000000..a209bec
--- /dev/null
+++ b/modules/services/clamav.nix
@@ -0,0 +1,51 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+let
+  cfg = config.custom.services.clamav;
+in
+{
+  options.custom.services.clamav = {
+    enable = lib.mkEnableOption "Enables clamav";
+    scanDirectories = lib.mkOption {
+      type = with lib.types; listOf str;
+      default = [
+        "/home"
+        "/var/lib"
+        "/tmp"
+        "/etc"
+        "/var/tmp"
+      ];
+      description = "Directories to scan with clamscan.";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.clamav = {
+      scanner.enable = true;
+      scanner.scanDirectories = cfg.scanDirectories;
+      updater.enable = true;
+      daemon = {
+        enable = true;
+        settings = {
+          ExcludePath = [
+            "^/proc"
+            "^/dev"
+            "^/sys"
+            "^/var/lib/docker"
+            "^/var/lib/samba/private"
+            "^/var/lib/samba/winbindd_privileged/pipe"
+            "^/var/lib/postfix/queue/"
+            "^/var/lib/docker/overlay2"
+            "^/var/lib/docker/volumes/backingFsBlockDev"
+            "^/tmp/tmux-.*"
+            "^/tmp/dotnet-diagnostic-.*"
+          ];
+        };
+      };
+    };
+  };
+}
diff --git a/modules/services/default.nix b/modules/services/default.nix
index bb24eca..8b3888a 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -5,6 +5,7 @@
     ./adam-site.nix
     ./adguard.nix
     ./caldav.nix
+    ./clamav.nix
     ./dnsmasq.nix
     ./ente.nix
     ./fileshelter.nix
diff --git a/pkgs/ente-frontend/default.nix b/pkgs/ente-frontend/default.nix
index bb892f9..9cc2ebb 100644
--- a/pkgs/ente-frontend/default.nix
+++ b/pkgs/ente-frontend/default.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
     (fetchGit {
       url = "git@github.com:oberprofis/ente.git";
       ref = "master";
-      rev = "cb63e1e20fd9fde401fa9d3f09b36c572b17ff34";
+      rev = "fe6eb090e513fc2aaac15274dbd94792b3e41052";
     })
   }/website/tracker-site";
   npmDepsHash = "sha256-fYTRhIU+8pdIm3wC5wJRcDUhgN3d+mmvfmVzuu0pjLQ=";
diff --git a/systems/amd-server-vm/configuration.nix b/systems/amd-server-vm/configuration.nix
index 295b1ca..0d34c32 100644
--- a/systems/amd-server-vm/configuration.nix
+++ b/systems/amd-server-vm/configuration.nix
@@ -133,6 +133,18 @@
         enable = true;
         basePath = "/data/synced";
       };
+      clamav = {
+        enable = true;
+        scanDirectories = [
+          "/data/vmail"
+          "/1tbssd/kop-fileshare"
+          "/home"
+          "/var/lib"
+          "/tmp"
+          "/etc"
+          "/var/tmp"
+        ];
+      };
     };
     nftables.enable = true;
     cli-tools.enable = true;
diff --git a/systems/dell/configuration.nix b/systems/dell/configuration.nix
index c3cf897..a11d8b3 100644
--- a/systems/dell/configuration.nix
+++ b/systems/dell/configuration.nix
@@ -35,6 +35,11 @@
       shared.enable = true;
       plasma.enable = true;
       sddm.enable = true;
+      stylix = {
+        enable = true;
+        base16Scheme = import ../../modules/themes/ina.nix;
+        image = ../../wallpaper/ina.jpg;
+      };
     };
   };