From 098b4ab2bc0bff962a6745e74e38f71485857142 Mon Sep 17 00:00:00 2001
From: Felix Schneider <99918022+trueberryless@users.noreply.github.com>
Date: Mon, 4 May 2026 13:48:08 +0200
Subject: [PATCH] feat: add jujutsu config and refactor git, use ssh now with
 signing

---
 dotfiles/shell/zshrc                   |  5 +++++
 dotfiles/{git/config => vcs/gitconfig} |  7 +++++++
 dotfiles/{git/ignore => vcs/gitignore} |  0
 dotfiles/vcs/jjconfig                  | 10 ++++++++++
 modules/home-manager.nix               |  5 +++--
 5 files changed, 25 insertions(+), 2 deletions(-)
 rename dotfiles/{git/config => vcs/gitconfig} (72%)
 rename dotfiles/{git/ignore => vcs/gitignore} (100%)
 create mode 100644 dotfiles/vcs/jjconfig

diff --git a/dotfiles/shell/zshrc b/dotfiles/shell/zshrc
index 8bca453..2ebfc72 100644
--- a/dotfiles/shell/zshrc
+++ b/dotfiles/shell/zshrc
@@ -8,3 +8,8 @@ export NIX_CONFIG_PATH=~/.config/nix
 
 eval "$(oh-my-posh init zsh --config '~/oh-my-posh.omp.json')"
 eval "$(zoxide init zsh --cmd cd)"
+
+source <(COMPLETE=zsh jj)
+eval "$(gh completion -s zsh)"
+source <(npm completion)
+source <(pnpm completion zsh)
diff --git a/dotfiles/git/config b/dotfiles/vcs/gitconfig
similarity index 72%
rename from dotfiles/git/config
rename to dotfiles/vcs/gitconfig
index cbbfd23..1198f9d 100644
--- a/dotfiles/git/config
+++ b/dotfiles/vcs/gitconfig
@@ -1,6 +1,7 @@
 [user]
   name = Felix Schneider
   email = 99918022+trueberryless@users.noreply.github.com
+  signingkey = ~/.ssh/github.pub
 
 [init]
   defaultBranch = main
@@ -11,5 +12,11 @@
 [pull]
   rebase = true
 
+[commit]
+  gpgsign = true
+
+[gpg]
+  format = ssh
+
 [core]
   excludesFile = ~/.gitignore
diff --git a/dotfiles/git/ignore b/dotfiles/vcs/gitignore
similarity index 100%
rename from dotfiles/git/ignore
rename to dotfiles/vcs/gitignore
diff --git a/dotfiles/vcs/jjconfig b/dotfiles/vcs/jjconfig
new file mode 100644
index 0000000..decb625
--- /dev/null
+++ b/dotfiles/vcs/jjconfig
@@ -0,0 +1,10 @@
+#:schema https://docs.jj-vcs.dev/latest/config-schema.json
+
+[user]
+name = "Felix Schneider"
+email = "did:plc:pbjvqaziagcyv2vqodldn5op"
+
+[signing]
+behavior = "own"
+backend = "ssh"
+key = "~/.ssh/tangled.pub"
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index ddd107d..c68f537 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -11,8 +11,9 @@
   ];
 
   home.file = {
-    ".gitconfig".source = ../dotfiles/git/config;
-    ".gitignore".source = ../dotfiles/git/ignore;
+    ".gitconfig".source = ../dotfiles/vcs/gitconfig;
+    ".gitignore".source = ../dotfiles/vcs/gitignore;
+    ".config/jj/config.toml".source = ../dotfiles/vcs/jjconfig;
 
     ".alias".source = ../dotfiles/shell/alias;
     ".zprofile".source = ../dotfiles/shell/zprofile;
-- 
2.51.2