diff --git a/home/apps/default.nix b/home/apps/default.nix index 6215e6f6..16c2465d 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -2,7 +2,8 @@ imports = [ ./guitarix.nix ./bambu-studio.nix - ./guitar.nix + ./zed.nix + ./obs-studio.nix ]; home.packages = [ ]; diff --git a/home/apps/obs-studio.nix b/home/apps/obs-studio.nix new file mode 100644 index 00000000..475c23e2 --- /dev/null +++ b/home/apps/obs-studio.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + programs.obs-studio = { + enable = true; + # enableVirtualCamera = true; + plugins = [pkgs.obs-studio-plugins.wlrobs]; + }; +} diff --git a/nixos/mirai/services/caddy.nix b/nixos/mirai/services/caddy.nix new file mode 100644 index 00000000..eeda72f8 --- /dev/null +++ b/nixos/mirai/services/caddy.nix @@ -0,0 +1,5 @@ +{...}: { + services = { + caddy.enable = true; + }; +} diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix index 84b57441..dd0eede9 100644 --- a/nixos/mirai/services/default.nix +++ b/nixos/mirai/services/default.nix @@ -6,8 +6,10 @@ ./llama.nix ./minecraft.nix ./tailscale.nix - # ./polaris.nix + ./caddy.nix + ./fail2ban.nix + # ./polaris.nix # ./seafile.nix # ./syncthing.nix # ./vscode.nix @@ -22,19 +24,5 @@ nix-serve = { enable = true; }; - fail2ban = { - enable = true; - bantime = "24h"; # Ban IPs for one day on the first ban - bantime-increment = { - enable = true; # Enable increment of bantime after each violation - # formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; - multipliers = "1 2 4 8 16 32 64"; - maxtime = "168h"; # Do not ban for more than 1 week - overalljails = true; # Calculate the bantime based on all the violations - }; - }; - caddy = { - enable = true; - }; }; } diff --git a/nixos/mirai/services/fail2ban.nix b/nixos/mirai/services/fail2ban.nix new file mode 100644 index 00000000..1f19f434 --- /dev/null +++ b/nixos/mirai/services/fail2ban.nix @@ -0,0 +1,15 @@ +{...}: { + services = { + fail2ban = { + enable = true; + bantime = "24h"; # Ban IPs for one day on the first ban + bantime-increment = { + enable = true; # Enable increment of bantime after each violation + # formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; + multipliers = "1 2 4 8 16 32 64"; + maxtime = "168h"; # Do not ban for more than 1 week + overalljails = true; # Calculate the bantime based on all the violations + }; + }; + }; +}