From dbc5cb478c7fad1c1750421486252f0a5d98ef9c Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Sun, 11 Jan 2026 13:36:45 -0600
Subject: now there's docs

---
 modules/terminal/options.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules/terminal')

diff --git a/modules/terminal/options.nix b/modules/terminal/options.nix
index 25e0eb4..8207be3 100644
--- a/modules/terminal/options.nix
+++ b/modules/terminal/options.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkOption mkEnableOption types;
-  inherit (my-lib.options {inherit lib config;}) mkProgramOption;
+  inherit (my-lib.options {inherit lib config;}) mkProgramOption mkThemeOption;
 in {
   options = {
     collinux.terminal = {
@@ -37,10 +37,11 @@ in {
         git = {
           enable = mkEnableOption "git";
           userName = mkOption {
+            description = "Public name uses for git";
             type = types.str;
-            default = config.collinux.user.name;
           };
           userEmail = mkOption {
+            description = "Public email used for git";
             type = types.str;
           };
           installKey = mkEnableOption "automatically install github authentication key";
@@ -48,10 +49,7 @@ in {
 
         helix = {
           enable = mkEnableOption "helix text editor";
-          theme = mkOption {
-            type = lib.types.enum ["catppuccin" "adwaita" "kanagawa"];
-            default = config.collinux.theme;
-          };
+          theme = mkThemeOption "helix";
           hardMode = mkOption {
             type = types.bool;
             description = "Disable arrow keys and mouse";
-- 
cgit v1.3.1


From 31626c1d32fba39f963ec37f7f2ce2943ea9bf29 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:36:22 -0600
Subject: start using tmux

---
 hosts/mercury/config.nix                | 2 ++
 modules/terminal/hjem/programs/tmux.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/terminal')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 3fb4753..3427a2e 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -51,6 +51,8 @@
           hardMode = true;
         };
 
+        tmux.enable = true;
+
         lazygit.enable = true;
         nh.enable = true;
         git = {
diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix
index 8525569..dd235c1 100644
--- a/modules/terminal/hjem/programs/tmux.nix
+++ b/modules/terminal/hjem/programs/tmux.nix
@@ -16,8 +16,8 @@ in {
       enable = true;
 
       theme = {
-        bg = config.collinux.palette.base01;
-        bg_dark = config.collinux.palette.base00;
+        bg = "#${config.collinux.palette.base01}";
+        bg_dark = "#${config.collinux.palette.base00}";
       };
 
       keys.leader = [
-- 
cgit v1.3.1


From 43af7f28b28021932b318964a953463d8dd79372 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Sun, 18 Jan 2026 07:04:26 -0600
Subject: fix tmux colors

---
 modules/terminal/hjem/programs/tmux.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/terminal')

diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix
index dd235c1..2c87212 100644
--- a/modules/terminal/hjem/programs/tmux.nix
+++ b/modules/terminal/hjem/programs/tmux.nix
@@ -16,8 +16,8 @@ in {
       enable = true;
 
       theme = {
-        bg = "#${config.collinux.palette.base01}";
-        bg_dark = "#${config.collinux.palette.base00}";
+        bg = "#${config.collinux.palette.base00}";
+        bg_dark = "#${config.collinux.palette.base01}";
       };
 
       keys.leader = [
-- 
cgit v1.3.1