Compare commits

...

5 Commits

5 changed files with 49 additions and 34 deletions

View File

@ -34,33 +34,9 @@ font:
glyph_offset: glyph_offset:
x: 0 x: 0
y: 0 y: 0
#use_thin_strokes: true
debug: debug:
render_timer: false render_timer: false
persistent_logging: false persistent_logging: false
draw_bold_text_with_bright_colors: true
colors:
primary:
background: '0x282a36'
foreground: '0xf8f8f2'
normal:
black: '0x000000'
red: '0xff5555'
green: '0x50fa7b'
yellow: '0xf1fa8c'
blue: '0xcaa9fa'
magenta: '0xff79c6'
cyan: '0x8be9fd'
white: '0xbfbfbf'
bright:
black: '0x575b70'
red: '0xff6e67'
green: '0x5af78e'
yellow: '0xf4f99d'
blue: '0xcaa9fa'
magenta: '0xff92d0'
cyan: '0x9aedfe'
white: '0xe6e6e6'
bell: bell:
animation: EaseOutExpo animation: EaseOutExpo
duration: 0 duration: 0
@ -397,3 +373,32 @@ key_bindings:
chars: "\e[24;3~" chars: "\e[24;3~"
- key: NumpadEnter - key: NumpadEnter
chars: "\n" chars: "\n"
# Colors (Darcula)
colors:
# Default colors
primary:
background: '0x282a36'
foreground: '0xf8f8f2'
# Normal colors
normal:
black: '0x000000'
red: '0xff5555'
green: '0x50fa7b'
yellow: '0xf1fa8c'
blue: '0xcaa9fa'
magenta: '0xff79c6'
cyan: '0x8be9fd'
white: '0xbfbfbf'
# Bright colors
bright:
black: '0x282a35'
red: '0xff6e67'
green: '0x5af78e'
yellow: '0xf4f99d'
blue: '0xcaa9fa'
magenta: '0xff92d0'
cyan: '0x9aedfe'
white: '0xe6e6e6'

View File

@ -66,6 +66,7 @@
[tag] [tag]
gpgsign = true gpgsign = true
forceSignAnnotated = true
[gpg] [gpg]
program = gpg2 program = gpg2

View File

@ -955,6 +955,7 @@
typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
# Custom icon. # Custom icon.
# typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐' # typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐'
typeset -g POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES=(virtualenv venv .venv env)
#####################[ anaconda: conda environment (https://conda.io/) ]###################### #####################[ anaconda: conda environment (https://conda.io/) ]######################
# Anaconda environment color. # Anaconda environment color.

17
vimrc
View File

@ -29,7 +29,7 @@ set statusline+=%#warningmsg#
set statusline+=%* set statusline+=%*
set tabstop=4 set tabstop=4
set updatetime=100 set updatetime=100
set textwidth=67 set textwidth=1000
if has("persistent_undo") if has("persistent_undo")
set undodir=~/.vim/_undo// set undodir=~/.vim/_undo//
@ -46,9 +46,13 @@ au BufRead,BufNewFile .envrc setfiletype sh
au BufRead,BufNewFile Dockerfile* setfiletype dockerfile au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
au BufRead,BufNewFile Pipfile setfiletype toml au BufRead,BufNewFile Pipfile setfiletype toml
au BufRead,BufNewFile kubectl-edit-status-* setfiletype yaml au BufRead,BufNewFile kubectl-edit-status-* setfiletype yaml
au BufRead,BufNewFile .lintr setfiletype yaml
au BufRead,BufNewFile devcontainer.json setfiletype jsonc
au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc
au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
au FileType go nmap <leader>r <Plug>(go-run) au FileType go nmap <leader>r <Plug>(go-run)
au FileType go nmap <Leader>c <Plug>(go-coverage-toggle) au FileType go nmap <Leader>c <Plug>(go-coverage-toggle)
au FileType sh set expandtab
au QuickFixCmdPost *grep* cwindow au QuickFixCmdPost *grep* cwindow
" run :GoBuild or :GoTestCompile based on the go file " run :GoBuild or :GoTestCompile based on the go file
@ -73,7 +77,10 @@ map <leader>l :Minimap<CR>
map <leader>L :MinimapClose<CR> map <leader>L :MinimapClose<CR>
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
au FileType python nmap <leader>t :Black<CR>:w<CR> augroup black_on_save
autocmd!
autocmd BufWritePre *.py Black
augroup end
let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
@ -108,8 +115,8 @@ let g:vim_markdown_folding_disabled = 1
let g:vim_markdown_frontmatter = 1 let g:vim_markdown_frontmatter = 1
let g:yapf_style = "pep8" let g:yapf_style = "pep8"
packadd! dracula packadd! dichromatic
colorscheme dracula colorscheme dichromatic
hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2 hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2
hi minimapCursor ctermbg=59 ctermfg=228 guibg=#5F5F5F guifg=#FFFF87 hi minimapCursor ctermbg=59 ctermfg=228 guibg=#5F5F5F guifg=#FFFF87

11
zshrc
View File

@ -74,6 +74,7 @@ path=(
plugins=( plugins=(
archlinux archlinux
aws aws
azure
brew brew
bundler bundler
command-not-found command-not-found
@ -177,14 +178,14 @@ if [[ -f ~/.cargo/env ]]; then
fi fi
if gimme --version &>/dev/null; then if gimme --version &>/dev/null; then
eval "$(gimme 1.21.x)" 2>/dev/null eval "$(gimme 1.21.4)" 2>/dev/null
export GOPATH="$HOME/go" export GOPATH="$HOME/go"
fi fi
CDPATH="$HOME/code:$HOME/src:$HOME/Development/src:$HOME/repos" cdpath=(
for prefix in github.com github.com/meatballhat code.google.com/p ; do $HOME/code
CDPATH="$HOME/go/src/$prefix:$CDPATH" $HOME/src
done )
export GPG_TTY=$(tty) export GPG_TTY=$(tty)