refactor: Do not repeat dataDir

chore: Elaborate description for `dataDir`

Co-authored-by: Sridhar Ratnakumar <[email protected]>

Author: shivaraj-bh

nix/apache-kafka.nix

@@ -28,12 +28,6 @@ with lib;
       type = types.port;
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = lib.mdDoc "The apache-kafka data directory";
-    };
-
     settings = mkOption {
       description = lib.mdDoc ''
         [Kafka broker configuration](https://kafka.apache.org/documentation.html#brokerconfigs)

nix/cassandra.nix

@@ -10,12 +10,6 @@ in
 
     package = lib.mkPackageOption pkgs "cassandra" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The cassandra data directory";
-    };
-
     listenAddress = lib.mkOption {
       type = types.str;
       description = "Listen address";

nix/clickhouse/default.nix

@@ -21,12 +21,6 @@ in
       default = 9000;
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The clickhouse data directory";
-    };
-
     defaultExtraConfig = lib.mkOption {
       type = yamlFormat.type;
       internal = true;

nix/elasticsearch.nix

@@ -21,12 +21,6 @@ in
 
     package = lib.mkPackageOption pkgs "elasticsearch7" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "Directory where elasticsearch stores its data.";
-    };
-
     listenAddress = lib.mkOption {
       description = "Elasticsearch listen address.";
       default = "127.0.0.1";

nix/grafana.nix

@@ -31,12 +31,6 @@ in
       default = "http";
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      description = "Directory where grafana stores its logs and data.";
-      default = "./data/${name}";
-    };
-
     extraConf = lib.mkOption {
       type = iniFormat.type;
       description = "Extra configuration for grafana.";

nix/lib.nix

@@ -15,6 +15,11 @@
       ];
       serviceModule = { config, name, ... }: {
         options = {
+          dataDir = lib.mkOption {
+            type = lib.types.str;
+            default = "./data/${name}";
+            description = "The directory where all data for `${service}.<name>` is stored";
+          };
           namespace = lib.mkOption {
             description = ''
               Namespace for the ${service} service

nix/mysql/default.nix

@@ -15,12 +15,6 @@ in
       defaultText = lib.literalExpression "pkgs.mariadb";
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The mysql data directory";
-    };
-
     socketDir = lib.mkOption {
       type = types.nullOr types.str;
       default = config.dataDir;

nix/nginx/default.nix

@@ -41,12 +41,6 @@ in
       description = "The nginx package to use.";
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The nginx data directory";
-    };
-
     port = lib.mkOption {
       type = types.port;
       default = 8080;

nix/ollama.nix

@@ -25,14 +25,7 @@ in
       example = "0.0.0.0";
       description = "The host on which the Ollama service's REST API will listen";
     };
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = ''
-        The directory containing the Ollama models.
-        Sets the `OLLAMA_MODELS` environment variable.
-      '';
-    };
+
     keepAlive = lib.mkOption {
       type = types.str;
       default = "5m";

nix/open-webui.nix

@@ -8,12 +8,6 @@ in
     enable = lib.mkEnableOption "Open-WebUI server";
     package = lib.mkPackageOption pkgs "open-webui" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The Open-WebUI data directory";
-    };
-
     host = lib.mkOption {
       type = types.str;
       default = "127.0.0.1";

nix/pgadmin.nix

@@ -58,12 +58,6 @@ in
       default = 6;
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The pgadmin4 data directory";
-    };
-
     extraDefaultConfig = lib.mkOption {
       type = pyType;
       internal = true;

nix/postgres/default.nix

@@ -44,12 +44,6 @@ in
       '';
     };
 
-    dataDir = lib.mkOption {
-      type = lib.types.str;
-      default = "./data/${name}";
-      description = "The DB data directory";
-    };
-
     socketDir = lib.mkOption {
       type = lib.types.str;
       default = "";

nix/prometheus.nix

@@ -21,12 +21,6 @@ in
       description = lib.mdDoc "Address to listen on for the web interface, API, and telemetry";
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The prometheus data directory";
-    };
-
     extraFlags = lib.mkOption {
       type = types.listOf types.str;
       default = [ ];

nix/redis-cluster.nix

@@ -8,12 +8,6 @@ in
 
     package = lib.mkPackageOption pkgs "redis" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The redis-cluster data directory (common for all nodes).";
-    };
-
     nodes = lib.mkOption {
       type = types.attrsOf (types.submodule {
         options = {

nix/redis.nix

@@ -9,12 +9,6 @@ in
 
     package = lib.mkPackageOption pkgs "redis" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The redis data directory";
-    };
-
     bind = lib.mkOption {
       type = types.nullOr types.str;
       default = "127.0.0.1";

nix/tempo.nix

@@ -24,12 +24,6 @@ in
       default = 3200;
     };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "The tempo data directory";
-    };
-
     extraConfig = lib.mkOption {
       type = yamlFormat.type;
       default = { };

nix/weaviate.nix

@@ -12,12 +12,6 @@ in
 
     package = lib.mkPackageOption pkgs "weaviate" { };
 
-    dataDir = lib.mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = "Path to the Weaviate data store";
-    };
-
     host = lib.mkOption {
       type = types.str;
       default = "127.0.0.1";

nix/zookeeper.nix

@@ -12,14 +12,6 @@ with lib;
       type = types.port;
     };
 
-    dataDir = mkOption {
-      type = types.str;
-      default = "./data/${name}";
-      description = lib.mdDoc ''
-        Data directory for Zookeeper
-      '';
-    };
-
     id = mkOption {
       description = lib.mdDoc "Zookeeper ID.";
       default = 0;