From 264b745dd02d9dcfe504732be9e38129c49ff291 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Sat, 30 Mar 2019 22:55:54 +1300
Subject: vimrc: Add folding, reduce contrast of listchars

---
 vimrc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/vimrc b/vimrc
index 17241f6..51f2561 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,9 @@
 syntax on
-set cc=80
+set cc=80,120
+set number
+
+set foldmethod=syntax
+set nofoldenable
 
 set autoindent
 set tabstop=4
@@ -13,16 +17,17 @@ map <ESC>[1;5D <C-Left>
 map! <ESC>[1;5C <C-Right>
 map! <ESC>[1;5D <C-Left>
 
-"set listchars=tab:▸\ ,trail:·,space:·
-set listchars=tab:→\ ,trail:·,space:·
+set listchars=tab:─\ ,trail:·,space:·,nbsp:␣,extends:⯈,precedes:⯇
+set showbreak=\\ 
 set list
 
 
 highlight ExtraWhitespace ctermbg=red guibg=red
+highlight SpecialKey ctermfg=23
+highlight NonText ctermfg=23
+highlight Folded ctermbg=0
 match ExtraWhitespace /\s\+$/
 
-set number
-
 inoremap <CR> <CR>x<BS>
 nnoremap o ox<BS>
 nnoremap O Ox<BS>
-- 
cgit v1.1


From efbf98f8c23ac5ac0c2b5ecdba5390bfcd65a928 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Sat, 30 Mar 2019 23:10:18 +1300
Subject: vimrc: Better disable folds

---
 vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index 51f2561..a309b4d 100644
--- a/vimrc
+++ b/vimrc
@@ -3,7 +3,7 @@ set cc=80,120
 set number
 
 set foldmethod=syntax
-set nofoldenable
+autocmd BufEnter * silent! %foldopen!
 
 set autoindent
 set tabstop=4
-- 
cgit v1.1


From ddba3007fa9cddc4edd6371246d98494e465a242 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Sun, 31 Mar 2019 22:07:42 +1300
Subject: misc vimrc, title bar updates

---
 local/bin/update-dwm-bar | 2 +-
 vimrc                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/local/bin/update-dwm-bar b/local/bin/update-dwm-bar
index 6a656b6..e9156b1 100755
--- a/local/bin/update-dwm-bar
+++ b/local/bin/update-dwm-bar
@@ -39,7 +39,7 @@ while true; do
 	done
 	thermal_string="${thermal_string%,} °C"
 	datetime_string=$(date "+%A $sep %d %h %Y $sep %_I:%M %p (UTC%:::z)")
-	xsetroot -name "$currency$ups$thermal_string $sep $bat_string$datetime_string" || exit
+	xsetroot -name " $currency$ups$thermal_string $sep $bat_string$datetime_string" || exit
 	sleep "$DELAY"
 done
 
diff --git a/vimrc b/vimrc
index a309b4d..e83fdc3 100644
--- a/vimrc
+++ b/vimrc
@@ -26,6 +26,7 @@ highlight ExtraWhitespace ctermbg=red guibg=red
 highlight SpecialKey ctermfg=23
 highlight NonText ctermfg=23
 highlight Folded ctermbg=0
+highlight ColorColumn ctermbg=234
 match ExtraWhitespace /\s\+$/
 
 inoremap <CR> <CR>x<BS>
-- 
cgit v1.1


From 39ff47d1c25c7cb641e8bf0b8de3398a12e1f998 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Wed, 15 May 2019 19:31:42 +1200
Subject: xcompose: Add donger

---
 XCompose | 1 +
 1 file changed, 1 insertion(+)

diff --git a/XCompose b/XCompose
index 0ce8d85..6df91d5 100644
--- a/XCompose
+++ b/XCompose
@@ -76,6 +76,7 @@ include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 <Multi_key> <l> <i> <t>                        : "🔥" # fire emoji
 <Multi_key> <F> <L> <I> <P>                    : "(╯°□°）╯︵ ┻━┻"
 <Multi_key> <p> <u> <t>                        : "ノ( ゜-゜ノ)"
+<Multi_key> <d> <o> <n> <g>                    : "ヽ༼ຈلຈ༽ﾉ"
 
 # BLACKBOARD BOLD UPPERCASE, 1 0
 <Multi_key> <B> <A>                            : "𝔸"
-- 
cgit v1.1


From fe44370a551d7f8db3a1093da9b8199f157dc374 Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Mon, 14 Oct 2019 10:57:57 +1300
Subject: vimrc: Add hlsearch, adjust diff colours

---
 vimrc | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/vimrc b/vimrc
index e83fdc3..b7c7791 100644
--- a/vimrc
+++ b/vimrc
@@ -33,6 +33,28 @@ inoremap <CR> <CR>x<BS>
 nnoremap o ox<BS>
 nnoremap O Ox<BS>
 
+function! ToggleHlsearch()
+    if &hlsearch
+        nohlsearch
+        set nohlsearch
+    else
+        set hlsearch
+    endif
+endfunction
+
+" highlighted search colours
+hi Search ctermbg=DarkYellow ctermfg=Black
+nnoremap <C-_> :call ToggleHlsearch()<cr>
+
+hi Todo ctermbg=DarkGreen ctermfg=Black
+
+
+set expandtab
+autocmd BufRead,BufNewFile *.cli setfiletype xml
+"autocmd FileType c setlocal expandtab
+autocmd FileType make set noexpandtab
+autocmd FileType cpp setlocal expandtab
+autocmd FileType bitbake setlocal expandtab
 autocmd FileType python setlocal expandtab
 autocmd FileType haskell setlocal expandtab
 autocmd FileType lhaskell setlocal expandtab
@@ -56,3 +78,9 @@ let g:airline_powerline_fonts = 1
 
 " makes airline work before split
 set laststatus=2
+
+" Nicer colours for solarised vimdiff
+highlight DiffAdd    cterm=bold ctermfg=233  ctermbg=101 gui=none guifg=bg guibg=Red
+highlight DiffDelete cterm=bold ctermfg=175  ctermbg=175 gui=none guifg=bg guibg=Red
+highlight DiffChange cterm=bold ctermfg=234  ctermbg=101 gui=none guifg=bg guibg=Red
+highlight DiffText   cterm=none ctermfg=242  ctermbg=0   gui=none guifg=bg guibg=Red
-- 
cgit v1.1