From 11fc735d236dcd2e56dbbb41504a2477c0138c39 Mon Sep 17 00:00:00 2001
From: osbm <osbm@osbm.dev>
Date: Wed, 22 Oct 2025 13:02:36 +0300
Subject: [PATCH] fix atticd

---
 hosts/nixos/wallfacer/configuration.nix        |  2 +-
 modules/nixos/options.nix                      |  2 +-
 .../nixos/services/{attic.nix => atticd.nix}   | 18 +++++-------------
 modules/nixos/services/default.nix             |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)
 rename modules/nixos/services/{attic.nix => atticd.nix} (65%)

diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix
index 3e239fa..21182c9 100644
--- a/hosts/nixos/wallfacer/configuration.nix
+++ b/hosts/nixos/wallfacer/configuration.nix
@@ -10,7 +10,7 @@
     services.nextcloud.enable = true;
     services.hydra.enable = true;
     # services.caddy.enable = true;
-    services.attic.enable = true;
+    services.atticd.enable = true;
     services.cloudflared.enable = true;
   };
 
diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix
index 5cdcf79..17dfce3 100644
--- a/modules/nixos/options.nix
+++ b/modules/nixos/options.nix
@@ -145,7 +145,7 @@
       ollama.enable = lib.mkEnableOption "ollama";
       forgejo.enable = lib.mkEnableOption "forgejo";
       caddy.enable = lib.mkEnableOption "caddy";
-      attic.enable = lib.mkEnableOption "attic";
+      atticd.enable = lib.mkEnableOption "atticd";
       cloudflared.enable = lib.mkEnableOption "cloudflared";
       cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns";
       glance.enable = lib.mkEnableOption "glance";
diff --git a/modules/nixos/services/attic.nix b/modules/nixos/services/atticd.nix
similarity index 65%
rename from modules/nixos/services/attic.nix
rename to modules/nixos/services/atticd.nix
index 6ddf83d..58fdc2a 100644
--- a/modules/nixos/services/attic.nix
+++ b/modules/nixos/services/atticd.nix
@@ -4,24 +4,16 @@
   ...
 }:
 let
-  atticPort = 7080;
+  atticdPort = 7080;
 in
 {
-  options = {
-    osbmModules.enableAttic = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Enable Attic nix cache service";
-    };
-  };
-
   config = lib.mkMerge [
-    (lib.mkIf config.osbmModules.enableAttic {
+    (lib.mkIf config.osbmModules.services.atticd.enable {
       services.atticd = {
         enable = true;
         environmentFile = "/persist/attic.env";
         settings = {
-          listen = "[::]:${toString atticPort}";
+          listen = "[::]:${toString atticdPort}";
           compression = {
             type = "zstd";
             level = 9;
@@ -34,14 +26,14 @@ in
           # };
         };
       };
-      networking.firewall.allowedTCPPorts = [ atticPort ];
+      networking.firewall.allowedTCPPorts = [ atticdPort ];
       services.cloudflared.tunnels = {
         "fa301a21-b259-4149-b3d0-b1438c7c81f8" = {
           default = "http_status:404";
           credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json";
           ingress = {
             "cache.osbm.dev" = {
-              service = "http://localhost:${toString atticPort}";
+              service = "http://localhost:${toString atticdPort}";
             };
           };
         };
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index f95d154..26fe647 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./attic.nix
+    ./atticd.nix
     ./caddy.nix
     ./cloudflare-dyndns.nix
     ./cloudflared.nix