.dotter/global.toml

@@ -4,7 +4,7 @@
 #       a development environment based on git and nvim.
 
 [base]
-depends = ["shell", "vcs", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
+depends = ["shell", "git", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
 
 [bootstrap.files]
 "bootstrap/dotlink.sh" = "~/.config/sh/alias.d/dotlink.sh"
@@ -13,13 +13,9 @@ depends = ["shell", "vcs", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
 "sh/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
 sh = "~"
 
-[vcs.files]
-"vcs/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
-"vcs/git" = "~/.config"
-"vcs/jj" = "~/.config"
-"vcs/gitignore/config" = "~/.config"
-"vcs/gitignore/local" = "~/.local"
-vcs = "~"
+[git.files]
+"git/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
+git = "~"
 
 [nvim.files]
 "nvim/.config/nvim/spell/de.utf-8.add.spl" = { target = "~/.config/nvim/spell/de.utf-8.add.spl", type = "symbolic" }

git/README.md

@@ -1,17 +1,15 @@
-# Version control software module
+# Git module
 
 [git](https://git-scm.com/) - a distributed version control system
-[jujutsu](https://martinvonz.github.io/jj/latest/) - a change-based version control system
 
 ## What's in this module
 
 [[_TOC_]]
 
-## Global vcs settings
+## Global git settings
 
-This are probably the first things that need to be customized, since it points to a different identity for each git user.
+This is probably the first thing that needs to be customized, since it points to a different identity for each git user.
 I sign all my commits by default, so take out the corresponding lines if you don't, or exchange it with your gpg key.
-Similarly for jujutsu, change the identity and remove the lines concerning gpg signing if you don't use it.
 
 Git will rewrite any remotes using http(s) to use the ssh notation for pushes to github and gitlab so that, even if you set up the repository using an https url you can utilize your usual ssh key for pushing.
 

nvim/.config/nvim/lua/plugins/pickers.lua

@@ -15,20 +15,13 @@ return {
 		event = { "BufEnter" },
 	}, -- integrate file manager
 	{
-		"nvim-neo-tree/neo-tree.nvim",
-		dependencies = {
-			"MunifTanjim/nui.nvim",
-			"nvim-lua/plenary.nvim",
-			{ "nvim-tree/nvim-web-devicons", optional = true },
-		},
-		cmd = "Neotree",
-		opts = {
-			source_selector = { winbar = true },
-		},
+		"nvim-tree/nvim-tree.lua", -- integrate file tree
+		config = true,
+		dependencies = { "nvim-tree/nvim-web-devicons", config = true },
+		cmd = "NvimTreeToggle",
 		keys = {
-			{ "<leader>se", "<cmd>Neotree toggle left<cr>", desc = "filetree", silent = true },
+			{ "<leader>se", "<cmd>NvimTreeToggle<cr>", desc = "filetree", silent = true },
 		},
-		lazy = false
 	},
 	{ "MagicDuck/grug-far.nvim", lazy = false, opts = {} },
 	-- fuzzy matching picker

vcs/jj/jj/config.toml

@@ -1,12 +0,0 @@
-[user]
-email = "marty.oehme@gmail.com"
-name = "Marty Oehme"
-
-[signing]
-sign-all = true
-backend = "gpg"
-key = "73BA40D5AFAF49C9"
-
-[ui]
-default-command = "log"
-diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]

vcs/jj/sh/alias.d/jj.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env sh
-
-if ! exist jj; then
-    return 1
-fi
-
-alias j='jj' # necessary for a thing as easy to type?
-if exist lazyjj; then
-    alias lj="lazyjj"
-fi
-alias js="jj status"
-
-alias jd="jj describe"
-alias jn="jj new"
-alias jc="jj commit"
-
-alias jl='jj log'
-alias jlo='jj log --summary'
-alias jloo='jj log --patch'
-alias jo="jj op log"
-
-alias jss="jj squash"
-alias jsi="jj squash --interactive"
-
-alias je="jj edit"
-alias jee="jj next --edit"
-
-alias jun="jj undo"
-
-alias jp="jj git push"