From c728f365ac0732a5f76f5ac0dd9b5ad0869444e9 Mon Sep 17 00:00:00 2001
From: Anish L <anish@lakhwara.com>
Date: Sat, 26 Feb 2022 00:55:19 +1000
Subject: [PATCH] Learning fugitive and other things

---
 profiles/nvim/nvim.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix
index b7a1e28e..baa85365 100644
--- a/profiles/nvim/nvim.nix
+++ b/profiles/nvim/nvim.nix
@@ -88,6 +88,7 @@ in
 				vim-surround
 				vim-fugitive
 				vim-signify
+				fzf-checkout-vim
 				#nvim-colorizer
 				vim-devicons
 				# testing
@@ -131,9 +132,9 @@ in
 			set spelllang=en_gb
 
 			" window
-			nmap <leader>wh :topleft  vnew<CR>
+			nmap <leader>wh :topleft	vnew<CR>
 			nmap <leader>wl :botright vnew<CR>
-			nmap <leader>wk :topleft  new<CR>
+			nmap <leader>wk :topleft	new<CR>
 			nmap <leader>wj :botright new<CR>
 
 			" tabs
@@ -185,25 +186,39 @@ in
 			let g:rainbow_active = 0
 			autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll
 
-			" keyboard commands
+			" general commands
 			map <leader>t :NERDTreeToggle<CR>
 			map <leader>s :w<CR>
 			map <leader>q :wq<CR>
 			map <leader>r :RainbowParenthesesToggleAll<CR>
+			map <leader><BS> :noh<CR>
+
+			" git
+			nmap <leader>gd :SignifyDiff<CR>
+			map <leader>ghu :SignifyHunkUndo<CR>
+			nmap <leader>gl :SignifyList<CR>
+			nmap <leader>gs :G<CR>
+			nmap <leader>gh :diffget //3
+			nmap <leader>gl :diffget //2
+			nmap <leader>gc :GChecout<CR>
+
+			" kitaab
 			map <leader>zs :ZettelSearch<CR>
 			map <leader>zo :ZettelOpen<CR>
 			map <leader>zn :ZettelNew<CR>
 
-
 			" NERDTree 
 			" open on directory
 			autocmd StdinReadPre * let s:std_in=1
 
+			" fzf
+			let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } }
+
+
 			" ALE + clj-kondo
 			let g:ale_linters = {'clojure': ['clj-kondo']}
 
 			" coc
-			" 
 			" conjure extension
 			let g:coc_global_extensions = ['coc-conjure']