From d875987ab56dbcaccfe26c2f453ba8905f67b29e Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Fri, 22 Sep 2023 13:55:28 +0100
Subject: [PATCH] Git improvements

---
 users/tsv/git/config             | 2 ++
 users/tsv/nvim/lua/tsv/remap.lua | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/users/tsv/git/config b/users/tsv/git/config
index 38a8c11..1fb25ea 100644
--- a/users/tsv/git/config
+++ b/users/tsv/git/config
@@ -3,6 +3,8 @@
         email = trevor@tsvallender.co.uk
 [includeIf "gitdir:~/foxsoft/"]
         path = ~/.config/git/config_foxsoft
+[includeIf "gitdir:~/fs/"]
+        path = ~/.config/git/config_foxsoft
 [core]
         autocrlf = input
         safecrlf = true
diff --git a/users/tsv/nvim/lua/tsv/remap.lua b/users/tsv/nvim/lua/tsv/remap.lua
index ed64807..6b6cd30 100644
--- a/users/tsv/nvim/lua/tsv/remap.lua
+++ b/users/tsv/nvim/lua/tsv/remap.lua
@@ -8,6 +8,7 @@ vim.keymap.set('n', '<leader>pD', ":pu!=strftime('%c')<CR>");
 
 -- Telescope
 local builtin = require('telescope.builtin')
+local telescope = require('telescope')
 vim.keymap.set('n', '<leader>tf', builtin.find_files, {}) -- Open files
 vim.keymap.set('n', '<leader>ts', builtin.live_grep, {})  -- Grep files
 vim.keymap.set('n', '<leader>tb', builtin.buffers, {})    -- Neovim buffers
@@ -21,6 +22,8 @@ vim.keymap.set('n', '<leader>tgc', builtin.git_commits, {})
 vim.keymap.set('n', '<leader>tgh', builtin.git_bcommits, {}) -- Current buffer's commits
 vim.keymap.set('n', '<leader>tgb', builtin.git_branches, {}) -- CR: checkout, C-t: track, C-r: rebase, C-a: create, C-s: switch, C-d: delete, C-y: merge
 vim.keymap.set('n', '<leader>tgs', builtin.git_stash, {}) -- List stash, apply with CR
+require("telescope").load_extension("git_worktree")
+vim.keymap.set('n', '<leader>tgw', telescope.extensions.git_worktree.git_worktrees, {})
 -- LSP functionality (tl prefix)
 vim.keymap.set('n', '<leader>tlr', builtin.lsp_references, {})
 vim.keymap.set('n', '<leader>tli', builtin.lsp_incoming_calls, {})
@@ -66,3 +69,4 @@ vim.keymap.set('n', '<leader>gr', ':diffget //3<CR>'); -- 'Get right' window
 -- Nvim-tree
 vim.keymap.set("n", "<leader>nt", vim.cmd.NvimTreeToggle, {})
 
+