.config/git/config

@@ -18,10 +18,6 @@
 	ui = true
 [diff]
 	algorithm = histogram
-[difftool]
-	prompt = false
-[difftool "difft"]
-	cmd = difft "$LOCAL" "$REMOTE"
 [push]
 	default = current
 [branch]
@@ -56,6 +52,9 @@
 	reset-head = remote set-head origin -a
 	head = for-each-ref --format="%(symref:lstrip=-1)" refs/remotes/origin/HEAD
 	sh = "!git switch $(git head)"
+	# show/diff but with difftastic
+	dshow = -c diff.external=difft show --ext-diff
+	ddiff = -c diff.external=difft diff
 
 [include]
 	path = ./config.local

.config/nixpkgs/elvish/lib/config.elv

@@ -49,6 +49,12 @@ eval (carapace _carapace|slurp)
 # restrict completion to only directories
 set edit:completion:arg-completer[cd] = $completion:dirs~
 
+# add dotfiles scripts
+set paths = [
+  ~/.roaming/bin
+  $@paths
+]
+
 # import local.elv if present, for example, from ~/.config/elvish/lib/local.elv
 try {
   use local

.config/nixpkgs/neovim/config/lua/user/plugins/git.lua

@@ -1,6 +1,15 @@
+local diffview = require('diffview')
 local MiniDiff = require('mini.diff')
 local util = require('user.util')
 
+diffview.setup({
+  use_icons = false,
+  signs = {
+    fold_closed = ' ',
+    fold_open = '-',
+  }
+})
+
 -- shows added/removed/changed lines
 MiniDiff.setup({
   -- keymap #bracketed
@@ -35,6 +44,8 @@ MiniDiff.setup({
 vim.keymap.set('n', '<Leader>gs', '<cmd>Gedit :<CR>')
 vim.keymap.set('n', '<Leader>gb', '<cmd>Telescope git_branches<CR>')
 vim.keymap.set('n', '<Leader>gd', MiniDiff.toggle_overlay)
+vim.keymap.set('n', '<Leader>gvi', '<cmd>DiffviewOpen<CR>')
+vim.keymap.set('n', '<Leader>gvr', '<cmd>DiffviewFileHistory --range=origin..HEAD<CR>')
 
 -- conflicts navigation #bracketed
 vim.keymap.set('n', '[x', '?^[<lt>=>]\\{7}<CR>')

.config/nixpkgs/neovim/config/lua/user/settings.lua

@@ -53,6 +53,9 @@ vim.o.mouse = 'v'
 -- use POSIX-y shell for !
 vim.o.shell = '/bin/sh'
 
+-- diff options, increase linematch to 60 and use histogram algorithm
+vim.o.diffopt = 'internal,filler,closeoff,linematch:60,algorithm:histogram'
+
 -- basic keymaps
 
 -- j/k with wraps

.config/nixpkgs/neovim/config/lua/user/theme.lua

@@ -58,6 +58,15 @@ vim.api.nvim_create_autocmd('ColorScheme', {
     vim.fn['sonokai#highlight']('MiniStatuslineModeReplace', palette.black, palette.red)
     vim.fn['sonokai#highlight']('MiniStatuslineModeOther', palette.black, palette.green)
 
+    -- make deleted text less bright
+    vim.fn['sonokai#highlight']('DiffDelete', palette.grey, palette.diff_red)
+
+    -- use yellow for changes
+    vim.fn['sonokai#highlight']('DiffChange', palette.none, { '#4f4f00', '58' })
+    -- this is orange-ish
+    vim.fn['sonokai#highlight']('DiffText', palette.none, { '#6f4f00', '94' })
+    vim.fn['sonokai#highlight']('MiniDiffSignChange', palette.yellow, palette.none)
+
     init_active_ns()
   end,
 })

.config/nixpkgs/neovim/plugins/sources.json

@@ -92,5 +92,9 @@
   "nvim-telescope/telescope-ui-select.nvim": {
     "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
     "sha256": "1cgi4kmq99ssx97nnriff5674cjfvc3qsw62nx3iz0xqc6d4s631"
+  },
+  "sindrets/diffview.nvim": {
+    "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
+    "sha256": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
   }
 }

.gitignore

@@ -8,14 +8,11 @@
 .config/git/config.local
 !.config/nixpkgs
 !.config/nixpkgs/**
-!.local
-!.local/bin
-!.local/bin/**
 !.vimrc
 !.zsh
 !.zsh/**
 .zsh/local.zsh
 !.zshrc
 !.gitignore
-!.dotfiles
-!.dotfiles/install.sh
+!.roaming
+!.roaming/**

.dotfiles/install.sh → .roaming/install.sh

@@ -1,13 +1,11 @@
 #!/bin/sh
-cd
+cd || exit
 export GIT_DIR="./.dotfiles"
 export GIT_WORK_TREE="."
 git init
 git remote add origin https://git.pleasantprogrammer.com/thatsmydoing/dotfiles.git
 git fetch
 git checkout -ft origin/master
-git submodule init
-git submodule update
 
 # create vim state folders
 mkdir -p .cache/vim/undo