Compare commits

...

5 Commits

5 changed files with 107 additions and 62 deletions

View File

@ -946,11 +946,10 @@
# Python virtual environment color. # Python virtual environment color.
typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=0 typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=0
typeset -g POWERLEVEL9K_VIRTUALENV_BACKGROUND=4 typeset -g POWERLEVEL9K_VIRTUALENV_BACKGROUND=4
# Don't show Python version next to the virtual environment name. typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=true
typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false
# If set to "false", won't show virtualenv if pyenv is already shown. # If set to "false", won't show virtualenv if pyenv is already shown.
# If set to "if-different", won't show virtualenv if it's the same as pyenv. # If set to "if-different", won't show virtualenv if it's the same as pyenv.
typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=true
# Separate environment name from Python version only with a space. # Separate environment name from Python version only with a space.
typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
# Custom icon. # Custom icon.

View File

@ -1,7 +1,8 @@
bind-key C-b last-window bind-key C-b last-window
set-option -g default-command /bin/zsh set-option -g default-command /bin/zsh
set-option -g default-shell /bin/zsh set-option -g default-shell /bin/zsh
set-option -g default-terminal 'screen-256color' set-option -s default-terminal 'tmux-256color'
set -ga terminal-overrides ',alacritty:RGB,*256col*:RGB'
set-option -g history-limit 100000 set-option -g history-limit 100000
set-option -g prefix C-b set-option -g prefix C-b
set-option -g renumber-windows on set-option -g renumber-windows on

View File

@ -28,6 +28,22 @@
"ignoredRootPaths": [ "ignoredRootPaths": [
"~" "~"
] ]
},
"ruff-lsp": {
"command": [
"ruff-lsp"
],
"filetypes": [
"python"
]
} }
} },
"pyright.enable": true,
"pyright.inlayHints.functionReturnTypes": true,
"pyright.inlayHints.variableTypes": true,
"pyright.organizeimports.provider": "ruff",
"pyright.testing.provider": "pytest",
"python.formatting.provider": "ruff",
"python.linting.ruffEnabled": true,
"clangd.path": "~/.config/coc/extensions/coc-clangd-data/install/17.0.3/clangd_17.0.3/bin/clangd"
} }

42
vimrc
View File

@ -15,7 +15,7 @@ set backupdir^=~/.vim/_backup//
set cursorline set cursorline
set cursorcolumn set cursorcolumn
set directory^=~/.vim/_temp// set directory^=~/.vim/_temp//
set encoding=utf8 set encoding=utf-8
set hlsearch set hlsearch
set ignorecase set ignorecase
set incsearch set incsearch
@ -24,11 +24,12 @@ set linebreak
set modeline set modeline
set nowrap set nowrap
set number set number
set signcolumn=yes
set smartcase set smartcase
set statusline+=%#warningmsg# set statusline+=%#warningmsg#
set statusline+=%* set statusline+=%*
set tabstop=4 set tabstop=4
set updatetime=100 set updatetime=300
set textwidth=1000 set textwidth=1000
if has("persistent_undo") if has("persistent_undo")
@ -46,9 +47,11 @@ 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 *kubeconfig* setfiletype yaml
au BufRead,BufNewFile .lintr setfiletype yaml au BufRead,BufNewFile .lintr setfiletype yaml
au BufRead,BufNewFile devcontainer.json setfiletype jsonc au BufRead,BufNewFile devcontainer.json setfiletype jsonc
au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc
au BufRead,BufNewFile *.bicepparam setfiletype bicep
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)
@ -77,15 +80,16 @@ map <leader>l :Minimap<CR>
map <leader>L :MinimapClose<CR> map <leader>L :MinimapClose<CR>
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
augroup black_on_save "augroup black_on_save
autocmd! " autocmd!
autocmd BufWritePre *.py Black " autocmd BufWritePre *.py Black
augroup end "augroup end
autocmd BufNewFile,BufRead *.c set formatprg=astyle\ -t4\ -A14 autocmd BufNewFile,BufRead *.c set formatprg=astyle\ -t4\ -A14
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
let g:black_use_virtualenv = 1
let g:coc_global_extensions = ['coc-tsserver'] let g:coc_global_extensions = ['coc-tsserver']
let g:coc_node_path = "/home/dan/.nvm/versions/node/v16.9.1/bin/node" let g:coc_node_path = "/home/dan/.nvm/versions/node/v16.9.1/bin/node"
let g:go_auto_sameids = 1 let g:go_auto_sameids = 1
@ -108,6 +112,7 @@ let g:minimap_highlight_search = 1
let g:minimap_enable_highlight_colorgroup = 1 let g:minimap_enable_highlight_colorgroup = 1
let g:minimap_width = 10 let g:minimap_width = 10
let g:python_highlight_all = 1 let g:python_highlight_all = 1
let g:rehash256 = 1
let g:rustfmt_autosave = 1 let g:rustfmt_autosave = 1
let g:shfmt_extra_args = '-i 2' let g:shfmt_extra_args = '-i 2'
let g:shfmt_fmt_on_save = 1 let g:shfmt_fmt_on_save = 1
@ -117,7 +122,16 @@ 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"
colorscheme dracula
if exists('+termguicolors')
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
endif
"colorscheme dichromatic
"colorscheme darcula
colorscheme molokai
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
@ -131,16 +145,4 @@ function! <SID>SynStack()
echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
endfunc endfunc
" use <tab> to trigger completion and navigate to the next complete item source ~/.vimrc.coc
function! CheckBackspace() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
inoremap <silent><expr> <Tab>
\ coc#pum#visible() ? coc#pum#next(1) :
\ CheckBackspace() ? "\<Tab>" :
\ coc#refresh()
inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"

35
zshrc
View File

@ -42,14 +42,12 @@ fi
path=( path=(
$HOME/.rbenv/shims $HOME/.rbenv/shims
$HOME/.pyenv/shims
$HOME/bin $HOME/bin
$HOME/go/bin $HOME/go/bin
$HOME/.local/bin $HOME/.local/bin
$HOME/.cargo/bin $HOME/.cargo/bin
$HOME/.rbenv/bin $HOME/.rbenv/bin
$HOME/.phpenv/bin $HOME/.phpenv/bin
$HOME/.pyenv/bin
$HOME/.yarn/bin $HOME/.yarn/bin
$HOME/.pulumi/bin $HOME/.pulumi/bin
${KREW_ROOT:-$HOME/.krew}/bin ${KREW_ROOT:-$HOME/.krew}/bin
@ -97,7 +95,6 @@ plugins=(
pip pip
podman podman
postgres postgres
pyenv
python python
rails rails
rake-fast rake-fast
@ -109,7 +106,6 @@ plugins=(
symfony-complete symfony-complete
tmux tmux
vagrant vagrant
vault
vi-mode vi-mode
yarn yarn
) )
@ -133,6 +129,8 @@ export EDITOR=vim
export PYENV_ROOT="${HOME}/.pyenv" export PYENV_ROOT="${HOME}/.pyenv"
export SDKMAN_DIR="${HOME}/.sdkman" export SDKMAN_DIR="${HOME}/.sdkman"
export VISUAL=vim export VISUAL=vim
export PTD_CACHE="${HOME}/.local/ptd"
export PTD_ROOT="${HOME}/code/rstudio/ptd/infra"
# The completion for aws is not compatible with $fpath :scream_cat: # The completion for aws is not compatible with $fpath :scream_cat:
if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
@ -173,8 +171,14 @@ unsetopt correct_all
bindkey '^R' history-incremental-search-backward bindkey '^R' history-incremental-search-backward
if which pyenv >/dev/null; then if which pyenv >/dev/null; then
if [[ "${HATCH_ENV_ACTIVE}" ]]; then
: skipping pyenv when inside a hatch env
else
path=($HOME/.pyenv/shims $HOME/.pyenv/bin "${path[@]}")
plugins=("${plugins[@]}" pyenv)
eval "$(pyenv init - 2>/dev/null)" eval "$(pyenv init - 2>/dev/null)"
fi fi
fi
if which phpenv >/dev/null; then if which phpenv >/dev/null; then
eval "$(phpenv init - 2>/dev/null)" eval "$(phpenv init - 2>/dev/null)"
@ -226,6 +230,23 @@ function docker-cleanup() {
done done
} }
function ptd-completion() {
if command -v ptd &>/dev/null; then
eval "$(_PTD_COMPLETE=zsh_source ptd)"
fi
}
function mksecret() {
local nbytes="${1:-42}"
python3 <<EOPYTHON | tr -d '/' | tr -d '+' | cut -b1-$((nbytes - 1))
import secrets
import base64
print(base64.b64encode(secrets.token_bytes(${nbytes} * 2)).decode(), end="")
EOPYTHON
}
export NVM_DIR="${HOME}/.nvm" export NVM_DIR="${HOME}/.nvm"
__maybesource ~/.zshenv __maybesource ~/.zshenv
@ -265,6 +286,12 @@ fi
compdef _symfony_complete composer compdef _symfony_complete composer
compdef _symfony_complete dep compdef _symfony_complete dep
alias fz=fuzzbucket-client
if ptd --version &>/dev/null; then
ptd-completion
fi
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh