diff options
| author | David Phillips <david@yeah.nah.nz> | 2019-10-14 19:00:53 +1300 |
|---|---|---|
| committer | David Phillips <david@yeah.nah.nz> | 2019-10-14 19:00:53 +1300 |
| commit | bb564cb086aab16ffe91370e17afa8396739ac46 (patch) | |
| tree | 302f4c1338c755adcad0821b6a5abd6e55c21469 | |
| parent | 1840e5f0c52c60f6efbbc550793aa4894f4b89f4 (diff) | |
| parent | fe44370a551d7f8db3a1093da9b8199f157dc374 (diff) | |
| download | dotfiles-bb564cb086aab16ffe91370e17afa8396739ac46.tar.xz | |
Merge branch 'master' of nah.nz:/srv/git/public/dotfiles
| -rw-r--r-- | XCompose | 1 | ||||
| -rwxr-xr-x | local/bin/update-dwm-bar | 2 | ||||
| -rw-r--r-- | vimrc | 29 |
3 files changed, 31 insertions, 1 deletions
@@ -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> : "𝔸" 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 @@ -26,12 +26,35 @@ 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> 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 @@ -55,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 |