diff --git a/.local/bin/git-ci b/.local/bin/git-ci deleted file mode 100755 index d8b30e0..0000000 --- a/.local/bin/git-ci +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ]; then - git commit -v -else - if [ "$1" = "--amend" ]; then - git commit -v --amend - else - git commit -m "$*" - fi -fi diff --git a/.local/bin/git-ci b/.local/bin/git-ci new file mode 120000 index 0000000..d5642e8 --- /dev/null +++ b/.local/bin/git-ci @@ -0,0 +1 @@ +/Users/syui/dotfiles/.local/bin/git-ci \ No newline at end of file diff --git a/.local/bin/git-orphan b/.local/bin/git-orphan deleted file mode 100755 index baf78ed..0000000 --- a/.local/bin/git-orphan +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -git checkout --orphan temp -git add -A -git commit -m "init" -git branch -D main -git branch -m temp main -git push -f origin main diff --git a/.local/bin/git-orphan b/.local/bin/git-orphan new file mode 120000 index 0000000..7135546 --- /dev/null +++ b/.local/bin/git-orphan @@ -0,0 +1 @@ +/Users/syui/dotfiles/.local/bin/git-orphan \ No newline at end of file diff --git a/.local/bin/vren b/.local/bin/vren deleted file mode 100755 index 1667280..0000000 --- a/.local/bin/vren +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/zsh -# vren - rename files with vim -# usage: vren [dir] - -dir="${1:-.}" -cd "$dir" || exit 1 - -# git init if no .git -has_git=0 -if [ -d .git ]; then - has_git=1 -else - git init -q - git add -A - git commit -q -m "before rename" -fi - -# list files -old=$(mktemp) -new=$(mktemp) -ls -1 > "$old" -cp "$old" "$new" - -# edit -vim "$new" - -# check -old_count=$(wc -l < "$old") -new_count=$(wc -l < "$new") -if [ "$old_count" -ne "$new_count" ]; then - echo "error: line count mismatch ($old_count -> $new_count)" - rm "$old" "$new" - exit 1 -fi - -# diff -changes=0 -paste "$old" "$new" | while IFS=$'\t' read -r o n; do - [ "$o" != "$n" ] && echo " $o -> $n" && changes=$((changes+1)) -done - -if ! diff -q "$old" "$new" >/dev/null 2>&1; then - echo "" - printf "apply? (y/n): " - read -q ans - echo "" - if [ "$ans" = "y" ]; then - paste "$old" "$new" | while IFS=$'\t' read -r o n; do - [ "$o" != "$n" ] && mv -- "$o" "$n" - done - echo "done" - # restore point - if [ "$has_git" -eq 0 ]; then - git add -A - git commit -q -m "after rename" - echo "restore: git log / git checkout HEAD~1 -- ." - fi - else - echo "cancelled" - fi -else - echo "no changes" -fi - -rm "$old" "$new" diff --git a/.local/bin/vren b/.local/bin/vren new file mode 120000 index 0000000..4877c80 --- /dev/null +++ b/.local/bin/vren @@ -0,0 +1 @@ +/Users/syui/dotfiles/.local/bin/vren \ No newline at end of file diff --git a/.vimrc b/.vimrc index c9a0649..3ef1e99 100644 --- a/.vimrc +++ b/.vimrc @@ -33,10 +33,6 @@ inoremap nnoremap Q :q! vnoremap v V -call plug#begin('~/.vim/plugged') -Plug 'github/copilot.vim' -call plug#end() - syntax on filetype plugin indent on au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif diff --git a/install.zsh b/install.zsh index 82d20f8..ed75aaf 100755 --- a/install.zsh +++ b/install.zsh @@ -56,13 +56,11 @@ done # create vim undo dir mkdir -p "$HOME/.vim/undo" -# install vim-plug -if [ ! -f "$HOME/.vim/autoload/plug.vim" ]; then - curl -fLo "$HOME/.vim/autoload/plug.vim" --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - echo "vim-plug: installed" - vim +PlugInstall +qall 2>/dev/null - echo "vim plugins: installed" +# install copilot.vim +copilot_dir="$HOME/.vim/pack/github/start/copilot.vim" +if [ ! -d "$copilot_dir" ]; then + git clone https://github.com/github/copilot.vim.git "$copilot_dir" 2>/dev/null + echo "copilot.vim: installed" fi # install font