summaryrefslogtreecommitdiff
path: root/os/core
diff options
context:
space:
mode:
Diffstat (limited to 'os/core')
-rw-r--r--os/core/drivers.nix4
-rw-r--r--os/core/security.nix21
2 files changed, 2 insertions, 23 deletions
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index ca5ecc4..d6b2cec 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -39,8 +39,8 @@ in
kernel = lib.mkOption {
type = lib.types.enum [
"stable"
- "unstable"
"zen"
+ "zfs"
"hardened"
];
default = "stable";
@@ -107,7 +107,7 @@ in
"stable" = pkgs.linuxPackages_latest;
"zen" = pkgs.linuxPackages_zen;
"hardened" = pkgs.linuxPackages_hardened;
- # "unstable" = pkgs.linuxPackages.;
+ "zfs" = config.boot.zfs.package.latestCompatibleLinuxPackages;
};
in
kernels.${cfg.kernel} or kernels."stable";
diff --git a/os/core/security.nix b/os/core/security.nix
index c401a14..f69ab1f 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -58,27 +58,6 @@ in
apparmor-bin-utils
];
})
- (lib.mkIf cfg.antivirus.enable {
- services.clamav = {
- daemon = {
- enable = true;
- settings = {
- OnAccessIncludePath = [ "/home/${username}" ];
- OnAccessPrevention = true;
- OnAccessExcludeUname = "clamav";
- MaxThreads = 20;
- MaxQueue = 100;
- };
- };
- scanner.enable = true;
- updater.enable = true;
- fangfrisch.enable = true;
- # massive performance hit
- # clamonacc.enable = true;
- };
- boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
- users.users.${username}.extraGroups = [ "clamav" ];
- })
{
services.gnome.gnome-keyring.enable = true;