Skip to content

Commit

Permalink
git updates, interactive comments in zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
bbkane committed Jul 2, 2020
1 parent 4d13d52 commit 2c0f6d5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
9 changes: 9 additions & 0 deletions git/.gitconfig
Expand Up @@ -20,6 +20,14 @@
[core]
excludesfile = ~/.config/gitignore_global

# The following are for https://github.com/dandavison/delta
[core]
# pager = delta --plus-color="#012800" --minus-color="#340001" --theme='Monokai Extended'
pager = delta --plus-color="#012800" --minus-color="#340001" --theme='zenburn'
# pager = delta --theme='zenburn' --dark
[interactive]
diffFilter = delta --color-only

# This is primarily for setting user.email differently at work
# and needs to go at the bottom so it overwrites above settings
[include]
Expand All @@ -29,3 +37,4 @@
# within work machine
[includeIf "gitdir/i:~/Git-personal/"]
path = ~/.gitconfig.personal

5 changes: 5 additions & 0 deletions nvim/.config/nvim/plugins.vim
Expand Up @@ -232,3 +232,8 @@ let g:gruvbox_material_background = 'soft'
Plug 'sainnhe/gruvbox-material'

Plug 'haishanh/night-owl.vim'

" let ayucolor="dark" " for dark version of theme
" let ayucolor="light" " for light version of theme
let ayucolor="mirage" " for mirage version of theme
Plug 'ayu-theme/ayu-vim' " or other package manager
3 changes: 3 additions & 0 deletions zsh/.zshrc_common.zsh
Expand Up @@ -120,6 +120,9 @@ setopt RM_STAR_WAIT
setopt auto_list # automatically list choices on ambiguous completion
setopt auto_menu # automatically use menu completion

# https://stackoverflow.com/a/11873793/2958070
setopt INTERACTIVECOMMENTS

# URL completion. Use URLs from history.
# zstyle -e ':completion:*:*:urls' urls 'reply=( ${${(f)"$(egrep --only-matching \(ftp\|https\?\)://\[A-Za-z0-9\].\* $HISTFILE)"}%%[# ]*} )'

Expand Down

0 comments on commit 2c0f6d5

Please sign in to comment.