diff --git a/_gitconfig b/_gitconfig index 04d59b4..38b3741 100644 --- a/_gitconfig +++ b/_gitconfig @@ -4,7 +4,6 @@ email = eddyxu@gmail.com [alias] st = status - rb = svn rebase ci = commit -a co = checkout di = diff diff --git a/vim/_vimrc b/vim/_vimrc index b9f1bc7..fb5661c 100644 --- a/vim/_vimrc +++ b/vim/_vimrc @@ -14,7 +14,7 @@ Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' " General settings -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' Plug 'scrooloose/nerdtree' Plug 'mileszs/ack.vim' @@ -26,12 +26,15 @@ Plug 'liuchengxu/vista.vim' Plug 'AndrewRadev/splitjoin.vim' Plug 'Chiel92/vim-autoformat' Plug 'w0rp/ale' +Plug 'neovim/nvim-lspconfig' " Go Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } " Rust Plug 'rust-lang/rust.vim' +Plug 'simrat39/rust-tools.nvim' + " Docker Plug 'ekalinin/Dockerfile.vim' @@ -184,4 +187,4 @@ endif """ Vista let g:vista_default_executive = 'ctags' -uap :Vista!! +map :Vista!! diff --git a/vim/syntax/proto.vim b/vim/syntax/proto.vim deleted file mode 100644 index 2a25fa6..0000000 --- a/vim/syntax/proto.vim +++ /dev/null @@ -1,105 +0,0 @@ -" Protocol Buffers - Google's data interchange format -" Copyright 2008 Google Inc. All rights reserved. -" http://code.google.com/p/protobuf/ -" -" Redistribution and use in source and binary forms, with or without -" modification, are permitted provided that the following conditions are -" met: -" -" * Redistributions of source code must retain the above copyright -" notice, this list of conditions and the following disclaimer. -" * Redistributions in binary form must reproduce the above -" copyright notice, this list of conditions and the following disclaimer -" in the documentation and/or other materials provided with the -" distribution. -" * Neither the name of Google Inc. nor the names of its -" contributors may be used to endorse or promote products derived from -" this software without specific prior written permission. -" -" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -" This is the Vim syntax file for Google Protocol Buffers. -" -" Usage: -" -" 1. cp proto.vim ~/.vim/syntax/ -" 2. Add the following to ~/.vimrc: -" -" augroup filetype -" au! BufRead,BufNewFile *.proto setfiletype proto -" augroup end -" -" Or just create a new file called ~/.vim/ftdetect/proto.vim with the -" previous lines on it. - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syn case match - -syn keyword pbTodo contained TODO FIXME XXX -syn cluster pbCommentGrp contains=pbTodo - -syn keyword pbSyntax syntax import option -syn keyword pbStructure package message group -syn keyword pbRepeat optional required repeated -syn keyword pbDefault default -syn keyword pbExtend extend extensions to max -syn keyword pbRPC service rpc returns - -syn keyword pbType int32 int64 uint32 uint64 sint32 sint64 -syn keyword pbType fixed32 fixed64 sfixed32 sfixed64 -syn keyword pbType float double bool string bytes -syn keyword pbTypedef enum -syn keyword pbBool true false - -syn match pbInt /-\?\<\d\+\>/ -syn match pbInt /\<0[xX]\x+\>/ -syn match pbFloat /\<-\?\d*\(\.\d*\)\?/ -syn region pbComment start="\/\*" end="\*\/" contains=@pbCommentGrp -syn region pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp -syn region pbString start=/"/ skip=/\\./ end=/"/ -syn region pbString start=/'/ skip=/\\./ end=/'/ - -if version >= 508 || !exists("did_proto_syn_inits") - if version < 508 - let did_proto_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink pbTodo Todo - - HiLink pbSyntax Include - HiLink pbStructure Structure - HiLink pbRepeat Repeat - HiLink pbDefault Keyword - HiLink pbExtend Keyword - HiLink pbRPC Keyword - HiLink pbType Type - HiLink pbTypedef Typedef - HiLink pbBool Boolean - - HiLink pbInt Number - HiLink pbFloat Float - HiLink pbComment Comment - HiLink pbString String - - delcommand HiLink -endif - -let b:current_syntax = "proto" diff --git a/vim/syntax/thrift.vim b/vim/syntax/thrift.vim deleted file mode 100644 index 79ce547..0000000 --- a/vim/syntax/thrift.vim +++ /dev/null @@ -1,91 +0,0 @@ -" Vim syntax file -" Language: Thrift -" Maintainer: Martin Smith -" Last Change: $Date: $ -" Copy to ~/.vim/ -" Add to ~/.vimrc -" au BufRead,BufNewFile *.thrift set filetype=thrift -" au! Syntax thrift source ~/.vim/thrift.vim -" -" $Id: $ -" -" Licensed to the Apache Software Foundation (ASF) under one -" or more contributor license agreements. See the NOTICE file -" distributed with this work for additional information -" regarding copyright ownership. The ASF licenses this file -" to you under the Apache License, Version 2.0 (the -" "License"); you may not use this file except in compliance -" with the License. You may obtain a copy of the License at -" -" http://www.apache.org/licenses/LICENSE-2.0 -" -" Unless required by applicable law or agreed to in writing, -" software distributed under the License is distributed on an -" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -" KIND, either express or implied. See the License for the -" specific language governing permissions and limitations -" under the License. -" - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Todo -syn keyword thriftTodo TODO todo FIXME fixme XXX xxx contained - -" Comments -syn match thriftComment "#.*" contains=thriftTodo -syn region thriftComment start="/\*" end="\*/" contains=thriftTodo -syn match thriftComment "//.\{-}\(?>\|$\)\@=" - -" String -syn region thriftStringDouble matchgroup=None start=+"+ end=+"+ - -" Number -syn match thriftNumber "-\=\<\d\+\>" contained - -" Keywords -syn keyword thriftKeyword namespace -syn keyword thriftKeyword xsd_all xsd_optional xsd_nillable xsd_attrs -syn keyword thriftKeyword include cpp_include cpp_type const optional required -syn keyword thriftBasicTypes void bool byte i16 i32 i64 double string binary -syn keyword thriftStructure map list set struct typedef exception enum throws - -" Special -syn match thriftSpecial "\d\+:" - -" Structure -syn keyword thriftStructure service oneway extends -"async" { return tok_async; } -"exception" { return tok_xception; } -"extends" { return tok_extends; } -"throws" { return tok_throws; } -"service" { return tok_service; } -"enum" { return tok_enum; } -"const" { return tok_const; } - -if version >= 508 || !exists("did_thrift_syn_inits") - if version < 508 - let did_thrift_syn_inits = 1 - command! -nargs=+ HiLink hi link - else - command! -nargs=+ HiLink hi def link - endif - - HiLink thriftComment Comment - HiLink thriftKeyword Special - HiLink thriftBasicTypes Type - HiLink thriftStructure StorageClass - HiLink thriftTodo Todo - HiLink thriftString String - HiLink thriftNumber Number - HiLink thriftSpecial Special - HiLink thriftStructure Structure - - delcommand HiLink -endif - -let b:current_syntax = "thrift"