From e769a41faad922bc0e832c900e906959c7128af8 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Fri, 6 Dec 2024 10:42:23 -0600
Subject: [PATCH] only use flake jj

---
 hosts/algiz/pkgs.nix        |  1 -
 hosts/othalan/pkgs.nix      |  2 --
 modules/development/git.nix | 23 ++++++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hosts/algiz/pkgs.nix b/hosts/algiz/pkgs.nix
index ff4412f..3d6d274 100644
--- a/hosts/algiz/pkgs.nix
+++ b/hosts/algiz/pkgs.nix
@@ -4,6 +4,5 @@
     (writeShellScriptBin "gitea" ''
       ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
     '')
-    jujutsu
   ];
 }
diff --git a/hosts/othalan/pkgs.nix b/hosts/othalan/pkgs.nix
index b7ef80d..0c7fc08 100644
--- a/hosts/othalan/pkgs.nix
+++ b/hosts/othalan/pkgs.nix
@@ -4,7 +4,6 @@
     [
       (flake.pkg "utils")
       (flake.pkg "ghostty")
-      (flake.pkg "jj")
     ]
     ++ (with pkgs; [
       sops
@@ -16,6 +15,5 @@
       typst
       charm-freeze
       attic-client
-      # jujutsu
     ]);
 }
diff --git a/modules/development/git.nix b/modules/development/git.nix
index 732814e..20e952d 100644
--- a/modules/development/git.nix
+++ b/modules/development/git.nix
@@ -1,12 +1,17 @@
-{ pkgs, ... }:
+{ pkgs, flake, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    git
-    git-lfs
+  environment.systemPackages =
+    [
+      # not technically git ¯\_(ツ)_/¯
+      (flake.pkg "jj")
 
-    gh
-    lazygit
-    delta
-    jujutsu
-  ];
+    ]
+    ++ (with pkgs; [
+      git
+      git-lfs
+
+      gh
+      lazygit
+      delta
+    ]);
 }