Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dotfiles/.bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ if [ -e "$HOME/.asdf" ]; then
source "$ASDF_ROOT/completions/asdf.bash"
fi

export VOLTA_HOME="$HOME/.volta"
export PATH="$VOLTA_HOME/bin:$PATH"
2 changes: 2 additions & 0 deletions dotfiles/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,5 @@ if [ -d ${z_repo} ]; then
fi

stty stop undef
export VOLTA_HOME="$HOME/.volta"
export PATH="$VOLTA_HOME/bin:$PATH"
2 changes: 2 additions & 0 deletions dotfiles/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
b = branch
[url "ssh://git@github.com/"]
insteadOf = https://github.com/
[init]
defaultBranch = main
8 changes: 8 additions & 0 deletions dotfiles/.vim/coc-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
"completeUnimported": true
},
"languageserver": {
"golang": {
"command": "gopls",
"rootPatterns": ["go.work", "go.mod", ".vim/", ".git/", ".hg/"],
"filetypes": ["go"],
"initializationOptions": {
"usePlaceholders": true
}
},
"ccls": {
"command": "ccls",
"filetypes": [
Expand Down
5 changes: 5 additions & 0 deletions dotfiles/.vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ syntax enable


call plug#begin('~/.vim/plugged')

" github copilot
Plug 'github/copilot.vim'

" nerdtree
Plug 'scrooloose/nerdtree'
Plug 'jistr/vim-nerdtree-tabs'
Expand Down Expand Up @@ -537,6 +541,7 @@ nnoremap <silent> <space>p :<C-u>CocListResume<CR>
"
" golang(coc-go) {{{
autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.organizeImport')
autocmd BufWritePre *.go :silent call CocAction('format')

autocmd FileType go nmap gtj :CocCommand go.tags.add json<cr>
autocmd FileType go nmap gty :CocCommand go.tags.add yaml<cr>
Expand Down
3 changes: 2 additions & 1 deletion dotfiles/.zsh.d/50_prompt.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ GIT_PS1_SHOWSTASHSTATE=1 # '$' something is stashed
GIT_PS1_SHOWUNTRACKEDFILES=1 # '%' untracked files

#setopt PROMPT_SUBST ; PROMPT='%F{green}%n%f %F{cyan}%~/%f%F{yellow}%B$(__git_ps1 " (%s)")%f%b %F{green}%B❯%f%F{cyan}❯%f%F{yellow}❯%b%f '
setopt PROMPT_SUBST ; PROMPT='%F{green}%n%f %F{cyan}%~/%f%F{yellow}%B $(__simple_git_ps)%f%b %F{green}%B❯%f%F{cyan}❯%f%F{yellow}❯%b%f '
#setopt PROMPT_SUBST ; PROMPT='%F{green}%n%f %F{cyan}%~/%f%F{yellow}%B $(__simple_git_ps)%f%b %F{green}%B❯%f%F{cyan}❯%f%F{yellow}❯%b%f '
setopt PROMPT_SUBST ; PROMPT='%F{green}jacksyo%f %F{cyan}%~/%f%F{yellow}%B $(__simple_git_ps)%f%b %F{green}%B❯%f%F{cyan}❯%f%F{yellow}❯%b%f '
4 changes: 4 additions & 0 deletions dotfiles/.zsh/.zcompcache/brew_all_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
list=( ${(Q)"${(z)$(<<\EO:list
'aspell-dictionaries' 'bundle' 'determine-rebottle-runners' 'postgresql-upgrade-database' 'services'
EO:list
)}"} )
4 changes: 4 additions & 0 deletions dotfiles/.zsh/.zcompcache/brew_casks

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dotfiles/.zsh/.zcompcache/brew_formulae

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dotfiles/.zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ fi
#if (which zprof > /dev/null 2>&1) ;then
# zprof
#fi
export VOLTA_HOME="$HOME/.volta"
export PATH="$VOLTA_HOME/bin:$PATH"