From e0ff23879f625d0acda95cd08b757775bfea7aed Mon Sep 17 00:00:00 2001 From: hektor Date: Fri, 11 Sep 2026 18:44:47 +0200 Subject: [PATCH] refactor(git): move module options to 'default.nix' --- home/modules/git/default.nix | 16 ++++++++++++++-- home/modules/git/gitea.nix | 9 ++------- home/modules/git/github.nix | 7 +------ home/modules/git/gitlab.nix | 9 ++------- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/home/modules/git/default.nix b/home/modules/git/default.nix index 2f83e2b..7d39537 100644 --- a/home/modules/git/default.nix +++ b/home/modules/git/default.nix @@ -6,14 +6,26 @@ }: { + options.git = { + enable = lib.mkEnableOption "git"; + + gitea = { + enable = lib.mkEnableOption "Gitea CLI"; + }; + github = { + enable = lib.mkEnableOption "Github CLI"; + }; + gitlab = { + enable = lib.mkEnableOption "Gitlab CLI"; + }; + }; + imports = [ ./gitea.nix ./github.nix ./gitlab.nix ]; - options.git.enable = lib.mkEnableOption "git"; - config = lib.mkIf config.git.enable { assertions = [ { diff --git a/home/modules/git/gitea.nix b/home/modules/git/gitea.nix index 42cc694..7a57007 100644 --- a/home/modules/git/gitea.nix +++ b/home/modules/git/gitea.nix @@ -5,13 +5,8 @@ ... }: -let - cfg = config.git.gitea; -in { - options.git.gitea.enable = lib.mkEnableOption "Gitea CLI"; - - config = lib.mkIf (config.git.enable && cfg.enable) { - home.packages = [ pkgs.tea ]; + config = lib.mkIf (config.git.enable && config.git.gitea.enable) { + home.packages = with pkgs; [ tea ]; }; } diff --git a/home/modules/git/github.nix b/home/modules/git/github.nix index b89bf8f..de109da 100644 --- a/home/modules/git/github.nix +++ b/home/modules/git/github.nix @@ -4,13 +4,8 @@ ... }: -let - cfg = config.git.github; -in { - options.git.github.enable = lib.mkEnableOption "Github CLI"; - - config = lib.mkIf (config.git.enable && cfg.enable) { + config = lib.mkIf (config.git.enable && config.git.github.enable) { programs.gh.enable = true; }; } diff --git a/home/modules/git/gitlab.nix b/home/modules/git/gitlab.nix index 68cbaac..6a86763 100644 --- a/home/modules/git/gitlab.nix +++ b/home/modules/git/gitlab.nix @@ -5,13 +5,8 @@ ... }: -let - cfg = config.git.gitlab; -in { - options.git.gitlab.enable = lib.mkEnableOption "Gitlab CLI"; - - config = lib.mkIf (config.git.enable && cfg.enable) { - home.packages = [ pkgs.glab ]; + config = lib.mkIf (config.git.enable && config.git.gitlab.enable) { + home.packages = with pkgs; [ glab ]; }; }