up

Signed-off-by: Christoph Schmatzler <christoph@schmatzler.com>

modules/darwin/default.nix

@@ -63,7 +63,7 @@
 			username = user;
 			entries = [
 				{path = "/Applications/Helium.app/";}
-				{path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";}
+				{path = "${config.users.users.${user}.home}/Applications/Home Manager Apps/Ghostty.app/";}
 				{path = "/System/Applications/Calendar.app/";}
 				{path = "/System/Applications/Mail.app/";}
 				{path = "/System/Applications/Notes.app/";}

modules/home/default.nix

@@ -12,6 +12,8 @@
 		./fish.nix
 		./fzf.nix
 		./git.nix
+		./jjui.nix
+		./jujutsu.nix
 		./lazygit.nix
 		./mise.nix
 		./neovim

modules/home/jjui.nix

@@ -0,0 +1,5 @@
+{
+  programs.jjui = {
+    enable = true;
+  };
+}

modules/home/jujutsu.nix

@@ -0,0 +1,20 @@
+{
+	programs.jujutsu = {
+		enable = true;
+		settings = {
+			user = {
+				name = "Christoph Schmatzler";
+				email = "christoph@schmatzler.com";
+			};
+			diff = {
+				tool = "delta";
+			};
+			ui = {
+				default-command = "status";
+				diff-formatter = ":git";
+				pager = ["delta" "--pager" "less -FRX"];
+				diff-editor = ["nvim" "-c" "DiffEditor $left $right $output"];
+			};
+		};
+	};
+}

modules/home/neovim/default.nix

@@ -6,10 +6,9 @@
 		./plugins/blink-cmp.nix
 		./plugins/conform.nix
 		./plugins/copilot.nix
-		./plugins/diffview.nix
 		./plugins/grug-far.nix
 		./plugins/harpoon.nix
-
+		./plugins/hunk.nix
 		./plugins/lsp.nix
 		./plugins/mini.nix
 		./plugins/oil.nix

modules/home/neovim/mappings.nix

@@ -128,27 +128,10 @@
 			key = "<leader>gg";
 			action.__raw = ''
 				function()
-					local Terminal = require('toggleterm.terminal').Terminal
+				  require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle()
-					local lazygit = Terminal:new({
-						cmd = "lazygit",
-						dir = "git_dir",
-						direction = "float",
-						float_opts = {
-							border = "curved",
-							winblend = 3,
-						},
-						on_open = function(term)
-							vim.cmd("startinsert!")
-							vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "<cmd>close<CR>", {noremap = true, silent = true})
-						end,
-						on_close = function(term)
-							vim.cmd("startinsert!")
-						end,
-					})
-					lazygit:toggle()
 				end
 			'';
-			options.desc = "Lazygit (toggleterm)";
+			options.desc = "jjui";
 		}
 		# l - lsp/formatter
 		{

modules/home/neovim/plugins/diffview.nix

@@ -1,5 +0,0 @@
-{
-	programs.nixvim.plugins.diffview = {
-		enable = true;
-	};
-}

modules/home/neovim/plugins/hunk.nix

@@ -0,0 +1,7 @@
+{
+	programs.nixvim.plugins = {
+		hunk = {
+			enable = true;
+		};
+	};
+}

modules/home/neovim/plugins/toggleterm.nix

@@ -17,4 +17,4 @@
       shell = "fish";
     };
   };
-}
+}