Skip to content

Commit ea3a18a

Browse files
committed
refactor: Do not repeat enable option
1 parent dfcdbbc commit ea3a18a

19 files changed

+1
-33
lines changed

nix/apache-kafka.nix

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ in
2020
with lib;
2121
{
2222
options = {
23-
enable = mkEnableOption (lib.mdDoc "Apache Kafka event streaming broker");
24-
2523
port = mkOption {
2624
description = lib.mdDoc "Port number the broker should listen on.";
2725
default = 9092;

nix/cassandra.nix

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ let
66
in
77
{
88
options = {
9-
enable = lib.mkEnableOption name;
10-
119
package = lib.mkPackageOption pkgs "cassandra" { };
1210

1311
listenAddress = lib.mkOption {

nix/clickhouse/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ let
66
in
77
{
88
options = {
9-
enable = lib.mkEnableOption name;
10-
119
package = lib.mkOption {
1210
type = types.package;
1311
description = "Which package of clickhouse to use";

nix/elasticsearch.nix

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ in
1717
};
1818
}
1919
'';
20-
enable = lib.mkEnableOption name;
21-
2220
package = lib.mkPackageOption pkgs "elasticsearch7" { };
2321

2422
listenAddress = lib.mkOption {

nix/grafana.nix

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ in
99
description = ''
1010
Configure grafana.
1111
'';
12-
enable = lib.mkEnableOption name;
13-
1412
package = lib.mkPackageOption pkgs "grafana" { };
1513

1614
http_port = lib.mkOption {

nix/lib.nix

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
];
1616
serviceModule = { config, name, ... }: {
1717
options = {
18+
enable = lib.mkEnableOption "Enable the ${service}.<name> service";
1819
dataDir = lib.mkOption {
1920
type = lib.types.str;
2021
default = "./data/${name}";

nix/mysql/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ with lib.types; let
66
in
77
{
88
options = {
9-
enable = lib.mkEnableOption "MySQL process and expose utilities";
10-
119
package = lib.mkOption {
1210
type = types.package;
1311
description = "Which package of MySQL to use";

nix/nginx/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ in
3232

3333
{
3434
options = {
35-
enable = lib.mkEnableOption "nginx";
36-
3735
package = lib.mkOption {
3836
type = lib.types.package;
3937
default = pkgs.nginx;

nix/ollama.nix

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let
88
in
99
{
1010
options = {
11-
enable = lib.mkEnableOption "Enable the Ollama service";
1211
package = lib.mkOption {
1312
type = types.package;
1413
default = ollamaPackage;

nix/open-webui.nix

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ let
55
in
66
{
77
options = {
8-
enable = lib.mkEnableOption "Open-WebUI server";
98
package = lib.mkPackageOption pkgs "open-webui" { };
109

1110
host = lib.mkOption {

nix/pgadmin.nix

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ let
2525
in
2626
{
2727
options = {
28-
enable = lib.mkEnableOption name;
29-
3028
package = lib.mkPackageOption pkgs "pgadmin4" { };
3129

3230
host = lib.mkOption {

nix/postgres/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ with lib.types; let
55
in
66
{
77
options = {
8-
enable = lib.mkEnableOption name;
9-
108
package = lib.mkOption {
119
type = types.package;
1210
description = "Which package of postgresql to use";

nix/prometheus.nix

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ let
55
in
66
{
77
options = {
8-
enable = lib.mkEnableOption name;
9-
108
package = lib.mkPackageOption pkgs "prometheus" { };
119

1210
port = lib.mkOption {

nix/redis-cluster.nix

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ let
44
in
55
{
66
options = {
7-
enable = lib.mkEnableOption name;
8-
97
package = lib.mkPackageOption pkgs "redis" { };
108

119
nodes = lib.mkOption {

nix/redis.nix

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ let
55
in
66
{
77
options = {
8-
enable = lib.mkEnableOption name;
9-
108
package = lib.mkPackageOption pkgs "redis" { };
119

1210
bind = lib.mkOption {

nix/searxng.nix

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ let
55
in
66
{
77
options = {
8-
enable = lib.mkEnableOption name;
98
package = lib.mkPackageOption pkgs "searxng" { };
109

1110
host = lib.mkOption {

nix/tempo.nix

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ in
88
description = ''
99
Configure tempo.
1010
'';
11-
enable = lib.mkEnableOption name;
12-
1311
package = lib.mkPackageOption pkgs "tempo" { };
1412

1513
httpAddress = lib.mkOption {

nix/weaviate.nix

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ let
88
in
99
{
1010
options = {
11-
enable = lib.mkEnableOption name;
12-
1311
package = lib.mkPackageOption pkgs "weaviate" { };
1412

1513
host = lib.mkOption {

nix/zookeeper.nix

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
with lib;
55
{
66
options = {
7-
enable = mkEnableOption (lib.mdDoc "Zookeeper");
8-
97
port = mkOption {
108
description = lib.mdDoc "Zookeeper Client port.";
119
default = 2181;

0 commit comments

Comments
 (0)