dot_config/nvim/init.vim

@@ -44,7 +44,7 @@ set termguicolors
 set visualbell
 set noerrorbells
 set whichwrap=<,>,[,],b,
-"set background=light
+set background=light
 set backspace=indent,eol,start
 set number
 set autoread
@@ -75,8 +75,7 @@ nmap n nzz
 nmap N Nzz
 
 let g:airline_powerline_fonts=1
-"let g:airline_theme='papercolor'
+let g:airline_theme='papercolor'
-let g:airline_theme='base16_eighties'
 let g:airline#extensions#tabline#enabled = 1
 noremap <F2> :bp<CR>
 noremap <F3> :bn<CR>
@@ -136,5 +135,3 @@ nnoremap <leader>n :NvimTreeFindFile<CR>
 let g:nvim_tree_auto_close = 1
 " let g:nvim_tree_quit_on_open = 1
 let g:nvim_tree_git_hl = 1
-
-set guifont=OperatorMono\ Nerd\ Font:h16

dot_gitconfig

@@ -1,33 +1,3 @@
-[delta "woolly-mammoth"]
-    # author: https://github.com/Kr1ss-XD
-    commit-decoration-style = 232 130 box
-    commit-style = 232 bold 130
-    dark = true
-    file-added-label = [+]
-    file-copied-label = [C]
-    file-decoration-style = "#606018" overline
-    file-modified-label = [M]
-    file-removed-label = [-]
-    file-renamed-label = [R]
-    file-style = 232 bold 184
-    hunk-header-decoration-style = none
-    hunk-header-style = syntax bold 237
-    line-numbers = true
-    line-numbers-left-format = "{nm:>1}┊"
-    line-numbers-left-style = red
-    line-numbers-minus-style = red black
-    line-numbers-plus-style = green black
-    line-numbers-right-format = "{np:>1}┊"
-    line-numbers-right-style = green
-    line-numbers-zero-style = "#545474"
-    minus-emph-style = syntax bold "#780000"
-    minus-style = syntax "#400000"
-    plus-emph-style = syntax bold "#007800"
-    plus-style = syntax "#004000"
-    syntax-theme = Vibrant Sunburst
-    whitespace-error-style = "#280050" reverse
-    zero-style = syntax
-
 [push]
   default = simple
 
@@ -48,7 +18,9 @@
   defaultBranch = main
 
 [delta]
-  features = woolly-mammoth #decorations hoopoe
+  features = decorations hoopoe
+  line-numbers = true
+  #syntax-theme = Solarized (light)
 
 [delta "hoopoe"]
   # author: https://github.com/dandavison

private_dot_bashrc.d/aliases.sh

@@ -34,4 +34,3 @@ ex ()
 }
 
 alias m4b-tool='docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd)":/mnt m4b-tool'
-alias gcurl='curl --header "Authorization: Bearer $(gcloud auth print-identity-token)"'

private_dot_bashrc.d/git-prompt.sh

@@ -433,8 +433,8 @@ __git_ps1 ()
 	fi
 
 	local sparse=""
-	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
-	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
 	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 		sparse="|SPARSE"
 	fi
@@ -543,7 +543,7 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
-		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
 		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 			h="?"
 		fi