From dca7d1fbae9686b18b84382e34ceb84b1ca68b18 Mon Sep 17 00:00:00 2001
From: SoraTenshi <dream@neoncity.dev>
Date: Tue, 29 Oct 2024 21:34:39 +0100
Subject: [PATCH] update jj to use hm module; add sbcl

---
 home/development/default.nix | 5 ++---
 home/jj/default.nix          | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/development/default.nix b/home/development/default.nix
index e09a9e9..8b4582a 100644
--- a/home/development/default.nix
+++ b/home/development/default.nix
@@ -33,9 +33,8 @@
     cmake gnumake
 
     # LISP
-    babashka
-    janet jpm
-    gauche
+    sbcl
+    # Clojure like (for shell scripts)
     joker
 
     # Qemu
diff --git a/home/jj/default.nix b/home/jj/default.nix
index 4cb33d2..6a16b9a 100644
--- a/home/jj/default.nix
+++ b/home/jj/default.nix
@@ -9,6 +9,7 @@ _: {
       ui = {
         editor = "hx";
         paginate = "never";
+        merge-editor = ":builtin";
       };
       signing = {
         sign-all = true;