From a0f308f8a9c6e10081bc89c19b7c1aaf9d81744b Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 3 May 2025 21:25:34 -0400
Subject: [PATCH] [systems.marvin] Fix anubis service and add miniflux anubis

---
 packages/anubis-files/default.nix             |  2 +-
 systems/x86_64-linux/marvin/default.nix       |  1 +
 .../x86_64-linux/marvin/services/anubis.nix   |  4 ++--
 .../x86_64-linux/marvin/services/miniflux.nix | 20 ++++++++++++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/anubis-files/default.nix b/packages/anubis-files/default.nix
index 58223837..d6c2d192 100644
--- a/packages/anubis-files/default.nix
+++ b/packages/anubis-files/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     substituteInPlace policies/*.yaml \
-      --replace-fail "CUSTOM" $out
+      --replace-fail "CUSTOM" $out/rules
   '';
 
   installPhase = ''
diff --git a/systems/x86_64-linux/marvin/default.nix b/systems/x86_64-linux/marvin/default.nix
index 766e05a5..5f48dd76 100644
--- a/systems/x86_64-linux/marvin/default.nix
+++ b/systems/x86_64-linux/marvin/default.nix
@@ -8,6 +8,7 @@
     ./hardware.nix
 
     # Running Services
+    ./services/anubis.nix
     ./services/authentik.nix
     ./services/avahi.nix
     ./services/bots.nix
diff --git a/systems/x86_64-linux/marvin/services/anubis.nix b/systems/x86_64-linux/marvin/services/anubis.nix
index 6f4ac454..aceb838d 100644
--- a/systems/x86_64-linux/marvin/services/anubis.nix
+++ b/systems/x86_64-linux/marvin/services/anubis.nix
@@ -6,7 +6,7 @@
   config = {
     services.anubis.defaultOptions = {
       enable = true;
-      extraFlags = "-metrics-bind \"\"";
+      extraFlags = [ "-metrics-bind \"\"" ];
       settings = {
         BIND_NETWORK = "tcp";
         SERVE_ROBOTS_TXT = true;
@@ -18,7 +18,7 @@
     };
     age.secrets.anubis-key = {
       file = ./secrets/anubis-key.age;
-      user = "anubis";
+      owner = "anubis";
       group = "anubis";
     };
   };
diff --git a/systems/x86_64-linux/marvin/services/miniflux.nix b/systems/x86_64-linux/marvin/services/miniflux.nix
index 2cca5432..4cc7f647 100644
--- a/systems/x86_64-linux/marvin/services/miniflux.nix
+++ b/systems/x86_64-linux/marvin/services/miniflux.nix
@@ -1,6 +1,13 @@
-{config, lib, ...}: let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
   d = lib.py.data.services.miniflux;
-in {
+in
+{
   services.miniflux = {
     enable = true;
     config = {
@@ -15,7 +22,7 @@ in {
   };
   users.users.miniflux.isSystemUser = true;
   users.users.miniflux.group = "miniflux";
-  users.groups.miniflux = {};
+  users.groups.miniflux = { };
   age.secrets = {
     miniflux-admin = {
       file = ./secrets/miniflux-admin.age;
@@ -23,4 +30,11 @@ in {
       group = "miniflux";
     };
   };
+  services.anubis.instances.miniflux = {
+    settings = {
+      BIND = ":${toString d.anubis}";
+      POLICY_FNAME = "${pkgs.py.anubis-files}/policies/miniflux.yaml";
+      TARGET = "http://localhost:${toString d.port}";
+    };
+  };
 }
-- 
2.54.0