From 7acff57575b44f575370fbfa7a872bd6179bd7f6 Mon Sep 17 00:00:00 2001 From: hektor Date: Fri, 11 Sep 2026 18:44:56 +0200 Subject: [PATCH] refactor(k8s): move module options to 'default.nix' --- home/modules/k8s/default.nix | 13 +++++++++++-- home/modules/k8s/helm.nix | 7 +------ home/modules/k8s/k9s.nix | 7 +------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/home/modules/k8s/default.nix b/home/modules/k8s/default.nix index b1275f5..428d04e 100644 --- a/home/modules/k8s/default.nix +++ b/home/modules/k8s/default.nix @@ -9,13 +9,22 @@ let cfg = config.k8s; in { + options.k8s = { + enable = lib.mkEnableOption "k8s"; + + helm = { + enable = lib.mkEnableOption "helm"; + }; + k9s = { + enable = lib.mkEnableOption "k9s"; + }; + }; + imports = [ ./helm.nix ./k9s.nix ]; - options.k8s.enable = lib.mkEnableOption "k8s"; - config = lib.mkIf cfg.enable { k8s.helm.enable = lib.mkDefault true; k8s.k9s.enable = lib.mkDefault true; diff --git a/home/modules/k8s/helm.nix b/home/modules/k8s/helm.nix index c83428d..796c5a8 100644 --- a/home/modules/k8s/helm.nix +++ b/home/modules/k8s/helm.nix @@ -5,13 +5,8 @@ ... }: -let - cfg = config.k8s.helm; -in { - options.k8s.helm.enable = lib.mkEnableOption "helm"; - - config = lib.mkIf cfg.enable { + config = lib.mkIf config.k8s.helm.enable { home.packages = with pkgs; [ (wrapHelm kubernetes-helm { plugins = with kubernetes-helmPlugins; [ diff --git a/home/modules/k8s/k9s.nix b/home/modules/k8s/k9s.nix index a543a63..43905d0 100644 --- a/home/modules/k8s/k9s.nix +++ b/home/modules/k8s/k9s.nix @@ -4,13 +4,8 @@ ... }: -let - cfg = config.k8s.k9s; -in { - options.k8s.k9s.enable = lib.mkEnableOption "k9s"; - - config = lib.mkIf cfg.enable { + config = lib.mkIf config.k8s.k9s.enable { programs.k9s = { enable = true; settings.k9s = {