Compare commits
58 Commits
f00481bb64
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a895613e82 | ||
|
|
fac569a00e | ||
|
|
7f3bbd258b | ||
|
|
b16a15c462 | ||
|
|
6e23c39455 | ||
|
|
5152a44c2f | ||
|
|
c14ab125e8 | ||
|
|
62740fc09c | ||
| 250829f48c | |||
|
|
e4c53e50ba | ||
| fc71f25353 | |||
| 55fd6112e1 | |||
|
|
5f5ee008a2 | ||
| 34f2ba05b0 | |||
| d8bcad9c4e | |||
| 4cb7ea4be5 | |||
|
|
ba35d8ad3f | ||
|
|
412c9a640a | ||
|
|
5d7322bb44 | ||
|
|
fdb51ee6fa | ||
|
|
8aa021c323 | ||
|
|
2959ff5a89 | ||
|
|
7aa25bd5f5 | ||
|
|
ad3312af31 | ||
|
|
a7b4cb4312 | ||
|
|
8f32bb0387 | ||
|
|
73eb70e600 | ||
|
|
1f5ae260bb | ||
|
|
9fd0a3342f | ||
|
|
129717b4bd | ||
|
|
a6f60b5ae9 | ||
|
|
26a5aeca74 | ||
|
|
6e66bee022 | ||
|
|
5bc6a329c2 | ||
|
|
a419c83059 | ||
|
|
ea34eba5a2 | ||
|
|
a67e641e97 | ||
|
|
abcb39e1e4 | ||
|
|
a08d23f4d4 | ||
|
|
13298de434 | ||
|
|
9f32a4a3a6 | ||
|
|
221dfa5cc8 | ||
|
|
090e34ed00 | ||
|
|
84c6b724d8 | ||
|
|
43db0c2363 | ||
|
|
bfd1592573 | ||
|
|
6ca2afb18c | ||
|
|
ddfa1c30d7 | ||
|
|
9ea4c0cf31 | ||
|
|
4f48e02654 | ||
|
|
895f0ee8c6 | ||
|
|
8dc0427829 | ||
|
|
aff63e4512 | ||
|
|
2d58ac6583 | ||
|
|
7d600106e1 | ||
|
|
d467346882 | ||
|
|
f1d06cc0c7 | ||
|
|
ef74452d14 |
15
.bashrc
15
.bashrc
@@ -8,9 +8,9 @@ alias ccat="pygmentize -g"
|
||||
alias cd..="cd .."
|
||||
alias cd...="cd ../.."
|
||||
alias cls="clear"
|
||||
alias cutl="cut -c -\$(tput cols)"
|
||||
alias d="dir"
|
||||
alias dir="ls -l"
|
||||
alias f="finger"
|
||||
alias g="grep --color=auto"
|
||||
alias gph="git push -v --follow-tags"
|
||||
alias gpl="git pull -v --all --autostash --rebase --recurse-submodules"
|
||||
@@ -22,12 +22,19 @@ alias md="mkdir"
|
||||
alias more="most"
|
||||
alias myip="curl -s https://httpbin.org/ip | jq .origin"
|
||||
alias o="xdg-open"
|
||||
alias psa="ps awx"
|
||||
alias psm="ps -O rss,vsz -U $USER"
|
||||
alias psa="ps auwwx"
|
||||
alias psm="ps -O rss,vsz -U $USER -ww"
|
||||
alias psr="psu root"
|
||||
alias psu="ps -U"
|
||||
alias psu="ps -ww -U"
|
||||
alias s="screen"
|
||||
alias udac="sudo apt update; sudo apt dist-upgrade -y; sudo apt autoremove -y; sudo apt clean"
|
||||
#
|
||||
if command -v hpnssh > /dev/null; then
|
||||
alias ssh="hpnssh -C -e none"
|
||||
complete -F _ssh hpnssh
|
||||
else
|
||||
alias ssh="ssh -C -e none"
|
||||
fi
|
||||
#
|
||||
if [[ -x /opt/local/bin/gtelnet ]]; then
|
||||
alias "t=gtelnet"
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
#
|
||||
alias c0=claude
|
||||
alias c1="CLAUDE_CONFIG_DIR=~/.claude-c1 claude"
|
||||
alias update="(cd ~/git; make all)"
|
||||
#
|
||||
[[ -s /usr/share/doc/fzf/examples/completion.bash ]] && source /usr/share/doc/fzf/examples/completion.bash
|
||||
@@ -7,3 +9,8 @@ alias update="(cd ~/git; make all)"
|
||||
if command -v mise > /dev/null; then
|
||||
eval "$(mise activate bash)"
|
||||
fi
|
||||
#
|
||||
# Composer
|
||||
if [[ -e "${HOME}/.config/composer/vendor/bin" ]]; then
|
||||
export PATH="${HOME}/.config/composer/vendor/bin:${PATH}"
|
||||
fi
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
[core]
|
||||
preloadindex = yes
|
||||
[diff]
|
||||
algorithm = minimal
|
||||
algorithm = histogram
|
||||
[diff "sqlite3"]
|
||||
binary = true
|
||||
textconv = "echo '.dbconfig trusted_schema no\n.dump' | sqlite3"
|
||||
@@ -36,6 +36,8 @@
|
||||
enabled = true
|
||||
[submodule]
|
||||
recursive = true
|
||||
[tag]
|
||||
sort = version:refname
|
||||
[user]
|
||||
useConfigOnly = true
|
||||
#
|
||||
|
||||
@@ -3,6 +3,11 @@ bind-key C-a send-prefix
|
||||
set -g prefix C-a
|
||||
unbind C-b
|
||||
#
|
||||
unbind-key -T root M-Left
|
||||
unbind-key -T root M-Right
|
||||
#
|
||||
bind-key -n C-Enter send-keys "\e[13;5u"
|
||||
#
|
||||
set-option -g status-bg colour27
|
||||
set-option -g status-fg white
|
||||
set-option -g window-status-current-style bg=colour28
|
||||
|
||||
9
.vim/vim-ai/roles.ini
Normal file
9
.vim/vim-ai/roles.ini
Normal file
@@ -0,0 +1,9 @@
|
||||
[default]
|
||||
options.model = o4-mini
|
||||
options.temperature = 1
|
||||
|
||||
[gpt-4.1]
|
||||
options.model = gpt-4.1
|
||||
|
||||
[gpt-4.1-mini]
|
||||
options.model = gpt-4.1-mini
|
||||
33
.vim/vimrc
33
.vim/vimrc
@@ -13,7 +13,7 @@ set incsearch
|
||||
set laststatus=2
|
||||
set lazyredraw
|
||||
set list
|
||||
set listchars=tab:▷\ ,trail:·
|
||||
set listchars=tab:»\ ,trail:·
|
||||
set mouse=
|
||||
set nobomb
|
||||
set nocompatible
|
||||
@@ -25,6 +25,9 @@ set shiftwidth=4
|
||||
set showmatch
|
||||
set smartcase
|
||||
set t_Co=256
|
||||
if !has('nvim')
|
||||
set ttymouse=
|
||||
endif
|
||||
set visualbell
|
||||
set wrap
|
||||
set wildmenu
|
||||
@@ -36,13 +39,14 @@ let g:DisableAutoPHPFolding = 1
|
||||
let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
|
||||
let g:indent_guides_auto_colors = 0
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
let g:llama_config = {'keymap_accept_full':'<Right>','n_predict':256}
|
||||
autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=8
|
||||
autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd ctermbg=236
|
||||
"
|
||||
" mapping
|
||||
cnoremap <expr> <Down> pumvisible() ? "\<C-n>" : "\<Down>"
|
||||
cnoremap <expr> <Up> pumvisible() ? "\<C-p>" : "\<Up>"
|
||||
map <C-c> :call plug#load('copilot.vim')<CR>:Copilot enable<CR>
|
||||
map <C-c> :LlamaToggle<CR>
|
||||
nmap <Esc>[Z <C-w>W
|
||||
nmap <F8> :TagbarToggle<CR>
|
||||
nmap <Tab> <C-w>w
|
||||
@@ -56,6 +60,12 @@ filetype off
|
||||
let g:lightline = {'component':{'lineinfo':'%3l:%-2v'}}
|
||||
let g:polyglot_disabled = ["autoindent", "sensible"]
|
||||
let g:snipMate = {'snippet_version': 1}
|
||||
let g:vim_ai_roles_config_file = '~/.vim/vim-ai/roles.ini'
|
||||
"
|
||||
" Local
|
||||
if filereadable(expand("~/.vim/vimrc-preplug.local"))
|
||||
source ~/.vim/vimrc-preplug.local
|
||||
endif
|
||||
"
|
||||
call plug#begin('~/.vim/plugged')
|
||||
Plug 'DataWraith/auto_mkdir'
|
||||
@@ -64,29 +74,33 @@ Plug 'bonsaiben/bootstrap-snippets'
|
||||
Plug 'ctrlpvim/ctrlp.vim'
|
||||
Plug 'editorconfig/editorconfig-vim'
|
||||
Plug 'garbas/vim-snipmate'
|
||||
Plug 'github/copilot.vim', { 'on': [] }
|
||||
Plug 'godlygeek/csapprox'
|
||||
Plug 'honza/vim-snippets'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug 'luochen1990/rainbow'
|
||||
Plug 'joshdick/onedark.vim'
|
||||
Plug 'majutsushi/tagbar'
|
||||
Plug 'motus/pig.vim'
|
||||
Plug 'phha/zenburn.nvim'
|
||||
Plug 'preservim/vim-indent-guides'
|
||||
Plug 'scrooloose/nerdtree'
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
Plug 'terryma/vim-expand-region'
|
||||
Plug 'tomasr/molokai'
|
||||
Plug 'tomtom/tlib_vim'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'wuelnerdotexe/vim-astro'
|
||||
if v:version >= 901 || has('nvim-0.8.0')
|
||||
Plug 'ggml-org/llama.vim'
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
endif
|
||||
if has('python3')
|
||||
Plug 'madox2/vim-ai'
|
||||
endif
|
||||
call plug#end()
|
||||
"
|
||||
" color schema
|
||||
set background=dark
|
||||
colo zenburn
|
||||
highlight Search cterm=none ctermbg=blue
|
||||
colo slate
|
||||
"
|
||||
" syntax
|
||||
syntax on
|
||||
@@ -110,11 +124,10 @@ au BufNewFile,BufRead Makefile set noexpandtab
|
||||
au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|else|exe "norm $"|endif|endif
|
||||
au FileType css,dart,html,javascript,javascriptreact,json,ruby,typescript,typescriptreact,yaml set shiftwidth=2
|
||||
au FileType go set noexpandtab shiftwidth=4 tabstop=4
|
||||
autocmd BufEnter * silent! lcd %:p:h
|
||||
autocmd BufReadPost COMMIT_EDITMSG exe "normal! gg"
|
||||
map <C-n> :NERDTreeToggle<CR>
|
||||
"
|
||||
" Local
|
||||
if filereadable("~/.vim/vimrc.local")
|
||||
source ~/.vim/vimrc.local
|
||||
if filereadable(expand("~/.vim/vimrc-post.local"))
|
||||
source ~/.vim/vimrc-post.local
|
||||
endif
|
||||
|
||||
20
.wezterm.lua
20
.wezterm.lua
@@ -6,12 +6,25 @@ local config = wezterm.config_builder()
|
||||
|
||||
config.check_for_updates = false
|
||||
config.color_scheme = 'Tango (terminal.sexy)'
|
||||
config.enable_csi_u_key_encoding = true
|
||||
config.font = wezterm.font_with_fallback({'Cousine', 'Noto Color Emoji', 'Noto Sans CJK JP'})
|
||||
config.font_size = 18.0
|
||||
config.hide_mouse_cursor_when_typing = false
|
||||
config.initial_cols = 132
|
||||
config.initial_rows = 43
|
||||
config.line_height = 1.0
|
||||
config.keys = {
|
||||
{
|
||||
key = 'Enter',
|
||||
mods = 'CTRL',
|
||||
action = act.SendString '\x1b[13;5u',
|
||||
},
|
||||
{
|
||||
key = 'Insert',
|
||||
mods = 'SHIFT',
|
||||
action = act.PasteFrom 'Clipboard',
|
||||
},
|
||||
}
|
||||
config.mouse_bindings = {
|
||||
{
|
||||
event = {Up = {streak = 1, button = 'Left'}},
|
||||
@@ -27,7 +40,12 @@ config.mouse_bindings = {
|
||||
event = {Up = {streak = 1, button = 'Middle'}},
|
||||
mods = 'NONE',
|
||||
action = act.OpenLinkAtMouseCursor,
|
||||
}
|
||||
},
|
||||
{
|
||||
event = {Up = {streak = 1, button = 'Right'}},
|
||||
mods = 'NONE',
|
||||
action = act.PasteFrom 'Clipboard',
|
||||
},
|
||||
}
|
||||
config.selection_word_boundary = " \t\n{}[]()<>\"'`"
|
||||
config.window_padding = {
|
||||
|
||||
21
.zshrc
21
.zshrc
@@ -2,15 +2,18 @@
|
||||
umask 022
|
||||
cd "$HOME"
|
||||
#
|
||||
autoload -Uz compinit
|
||||
compinit
|
||||
#
|
||||
alias "SYNC=sync;sync;sync"
|
||||
alias "c=clear"
|
||||
alias "ccat=pygmentize -g"
|
||||
alias "cd..=cd .."
|
||||
alias "cd...=cd ../.."
|
||||
alias "cls=clear"
|
||||
alias "cutl=cut -c -$(tput cols)"
|
||||
alias "d=ls -l"
|
||||
alias "dir=ls -l"
|
||||
alias "f=finger"
|
||||
alias "g=grep --color=auto"
|
||||
alias "gph=git push -v --follow-tags"
|
||||
alias "gpl=git pull -v --all --autostash --rebase --recurse-submodules"
|
||||
@@ -20,12 +23,19 @@ alias "lo=logout"
|
||||
alias "m=more"
|
||||
alias "more=most"
|
||||
alias "myip=curl -s https://httpbin.org/ip | jq .origin"
|
||||
alias "psa=ps aux"
|
||||
alias "psm=ps -O rss,vsz -U $USER"
|
||||
alias "psa=ps auwwx"
|
||||
alias "psm=ps -O rss,vsz -U $USER -ww"
|
||||
alias "psr=psu root"
|
||||
alias "psu=ps -U"
|
||||
alias "psu=ps -ww -U"
|
||||
alias "s=screen"
|
||||
alias "udac=sudo apt update; sudo apt dist-upgrade -y; sudo apt autoremove -y; sudo apt clean"
|
||||
#
|
||||
if command -v hpnssh > /dev/null; then
|
||||
alias "ssh=hpnssh -C -e none"
|
||||
compdef hpnssh=ssh
|
||||
else
|
||||
alias "ssh=ssh -C -e none"
|
||||
fi
|
||||
#
|
||||
if [[ -x /opt/local/bin/gtelnet ]]; then
|
||||
alias "t=gtelnet"
|
||||
@@ -170,6 +180,7 @@ setopt prompt_subst
|
||||
#
|
||||
zstyle ':completion:*' menu select
|
||||
#
|
||||
[[ -s "$HOME/git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && . "$HOME/git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]]
|
||||
[[ -s "$HOME/git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && . "$HOME/git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
|
||||
[[ -s "$HOME/git/zsh-autosuggestions/zsh-autosuggestions.zsh" ]] && . "$HOME/git/zsh-autosuggestions/zsh-autosuggestions.zsh"
|
||||
#
|
||||
[[ -s "$HOME/.zshrc.local" ]] && . "$HOME/.zshrc.local"
|
||||
|
||||
11
.zshrc.local
11
.zshrc.local
@@ -1,11 +1,20 @@
|
||||
#
|
||||
autoload -Uz compinit
|
||||
if ! whence compinit >/dev/null; then
|
||||
autoload -Uz compinit && compinit
|
||||
compinit
|
||||
fi
|
||||
[[ -s /usr/share/doc/fzf/examples/completion.zsh ]] && source /usr/share/doc/fzf/examples/completion.zsh
|
||||
[[ -s /usr/share/doc/fzf/examples/key-bindings.zsh ]] && source /usr/share/doc/fzf/examples/key-bindings.zsh
|
||||
#
|
||||
alias "c0=claude"
|
||||
alias "c1=CLAUDE_CONFIG_DIR=~/.claude-c1 claude"
|
||||
alias "update=(cd ~/git; make all)"
|
||||
#
|
||||
if command -v mise > /dev/null; then
|
||||
eval "$(mise activate zsh)"
|
||||
fi
|
||||
#
|
||||
# Composer
|
||||
if [[ -e "${HOME}/.config/composer/vendor/bin" ]]; then
|
||||
export PATH="${HOME}/.config/composer/vendor/bin:${PATH}"
|
||||
fi
|
||||
|
||||
14
install.sh
14
install.sh
@@ -36,17 +36,22 @@ if [ ! -e ~/.gitconfig.local ]; then
|
||||
cp ${BASEDIR}/.gitconfig.local ~/
|
||||
fi
|
||||
|
||||
#
|
||||
if [ ! -e ~/.npmrc ]; then
|
||||
cp ${BASEDIR}/.npmrc ~/
|
||||
fi
|
||||
|
||||
#
|
||||
cp ${BASEDIR}/.gdbinit ~/
|
||||
|
||||
#
|
||||
cp ${BASEDIR}/.wgetrc ~/
|
||||
cp ${BASEDIR}/.psqlrc ~/
|
||||
|
||||
#
|
||||
cp ${BASEDIR}/.sqliterc ~/
|
||||
|
||||
#
|
||||
cp ${BASEDIR}/.psqlrc ~/
|
||||
cp ${BASEDIR}/.wgetrc ~/
|
||||
|
||||
# nvim
|
||||
mkdir -p ~/.config || true
|
||||
@@ -56,7 +61,12 @@ ln -fs ../.vim ~/.config/nvim
|
||||
mkdir -p ~/.vim/ || true
|
||||
rsync -a ${BASEDIR}/.vim/ ~/.vim/
|
||||
chmod 700 ~/.vim/
|
||||
|
||||
if command -v nvim > /dev/null; then
|
||||
nvim +PlugUpdate +PlugClean\! +q +q
|
||||
else
|
||||
vim +PlugUpdate +PlugClean\! +q +q
|
||||
fi
|
||||
#
|
||||
diff -ruN --color .bashrc.local ~/.bashrc.local
|
||||
diff -ruN --color .zshrc.local ~/.zshrc.local
|
||||
|
||||
Reference in New Issue
Block a user