From 0b9840639ab3e97ad4bdc0eece7e4471013de012 Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <gpg@kogakure.8shield.net>
Date: Sat, 3 May 2025 17:52:13 +0200
Subject: [PATCH] feat(jj): add configuration for jj

---
 config/fish/config.fish | 3 +++
 install.conf.yaml       | 1 +
 jjconfig.toml           | 3 +++
 tool-versions           | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 jjconfig.toml

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 548395d..d4366c7 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -53,6 +53,9 @@ set -x XDG_CONFIG_HOME $HOME/.config
 set -x XDG_DATA_HOME $HOME/.local/share
 set -x XDG_STATE_HOME $HOME/.local/state
 
+# jj
+set -x JJ_CONFIG_DIR $HOME/.config/jj
+
 # GPG
 set -gx GPG_TTY (tty)
 
diff --git a/install.conf.yaml b/install.conf.yaml
index c4f96d7..fc681ba 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -32,6 +32,7 @@
     ~/.gitmux.conf: gitmux.conf
     ~/.gnupg/dirmngr.conf: gnupg/dirmngr.conf
     ~/.gnupg/gpg.conf: gnupg/gpg.conf
+    ~/.jjconfig.toml: jjconfig.toml
     ~/.markdownlint.yaml: markdownlint.yaml
     ~/.profile: profile
     ~/.session-variables.sh: session-variables.sh
diff --git a/jjconfig.toml b/jjconfig.toml
new file mode 100644
index 0000000..6cc35ed
--- /dev/null
+++ b/jjconfig.toml
@@ -0,0 +1,3 @@
+[user]
+name = "Stefan Imhoff"
+email = "gpg@kogakure.8shield.net"
diff --git a/tool-versions b/tool-versions
index 9598526..8956cb4 100644
--- a/tool-versions
+++ b/tool-versions
@@ -1,7 +1,7 @@
 deno 2.0.0
 python 3.10.9
 lua 5.4.6
-rust 1.80.0
+rust 1.86.0
 ruby 3.3.4
 golang 1.22.5
 nodejs 20.11.1