From 8f5d076d7bb4b21da0d794318c984523d98e75d4 Mon Sep 17 00:00:00 2001
From: m3tm3re <p@m3ta.dev>
Date: Sun, 26 Apr 2026 12:16:44 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20make=20base=20modules=20enabled=20by=20d?=
 =?UTF-8?q?efault;=20document=20lazylib=E2=86=92lazygit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- All base/* modules now use (mkEnableOption "...") // { default = true; }
  so they activate automatically when imported — no explicit .enable = true
  required in host configs
- packages.nix: add comment documenting that lazylib does not exist in
  nixpkgs; lazygit is the correct and intended package
- zellij-ps.nix: clarify that cli.zellij-ps namespace is intentional —
  it is the home-manager module convention from m3ta-nixpkgs
- nix flake check passes (warnings are pre-existing)
---
 home/base/cli-tools/bat.nix        | 3 ++-
 home/base/cli-tools/carapace.nix   | 3 ++-
 home/base/cli-tools/direnv.nix     | 3 ++-
 home/base/cli-tools/eza.nix        | 3 ++-
 home/base/cli-tools/fzf.nix        | 3 ++-
 home/base/cli-tools/lf.nix         | 3 ++-
 home/base/cli-tools/nitch.nix      | 3 ++-
 home/base/cli-tools/packages.nix   | 5 ++++-
 home/base/cli-tools/television.nix | 3 ++-
 home/base/cli-tools/zellij-ps.nix  | 7 +++++--
 home/base/cli-tools/zellij.nix     | 3 ++-
 home/base/cli-tools/zoxide.nix     | 3 ++-
 home/base/secrets/secrets.nix      | 3 ++-
 home/base/shell/fish.nix           | 3 ++-
 home/base/shell/nushell.nix        | 3 ++-
 home/base/shell/starship.nix       | 3 ++-
 16 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/home/base/cli-tools/bat.nix b/home/base/cli-tools/bat.nix
index 473ae69..9a0e213 100644
--- a/home/base/cli-tools/bat.nix
+++ b/home/base/cli-tools/bat.nix
@@ -9,7 +9,8 @@ with lib; let
   cfg = config.base.cliTools.bat;
   palette = config.colorScheme.palette;
 in {
-  options.base.cliTools.bat.enable = mkEnableOption "enable bat with nix-colors theme";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.bat.enable = (mkEnableOption "enable bat with nix-colors theme") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.bat = {
diff --git a/home/base/cli-tools/carapace.nix b/home/base/cli-tools/carapace.nix
index 5fbb595..ea9194e 100644
--- a/home/base/cli-tools/carapace.nix
+++ b/home/base/cli-tools/carapace.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.carapace;
 in {
-  options.base.cliTools.carapace.enable = mkEnableOption "enable carapace completion engine";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.carapace.enable = (mkEnableOption "enable carapace completion engine") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.carapace = {
diff --git a/home/base/cli-tools/direnv.nix b/home/base/cli-tools/direnv.nix
index d7f7c7e..4ca206a 100644
--- a/home/base/cli-tools/direnv.nix
+++ b/home/base/cli-tools/direnv.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.direnv;
 in {
-  options.base.cliTools.direnv.enable = mkEnableOption "enable direnv with nix-direnv";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.direnv.enable = (mkEnableOption "enable direnv with nix-direnv") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.direnv = {
diff --git a/home/base/cli-tools/eza.nix b/home/base/cli-tools/eza.nix
index 9d2df93..2e432a8 100644
--- a/home/base/cli-tools/eza.nix
+++ b/home/base/cli-tools/eza.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.eza;
 in {
-  options.base.cliTools.eza.enable = mkEnableOption "enable eza modern ls replacement";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.eza.enable = (mkEnableOption "enable eza modern ls replacement") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.eza = {
diff --git a/home/base/cli-tools/fzf.nix b/home/base/cli-tools/fzf.nix
index f4ef6af..4093298 100644
--- a/home/base/cli-tools/fzf.nix
+++ b/home/base/cli-tools/fzf.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.fzf;
 in {
-  options.base.cliTools.fzf.enable = mkEnableOption "enable fuzzy finder";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.fzf.enable = (mkEnableOption "enable fuzzy finder") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.fzf = {
diff --git a/home/base/cli-tools/lf.nix b/home/base/cli-tools/lf.nix
index 67bc50a..50ff740 100644
--- a/home/base/cli-tools/lf.nix
+++ b/home/base/cli-tools/lf.nix
@@ -8,7 +8,8 @@
 with lib; let
   cfg = config.base.cliTools.lf;
 in {
-  options.base.cliTools.lf.enable = mkEnableOption "enable lf terminal file manager";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.lf.enable = (mkEnableOption "enable lf terminal file manager") // {default = true;};
 
   config = mkIf cfg.enable {
     home.packages = [pkgs.lf];
diff --git a/home/base/cli-tools/nitch.nix b/home/base/cli-tools/nitch.nix
index dc2147d..eac4d62 100644
--- a/home/base/cli-tools/nitch.nix
+++ b/home/base/cli-tools/nitch.nix
@@ -8,7 +8,8 @@
 with lib; let
   cfg = config.base.cliTools.nitch;
 in {
-  options.base.cliTools.nitch.enable = mkEnableOption "enable nitch";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.nitch.enable = (mkEnableOption "enable nitch") // {default = true;};
 
   config = mkIf cfg.enable {
     home.packages = [pkgs.nitch];
diff --git a/home/base/cli-tools/packages.nix b/home/base/cli-tools/packages.nix
index fcfec2a..fa226f4 100644
--- a/home/base/cli-tools/packages.nix
+++ b/home/base/cli-tools/packages.nix
@@ -1,4 +1,6 @@
 # Essential CLI packages — core utilities always available on every host.
+# NOTE: `lazylib` does not exist in nixpkgs. `lazygit` is the correct package
+# (Git TUI) and is intentionally used here instead.
 {
   config,
   lib,
@@ -8,7 +10,8 @@
 with lib; let
   cfg = config.base.cliTools.essentials;
 in {
-  options.base.cliTools.essentials.enable = mkEnableOption "enable essential CLI packages";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.essentials.enable = (mkEnableOption "enable essential CLI packages") // {default = true;};
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/base/cli-tools/television.nix b/home/base/cli-tools/television.nix
index 3c6aa67..3a74203 100644
--- a/home/base/cli-tools/television.nix
+++ b/home/base/cli-tools/television.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.television;
 in {
-  options.base.cliTools.television.enable = mkEnableOption "enable television";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.television.enable = (mkEnableOption "enable television") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.television = {
diff --git a/home/base/cli-tools/zellij-ps.nix b/home/base/cli-tools/zellij-ps.nix
index c2f8c72..8dac702 100644
--- a/home/base/cli-tools/zellij-ps.nix
+++ b/home/base/cli-tools/zellij-ps.nix
@@ -1,5 +1,7 @@
 # Zellij-ps — project-aware Zellij session manager from m3ta-nixpkgs.
-# Delegates to the cli.zellij-ps module provided by inputs.m3ta-nixpkgs.
+# Delegates to `cli.zellij-ps` — the home-manager module namespace provided by
+# m3ta-nixpkgs (inputs.m3ta-nixpkgs.nixosModules.default). This is intentional;
+# `cli.*` is the convention used by m3ta-nixpkgs home-manager modules.
 {
   config,
   lib,
@@ -9,7 +11,8 @@ with lib; let
   cfg = config.base.cliTools.zellijPs;
 in {
   options.base.cliTools.zellijPs = {
-    enable = mkEnableOption "enable zellij-ps project session manager";
+    # Enabled by default — base modules are always-on.
+    enable = (mkEnableOption "enable zellij-ps project session manager") // {default = true;};
 
     projectFolders = mkOption {
       type = types.listOf types.path;
diff --git a/home/base/cli-tools/zellij.nix b/home/base/cli-tools/zellij.nix
index 38e5c40..efe2c6c 100644
--- a/home/base/cli-tools/zellij.nix
+++ b/home/base/cli-tools/zellij.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.zellij;
 in {
-  options.base.cliTools.zellij.enable = mkEnableOption "enable zellij multiplexer";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.zellij.enable = (mkEnableOption "enable zellij multiplexer") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.zellij = {
diff --git a/home/base/cli-tools/zoxide.nix b/home/base/cli-tools/zoxide.nix
index 8c27c6f..bc3e80e 100644
--- a/home/base/cli-tools/zoxide.nix
+++ b/home/base/cli-tools/zoxide.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.cliTools.zoxide;
 in {
-  options.base.cliTools.zoxide.enable = mkEnableOption "enable zoxide smarter cd";
+  # Enabled by default — base modules are always-on.
+  options.base.cliTools.zoxide.enable = (mkEnableOption "enable zoxide smarter cd") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.zoxide = {
diff --git a/home/base/secrets/secrets.nix b/home/base/secrets/secrets.nix
index 7a72827..324546b 100644
--- a/home/base/secrets/secrets.nix
+++ b/home/base/secrets/secrets.nix
@@ -8,7 +8,8 @@
 with lib; let
   cfg = config.base.secrets;
 in {
-  options.base.secrets.enable = mkEnableOption "enable secrets management";
+  # Enabled by default — base modules are always-on.
+  options.base.secrets.enable = (mkEnableOption "enable secrets management") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.password-store = {
diff --git a/home/base/shell/fish.nix b/home/base/shell/fish.nix
index 94e65ec..6c6e3ad 100644
--- a/home/base/shell/fish.nix
+++ b/home/base/shell/fish.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.shell.fish;
 in {
-  options.base.shell.fish.enable = mkEnableOption "enable fish shell";
+  # Enabled by default — base modules are always-on.
+  options.base.shell.fish.enable = (mkEnableOption "enable fish shell") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.fish = {
diff --git a/home/base/shell/nushell.nix b/home/base/shell/nushell.nix
index 9bf837a..fccb7f0 100644
--- a/home/base/shell/nushell.nix
+++ b/home/base/shell/nushell.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.shell.nushell;
 in {
-  options.base.shell.nushell.enable = mkEnableOption "enable nushell";
+  # Enabled by default — base modules are always-on.
+  options.base.shell.nushell.enable = (mkEnableOption "enable nushell") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.nushell = {
diff --git a/home/base/shell/starship.nix b/home/base/shell/starship.nix
index 3fb6c10..5d467d6 100644
--- a/home/base/shell/starship.nix
+++ b/home/base/shell/starship.nix
@@ -7,7 +7,8 @@
 with lib; let
   cfg = config.base.shell.starship;
 in {
-  options.base.shell.starship.enable = mkEnableOption "enable starship prompt";
+  # Enabled by default — base modules are always-on.
+  options.base.shell.starship.enable = (mkEnableOption "enable starship prompt") // {default = true;};
 
   config = mkIf cfg.enable {
     programs.starship = {