refactor: Do not repeat enable option

juspay · Jul 5, 2024 · 9ccceca · 9ccceca
1 parent c4d1fa9
commit 9ccceca
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 33 deletions.
diff --git a/nix/apache-kafka.nix b/nix/apache-kafka.nix
@@ -20,8 +20,6 @@ in
 with lib;
 {
   options = {
-    enable = mkEnableOption (lib.mdDoc "Apache Kafka event streaming broker");
-
     port = mkOption {
       description = lib.mdDoc "Port number the broker should listen on.";
       default = 9092;

diff --git a/nix/cassandra.nix b/nix/cassandra.nix
@@ -6,8 +6,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "cassandra" { };
 
     listenAddress = lib.mkOption {

diff --git a/nix/clickhouse/default.nix b/nix/clickhouse/default.nix
@@ -6,8 +6,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkOption {
       type = types.package;
       description = "Which package of clickhouse to use";

diff --git a/nix/elasticsearch.nix b/nix/elasticsearch.nix
@@ -17,8 +17,6 @@ in
           };
       } 
     '';
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "elasticsearch7" { };
 
     listenAddress = lib.mkOption {

diff --git a/nix/grafana.nix b/nix/grafana.nix
@@ -9,8 +9,6 @@ in
     description = ''
       Configure grafana.
     '';
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "grafana" { };
 
     http_port = lib.mkOption {

diff --git a/nix/lib.nix b/nix/lib.nix
@@ -15,6 +15,7 @@
       ];
       serviceModule = { config, name, ... }: {
         options = {
+          enable = lib.mkEnableOption "Enable the ${service}.<name> service";
           dataDir = lib.mkOption {
             type = lib.types.str;
             default = "./data/${name}";

diff --git a/nix/mysql/default.nix b/nix/mysql/default.nix
@@ -6,8 +6,6 @@ with lib.types; let
 in
 {
   options = {
-    enable = lib.mkEnableOption "MySQL process and expose utilities";
-
     package = lib.mkOption {
       type = types.package;
       description = "Which package of MySQL to use";

diff --git a/nix/nginx/default.nix b/nix/nginx/default.nix
@@ -32,8 +32,6 @@ in
 
 {
   options = {
-    enable = lib.mkEnableOption "nginx";
-
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.nginx;

diff --git a/nix/ollama.nix b/nix/ollama.nix
@@ -8,7 +8,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption "Enable the Ollama service";
     package = lib.mkOption {
       type = types.package;
       default = ollamaPackage;

diff --git a/nix/open-webui.nix b/nix/open-webui.nix
@@ -5,7 +5,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption "Open-WebUI server";
     package = lib.mkPackageOption pkgs "open-webui" { };
 
     host = lib.mkOption {

diff --git a/nix/pgadmin.nix b/nix/pgadmin.nix
@@ -25,8 +25,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "pgadmin4" { };
 
     host = lib.mkOption {

diff --git a/nix/postgres/default.nix b/nix/postgres/default.nix
@@ -5,8 +5,6 @@ with lib.types; let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkOption {
       type = types.package;
       description = "Which package of postgresql to use";

diff --git a/nix/prometheus.nix b/nix/prometheus.nix
@@ -5,8 +5,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "prometheus" { };
 
     port = lib.mkOption {

diff --git a/nix/redis-cluster.nix b/nix/redis-cluster.nix
@@ -4,8 +4,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "redis" { };
 
     nodes = lib.mkOption {

diff --git a/nix/redis.nix b/nix/redis.nix
@@ -5,8 +5,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "redis" { };
 
     bind = lib.mkOption {

diff --git a/nix/searxng.nix b/nix/searxng.nix
@@ -5,7 +5,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
     package = lib.mkPackageOption pkgs "searxng" { };
 
     host = lib.mkOption {

diff --git a/nix/tempo.nix b/nix/tempo.nix
@@ -8,8 +8,6 @@ in
     description = ''
       Configure tempo.
     '';
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "tempo" { };
 
     httpAddress = lib.mkOption {

diff --git a/nix/weaviate.nix b/nix/weaviate.nix
@@ -8,8 +8,6 @@ let
 in
 {
   options = {
-    enable = lib.mkEnableOption name;
-
     package = lib.mkPackageOption pkgs "weaviate" { };
 
     host = lib.mkOption {

diff --git a/nix/zookeeper.nix b/nix/zookeeper.nix
@@ -4,8 +4,6 @@
 with lib;
 {
   options = {
-    enable = mkEnableOption (lib.mdDoc "Zookeeper");
-
     port = mkOption {
       description = lib.mdDoc "Zookeeper Client port.";
       default = 2181;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ in @@
               };
           }
         '';
-        enable = lib.mkEnableOption name;
         package = lib.mkPackageOption pkgs "elasticsearch7" { };
         listenAddress = lib.mkOption {
@@ Expand Down @@