From 3f1708bcde68b9084c41e196eb172d83b3c6a8bf Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 18 Mar 2025 10:34:16 -0500
Subject: [PATCH] feat: add config option for learning jujutsu

---
 lib/modules/home/default.nix | 39 ++++++++++++++++++++++++++----------
 packages/hosts/dragon.nix    |  5 ++++-
 packages/hosts/foxtrot.nix   |  5 ++++-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/lib/modules/home/default.nix b/lib/modules/home/default.nix
index a123a61..5727e99 100644
--- a/lib/modules/home/default.nix
+++ b/lib/modules/home/default.nix
@@ -54,6 +54,9 @@ in
         lyte = {
           shell = {
             enable = lib.mkEnableOption "Enable home-manager shell configuration for the user";
+            learn-jujutsu-not-git = {
+              enable = lib.mkEnableOption "Soft-disable the 'git' command in an effort to force me to learn jujutsu (jj)";
+            };
           };
         };
       };
@@ -308,7 +311,7 @@ in
     in
     {
       programs.git = {
-        enable = true;
+        enable = !config.lyte.shell.learn-jujutsu-not-git.enable;
 
         userName = lib.mkDefault fullName;
         userEmail = email;
@@ -404,16 +407,30 @@ in
       };
 
       programs.fish.functions = {
-        g = {
-          wraps = "git";
-          body = ''
-            if test (count $argv) -gt 0
-              git $argv
-            else
-              git status
-            end
-          '';
-        };
+        g =
+          if config.lyte.shell.learn-jujutsu-not-git.enable then
+            {
+              wraps = "jj";
+              body = ''
+                if test (count $argv) -gt 0
+                  jj $argv
+                else
+                  jj status
+                end
+              '';
+            }
+
+          else
+            {
+              wraps = "git";
+              body = ''
+                if test (count $argv) -gt 0
+                  git $argv
+                else
+                  git status
+                end
+              '';
+            };
         lag = {
           wraps = "g";
           body = ''
diff --git a/packages/hosts/dragon.nix b/packages/hosts/dragon.nix
index 3804ab4..a57d8f7 100644
--- a/packages/hosts/dragon.nix
+++ b/packages/hosts/dragon.nix
@@ -51,7 +51,10 @@
   lyte.desktop.enable = true;
 
   home-manager.users.daniel = {
-    lyte.shell.enable = true;
+    lyte.shell = {
+      enable = true;
+      learn-jujutsu-not-git.enable = true;
+    };
     lyte.desktop.enable = true;
     slippi-launcher = {
       enable = true;
diff --git a/packages/hosts/foxtrot.nix b/packages/hosts/foxtrot.nix
index f98a92a..3f4507b 100644
--- a/packages/hosts/foxtrot.nix
+++ b/packages/hosts/foxtrot.nix
@@ -75,7 +75,10 @@
   family-account.enable = true;
 
   home-manager.users.daniel = {
-    lyte.shell.enable = true;
+    lyte.shell = {
+      enable = true;
+      learn-jujutsu-not-git.enable = true;
+    };
     lyte.desktop.enable = true;
     home = {
       file.".config/easyeffects/output" = {