From 1ecb690f0d225caa1bb31517336c097bbb509784 Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Wed, 11 Mar 2026 21:16:38 +0100
Subject: [PATCH] refactor: namespace git cli options under git module

---
 home/hosts/andromache/default.nix | 2 +-
 home/hosts/astyanax/default.nix   | 2 +-
 home/hosts/work/default.nix       | 4 ++--
 home/modules/git/default.nix      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index 0f3ab43..9b31b4d 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -46,7 +46,7 @@ in
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
   comms.signal.enable = true;
-  github.enable = true;
+  git.github.enable = true;
   shell.bash.aliases.lang-js = true;
   shell.bash.addBinToPath = true;
 
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 0893c04..6ce75c2 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -44,7 +44,7 @@ in
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
   comms.signal.enable = true;
-  github.enable = true;
+  git.github.enable = true;
   shell.bash.aliases.lang-js = true;
   shell.bash.addBinToPath = true;
 
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index c428ba3..9407f0e 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -104,8 +104,8 @@ in
   };
   database.mssql.enable = true;
   database.postgresql.enable = true;
-  github.enable = true;
-  gitlab.enable = true;
+  git.github.enable = true;
+  git.gitlab.enable = true;
   secrets.vault.enable = true;
 
   programs = {
diff --git a/home/modules/git/default.nix b/home/modules/git/default.nix
index cc690a9..d15fb2e 100644
--- a/home/modules/git/default.nix
+++ b/home/modules/git/default.nix
@@ -7,7 +7,7 @@
 }:
 
 {
-  options = {
+  options.git = {
     github.enable = lib.mkEnableOption "Github CLI";
     gitlab.enable = lib.mkEnableOption "Gitlab CLI";
   };
@@ -20,7 +20,7 @@
       ".gitignore".source = dotsPath + "/.gitignore";
     };
 
-    programs.gh.enable = config.github.enable;
-    home.packages = lib.optionals config.gitlab.enable [ pkgs.glab ];
+    programs.gh.enable = config.git.github.enable;
+    home.packages = lib.optionals config.git.gitlab.enable [ pkgs.glab ];
   };
 }