From 8d0f77e82f90277abfe3a8843ab0bfefde4f3cd3 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 26 Oct 2025 09:13:59 +0000 Subject: [PATCH 1/2] Add clamav --- hosts/muon/configuration.nix | 1 + modules/nixos/default.nix | 7 ++++++- modules/nixos/security/clamav.nix | 18 ++++++++++++++++++ modules/nixos/security/default.nix | 9 +++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/security/clamav.nix create mode 100644 modules/nixos/security/default.nix diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index e670a63..107d5c3 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -38,6 +38,7 @@ in { mods.desktop.wayland.enable = false; mods.desktop.gaming.enable = true; mods.boot.enable = true; + mods.clamav.enable = true; mods.theme.enable = true; mods.theme.scheme = "woodland"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 6e13f3a..cbccb97 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,4 +1,8 @@ -{ pkgs, lib, ... }: { +{ + pkgs, + lib, + ... +}: { imports = [ ./core ./system @@ -6,6 +10,7 @@ ./theme ./server ./sops + ./security ./impermanence.nix diff --git a/modules/nixos/security/clamav.nix b/modules/nixos/security/clamav.nix new file mode 100644 index 0000000..1736546 --- /dev/null +++ b/modules/nixos/security/clamav.nix @@ -0,0 +1,18 @@ +{ + pkgs, + lib, + config, + ... +}: +with lib; { + options.mods.clamav.enable = mkEnableOption "enables clamav"; + + config = mkIf config.mods.clamav.enable { + services.clamav = { + scanner.enable = true; + updater.enable = true; + fangfrisch.enable = true; + daemon.enable = true; + }; + }; +} diff --git a/modules/nixos/security/default.nix b/modules/nixos/security/default.nix new file mode 100644 index 0000000..82614e6 --- /dev/null +++ b/modules/nixos/security/default.nix @@ -0,0 +1,9 @@ +{ + pkgs, + lib, + ... +}: { + imports = [ + ./clamav.nix + ]; +} From de705db5c125f8e13761db221d2144c0f051651a Mon Sep 17 00:00:00 2001 From: muon Date: Fri, 7 Nov 2025 18:07:23 +0000 Subject: [PATCH 2/2] Update muop --- hosts/muop/configuration.nix | 21 ++++++++++++++++++--- hosts/muop/hardware-configuration.nix | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix index 8a21dd5..64a4640 100644 --- a/hosts/muop/configuration.nix +++ b/hosts/muop/configuration.nix @@ -1,12 +1,27 @@ { config, lib, pkgs, inputs, system, ... }: -let cfg = config.mods; +let + cfg = config.mods; + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEio+Y5wBVD1wILaH2R3wV10FvVjiqy/4gGBWHOITTB muon@muon" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKevYmkH7xvYoquBjnYZ7PJiVqf+GOh9fxAJBN6wZGBB gin4@hi.is" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmAOd9VbhyJeibt6Vrb101MNTk5W8+rh94Djv/C+pyu muon@muho" + ]; in { + # Enable the OpenSSH daemon. + services.openssh.enable = true; + users.users.muon.openssh.authorizedKeys.keys = keys; + users.users.root.openssh.authorizedKeys.keys = keys; + # Hardware imports = [ ./hardware-configuration.nix ]; - environment.systemPackages = with inputs.nix-alien.packages.${system}; - [ nix-alien ]; + environment.systemPackages = with inputs.nix-alien.packages.${system}; [ + nix-alien + pkgs.rustdesk-flutter + pkgs.motion + pkgs.inotify-tools + ]; # System mods.user.name = "muon"; diff --git a/hosts/muop/hardware-configuration.nix b/hosts/muop/hardware-configuration.nix index 25b813e..c70be88 100644 --- a/hosts/muop/hardware-configuration.nix +++ b/hosts/muop/hardware-configuration.nix @@ -9,7 +9,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "v4l2loopback" ]; boot.extraModulePackages = [ ]; boot.supportedFilesystems = [ "ntfs" "btrfs" ];