summaryrefslogtreecommitdiff
path: root/modules/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'modules/nixos')
-rw-r--r--modules/nixos/archetypes/personal.nix2
-rw-r--r--modules/nixos/archetypes/server.nix2
-rw-r--r--modules/nixos/base/security.nix2
-rw-r--r--modules/nixos/base/users.nix6
-rw-r--r--modules/nixos/desktop/budgie/default.nix2
-rw-r--r--modules/nixos/server/default.nix2
-rw-r--r--modules/nixos/server/host-user.nix3
-rw-r--r--modules/nixos/server/mixins/acme.nix5
-rw-r--r--modules/nixos/server/mixins/cloudflared.nix8
-rw-r--r--modules/nixos/server/mixins/hercules.nix5
-rw-r--r--modules/nixos/server/mixins/nginx.nix2
-rw-r--r--modules/nixos/traits/containers.nix11
-rw-r--r--modules/nixos/traits/tailscale.nix5
-rw-r--r--modules/nixos/traits/users/seth.nix3
-rw-r--r--modules/nixos/traits/zram.nix2
15 files changed, 37 insertions, 23 deletions
diff --git a/modules/nixos/archetypes/personal.nix b/modules/nixos/archetypes/personal.nix
index e516fb1..1fa2f98 100644
--- a/modules/nixos/archetypes/personal.nix
+++ b/modules/nixos/archetypes/personal.nix
@@ -4,7 +4,7 @@ let
in
{
options.archetypes = {
- personal.enable = lib.mkEnableOption "personal archetype";
+ personal.enable = lib.mkEnableOption "the \"Personal\" archetype";
};
config = lib.mkIf cfg.enable {
diff --git a/modules/nixos/archetypes/server.nix b/modules/nixos/archetypes/server.nix
index cc13071..3a057d1 100644
--- a/modules/nixos/archetypes/server.nix
+++ b/modules/nixos/archetypes/server.nix
@@ -4,7 +4,7 @@ let
in
{
options.archetypes = {
- server.enable = lib.mkEnableOption "server archetype";
+ server.enable = lib.mkEnableOption "the \"Server\" archetype";
};
config = lib.mkIf cfg.enable {
diff --git a/modules/nixos/base/security.nix b/modules/nixos/base/security.nix
index 5857f0d..12d6f7e 100644
--- a/modules/nixos/base/security.nix
+++ b/modules/nixos/base/security.nix
@@ -4,7 +4,7 @@ let
in
{
options.base.security = {
- enable = lib.mkEnableOption "base security settings" // {
+ enable = lib.mkEnableOption "basic security settings" // {
default = config.base.enable;
};
};
diff --git a/modules/nixos/base/users.nix b/modules/nixos/base/users.nix
index b026f73..ddef714 100644
--- a/modules/nixos/base/users.nix
+++ b/modules/nixos/base/users.nix
@@ -10,7 +10,7 @@ let
in
{
options.base.users = {
- enable = lib.mkEnableOption "base user configurations" // {
+ enable = lib.mkEnableOption "basic user configurations" // {
default = true;
};
@@ -18,8 +18,10 @@ in
enable = lib.mkEnableOption "default root user configuration" // {
default = false;
};
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
};
diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix
index dce24b4..fb97877 100644
--- a/modules/nixos/desktop/budgie/default.nix
+++ b/modules/nixos/desktop/budgie/default.nix
@@ -8,7 +8,7 @@ let
cfg = config.desktop.budgie;
in
{
- options.desktop.budgie.enable = lib.mkEnableOption "budgie desktop";
+ options.desktop.budgie.enable = lib.mkEnableOption "Budgie desktop";
config = lib.mkIf cfg.enable {
environment = {
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix
index 488df82..567f46b 100644
--- a/modules/nixos/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -10,7 +10,7 @@ let
in
{
options.server = {
- enable = lib.mkEnableOption "server settings";
+ enable = lib.mkEnableOption "basic server settings";
};
imports = [
diff --git a/modules/nixos/server/host-user.nix b/modules/nixos/server/host-user.nix
index 8b76e9d..0764cb0 100644
--- a/modules/nixos/server/host-user.nix
+++ b/modules/nixos/server/host-user.nix
@@ -14,8 +14,9 @@ in
default = config.server.enable;
};
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
diff --git a/modules/nixos/server/mixins/acme.nix b/modules/nixos/server/mixins/acme.nix
index e809ad4..39166f2 100644
--- a/modules/nixos/server/mixins/acme.nix
+++ b/modules/nixos/server/mixins/acme.nix
@@ -11,11 +11,12 @@ in
options.server.mixins.acme = {
enable = lib.mkEnableOption "ACME mixin";
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
- useDns = lib.mkEnableOption "the usage of Cloudflare to obtain certs" // {
+ useDns = lib.mkEnableOption "the use of Cloudflare to obtain certs" // {
default = true;
};
};
diff --git a/modules/nixos/server/mixins/cloudflared.nix b/modules/nixos/server/mixins/cloudflared.nix
index f781150..43da9de 100644
--- a/modules/nixos/server/mixins/cloudflared.nix
+++ b/modules/nixos/server/mixins/cloudflared.nix
@@ -14,14 +14,16 @@ in
tunnelName = lib.mkOption {
type = lib.types.str;
default = "${config.networking.hostName}-nginx";
- example = lib.literalExpression "my-tunnel";
- description = lib.mdDoc ''
+ defaultText = lib.literalExpression "\${config.networking.hostName}-nginx";
+ example = "my-tunnel";
+ description = ''
Name of the default tunnel being created
'';
};
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
diff --git a/modules/nixos/server/mixins/hercules.nix b/modules/nixos/server/mixins/hercules.nix
index 49ba46d..7d0b1fb 100644
--- a/modules/nixos/server/mixins/hercules.nix
+++ b/modules/nixos/server/mixins/hercules.nix
@@ -10,9 +10,10 @@ let
in
{
options.server.mixins.hercules-ci = {
- enable = lib.mkEnableOption "hercules-ci mixin";
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+ enable = lib.mkEnableOption "Hercules CI mixin";
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
diff --git a/modules/nixos/server/mixins/nginx.nix b/modules/nixos/server/mixins/nginx.nix
index 11306a2..e3cc47a 100644
--- a/modules/nixos/server/mixins/nginx.nix
+++ b/modules/nixos/server/mixins/nginx.nix
@@ -4,7 +4,7 @@ let
in
{
options.server.mixins.nginx = {
- enable = lib.mkEnableOption "nginx mixin";
+ enable = lib.mkEnableOption "NGINX mixin";
};
config = lib.mkIf cfg.enable {
diff --git a/modules/nixos/traits/containers.nix b/modules/nixos/traits/containers.nix
index 1399dbf..407ee51 100644
--- a/modules/nixos/traits/containers.nix
+++ b/modules/nixos/traits/containers.nix
@@ -6,11 +6,16 @@
}:
let
cfg = config.traits.containers;
- enableNvidia = lib.elem "nvidia" (config.services.xserver.videoDrivers or [ ]);
in
{
options.traits.containers = {
- enable = lib.mkEnableOption "containers support";
+ enable = lib.mkEnableOption "support for containers";
+ enableNvidia = lib.mkEnableOption "the use of nvidia-container-toolkit" // {
+ default = lib.elem "nvidia" config.services.xserver.videoDrivers;
+ defaultText = lib.literalExpression ''
+ lib.elem "nvidia" config.services.xserver.videoDrivers
+ '';
+ };
};
config = lib.mkIf cfg.enable (
@@ -27,7 +32,7 @@ in
};
}
- (lib.mkIf enableNvidia { hardware.nvidia-container-toolkit.enable = true; })
+ (lib.mkIf cfg.enableNvidia { hardware.nvidia-container-toolkit.enable = true; })
]
);
}
diff --git a/modules/nixos/traits/tailscale.nix b/modules/nixos/traits/tailscale.nix
index 73c74e3..bc70431 100644
--- a/modules/nixos/traits/tailscale.nix
+++ b/modules/nixos/traits/tailscale.nix
@@ -11,8 +11,9 @@ in
options.traits.tailscale = {
enable = lib.mkEnableOption "Tailscale";
ssh.enable = lib.mkEnableOption "Tailscale SSH";
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
- default = config.traits.secrets.enable && cfg.ssh.enable;
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
+ default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
diff --git a/modules/nixos/traits/users/seth.nix b/modules/nixos/traits/users/seth.nix
index 4b84892..102dbad 100644
--- a/modules/nixos/traits/users/seth.nix
+++ b/modules/nixos/traits/users/seth.nix
@@ -9,8 +9,9 @@ let
in
{
options.traits.users.seth = {
- manageSecrets = lib.mkEnableOption "automatic secrets management" // {
+ manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
default = config.traits.secrets.enable;
+ defaultText = lib.literalExpression "config.traits.secrets.enable";
};
};
diff --git a/modules/nixos/traits/zram.nix b/modules/nixos/traits/zram.nix
index d0c6a36..f5ba2a9 100644
--- a/modules/nixos/traits/zram.nix
+++ b/modules/nixos/traits/zram.nix
@@ -4,7 +4,7 @@ let
in
{
options.traits.zram = {
- enable = lib.mkEnableOption "zram setup & configuration";
+ enable = lib.mkEnableOption "zram and sysctl optimizations";
};
config = lib.mkIf cfg.enable {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 16:59:30 +0000