diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/csdn_markdown.md b/csdn_markdown.md old mode 100755 new mode 100644 diff --git a/esp/build_code_with_micropython.md b/esp/build_code_with_micropython.md old mode 100755 new mode 100644 diff --git a/esp/emqtt.md b/esp/emqtt.md old mode 100755 new mode 100644 diff --git a/esp/http b/esp/http old mode 100755 new mode 100644 diff --git a/gfw/shadowsockes.md b/gfw/shadowsockes.md old mode 100755 new mode 100644 diff --git a/git/change_repo.md b/git/change_repo.md old mode 100755 new mode 100644 diff --git a/git/gitlab_nginx.md b/git/gitlab_nginx.md old mode 100755 new mode 100644 diff --git a/git/install_git.md b/git/install_git.md old mode 100755 new mode 100644 diff --git a/git/install_gitlab.md b/git/install_gitlab.md old mode 100755 new mode 100644 diff --git a/git/ssh_key.md b/git/ssh_key.md old mode 100755 new mode 100644 diff --git a/go/安装go1.4.md b/go/安装go1.4.md old mode 100755 new mode 100644 diff --git a/light.md b/light.md old mode 100755 new mode 100644 diff --git a/markdown/add image.md b/markdown/add image.md old mode 100755 new mode 100644 diff --git a/markdown/csdn_markdown.md b/markdown/csdn_markdown.md old mode 100755 new mode 100644 diff --git a/mongodb/auth.md b/mongodb/auth.md old mode 100755 new mode 100644 diff --git a/mongodb/use.md b/mongodb/use.md old mode 100755 new mode 100644 diff --git a/ngrok/ngrok.md b/ngrok/ngrok.md old mode 100755 new mode 100644 diff --git a/nodejs/install.md b/nodejs/install.md old mode 100755 new mode 100644 diff --git a/openstack/apt_download.sh b/openstack/apt_download.sh old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/cinder/api-paste.ini b/openstack/openstack_conf/compute/cinder/api-paste.ini old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/cinder/cinder.conf b/openstack/openstack_conf/compute/cinder/cinder.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/cinder/logging.conf b/openstack/openstack_conf/compute/cinder/logging.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/cinder/rootwrap.conf b/openstack/openstack_conf/compute/cinder/rootwrap.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/cinder/rootwrap.d/volume.filters b/openstack/openstack_conf/compute/cinder/rootwrap.d/volume.filters old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/neutron/neutron.conf b/openstack/openstack_conf/compute/neutron/neutron.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/api-paste.ini b/openstack/openstack_conf/compute/nova/api-paste.ini old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/logging.conf b/openstack/openstack_conf/compute/nova/logging.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/nova-compute.conf b/openstack/openstack_conf/compute/nova/nova-compute.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/nova.conf b/openstack/openstack_conf/compute/nova/nova.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/rootwrap.conf b/openstack/openstack_conf/compute/nova/rootwrap.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/compute/nova/rootwrap.d/compute.filters b/openstack/openstack_conf/compute/nova/rootwrap.d/compute.filters old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/keystone/credential-keys/0 b/openstack/openstack_conf/controller/keystone/credential-keys/0 old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/keystone/credential-keys/1 b/openstack/openstack_conf/controller/keystone/credential-keys/1 old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/keystone/fernet-keys/0 b/openstack/openstack_conf/controller/keystone/fernet-keys/0 old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/keystone/fernet-keys/1 b/openstack/openstack_conf/controller/keystone/fernet-keys/1 old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/neutron/neutron.conf b/openstack/openstack_conf/controller/neutron/neutron.conf old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/nova/api-paste.ini b/openstack/openstack_conf/controller/nova/api-paste.ini old mode 100755 new mode 100644 diff --git a/openstack/openstack_conf/controller/nova/nova.conf b/openstack/openstack_conf/controller/nova/nova.conf old mode 100755 new mode 100644 diff --git a/python/ReformFileName.py b/python/ReformFileName.py old mode 100755 new mode 100644 diff --git a/python/command.md b/python/command.md old mode 100755 new mode 100644 diff --git a/python/pyqt.md b/python/pyqt.md old mode 100755 new mode 100644 diff --git a/python/uncompyle2.md b/python/uncompyle2.md old mode 100755 new mode 100644 diff --git a/python/virtualenv.md b/python/virtualenv.md old mode 100755 new mode 100644 diff --git a/rabbitmq/install.md b/rabbitmq/install.md old mode 100755 new mode 100644 diff --git a/raspberry/main.md b/raspberry/main.md old mode 100755 new mode 100644 diff --git a/raspberry/router.md b/raspberry/router.md old mode 100755 new mode 100644 diff --git a/raspberry/sound.md b/raspberry/sound.md old mode 100755 new mode 100644 diff --git a/raspberry/wifi.md b/raspberry/wifi.md old mode 100755 new mode 100644 diff --git a/redis/配置.md b/redis/配置.md old mode 100755 new mode 100644 diff --git a/static/img/iptables_examples_network_topology.png b/static/img/iptables_examples_network_topology.png old mode 100755 new mode 100644 diff --git a/static/img/iptables_frame.png b/static/img/iptables_frame.png old mode 100755 new mode 100644 diff --git a/static/img/ssh_key.png b/static/img/ssh_key.png old mode 100755 new mode 100644 diff --git a/static/img/test.jpg b/static/img/test.jpg old mode 100755 new mode 100644 diff --git a/ubuntu/aria2.md b/ubuntu/aria2.md old mode 100755 new mode 100644 diff --git a/ubuntu/install_nginx.md b/ubuntu/install_nginx.md old mode 100755 new mode 100644 diff --git a/ubuntu/iptables.md b/ubuntu/iptables.md old mode 100755 new mode 100644 diff --git a/ubuntu/iptables设置端口转发.md b/ubuntu/iptables设置端口转发.md old mode 100755 new mode 100644 diff --git a/ubuntu/minicom.md b/ubuntu/minicom.md old mode 100755 new mode 100644 diff --git a/ubuntu/nmap.md b/ubuntu/nmap.md old mode 100755 new mode 100644 diff --git a/ubuntu/scp.md b/ubuntu/scp.md old mode 100755 new mode 100644 diff --git a/ubuntu/screen.md b/ubuntu/screen.md old mode 100755 new mode 100644 diff --git a/ubuntu/ubuntu_install_pyqt4.md b/ubuntu/ubuntu_install_pyqt4.md old mode 100755 new mode 100644 diff --git a/ubuntu/uget.md b/ubuntu/uget.md old mode 100755 new mode 100644 diff --git a/ubuntu/update-alternatives.md b/ubuntu/update-alternatives.md old mode 100755 new mode 100644 diff --git a/ubuntu/网络相关命令.md b/ubuntu/网络相关命令.md old mode 100755 new mode 100644 diff --git a/vim/vimrc b/vim/vimrc index 11b2ebf..121537b 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,5 +1,7 @@ " set the runtime path to include Vundle and initialize set rtp+=~/.fzf/ +set nocompatible +filetype off set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() @@ -7,8 +9,8 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'junegunn/fzf.vim' -nmap l :BLines -nmap L :Lines +nmap l :BLines +nmap L :Lines Plugin 'rking/ag.vim' @@ -66,34 +68,32 @@ Plugin 'https://github.com/tpope/vim-fugitive.git' Plugin 'airblade/vim-gitgutter' set updatetime=100 -Plugin 'https://github.com/plytophogy/vim-virtualenv.git' -let g:virtualenv_directory = '~/.virtualenv' +"Plugin 'https://github.com/plytophogy/vim-virtualenv.git' +"let g:virtualenv_directory = '~/.virtualenv' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' -Plugin 'suan/vim-instant-markdown' +"Plugin 'suan/vim-instant-markdown' Plugin 'Valloric/YouCompleteMe' set runtimepath+=~/.vim/bundle/YouCompleteMe autocmd InsertLeave * if pumvisible() == 0|pclose|endif "离开插入模式后自动关闭预览窗口" let g:ycm_collect_identifiers_from_tags_files = 1 " 开启 YCM基于标签引擎 -let g:ycm_collect_identifiers_from_comments_and_strings = 1 " 注释与字符串中的内容也用于补全 "let g:syntastic_ignore_files=[".*\.py$"] let g:ycm_seed_identifiers_with_syntax = 1 " 语法关键字补全 -let g:ycm_complete_in_comments = 1 let g:ycm_confirm_extra_conf = 0 " 关闭加载.ycm_extra_conf.py提示 let g:ycm_key_list_select_completion = ['', ''] " 映射按键,没有这个会拦截掉tab, 导致其他插件的tab不能用. let g:ycm_key_list_previous_completion = ['', ''] let g:ycm_complete_in_comments = 1 " 在注释输入中也能补全 let g:ycm_complete_in_strings = 1 " 在字符串输入中也能补全 let g:ycm_collect_identifiers_from_comments_and_strings = 1 " 注释和字符串中的文字也会被收入补全 -"let g:ycm_global_ycm_extra_conf='~/.vim/bundle/YouCompleteMe/third_party/ycmd/.ycm_extra_conf.py' -let g:ycm_global_ycm_extra_conf='~/.vim/.ycm_extra_conf.py' +let g:ycm_global_ycm_extra_conf='~/.vim/bundle/YouCompleteMe/third_party/ycmd/.ycm_extra_conf.py' +"let g:ycm_global_ycm_extra_conf='~/.vim/.ycm_extra_conf.py' let g:ycm_show_diagnostics_ui = 0 " 禁用语法检查 "inoremap pumvisible() ? "\" : "\" " 回车即选中当前项 nnoremap :YcmCompleter GoToDefinitionElseDeclaration " 跳转到定义处 -let g:ycm_min_num_of_chars_for_completion=2 +let g:ycm_min_num_of_chars_for_completion=2 "python auto complete plugin Bundle 'davidhalter/jedi-vim' @@ -109,6 +109,12 @@ let g:closetag_filenames = '*.html,*.xhtml,*.phtml,*.launch' Plugin 'jiangmiao/auto-pairs' +Plugin 'Chiel92/vim-autoformat' +noremap :Autoformat:w +let g:autoformat_verbosemode=1 + + + Plugin 'vim-airline/vim-airline' Plugin 'vim-airline-themes' let g:airline_theme='bubblegum' @@ -143,26 +149,26 @@ map 8 :b 8 map 9 :b 9 map q :bwipeout -nmap J 5j -nmap K 5k -nmap H 5h -nmap L 5l +nmap J 5j +nmap K 5k +nmap H 5h +nmap L 5l -nnoremap h -nnoremap l -nnoremap j -nnoremap k +nnoremap h +nnoremap l +nnoremap j +nnoremap k -" ctags 配置 +" ctags 配置 map :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags . imap :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags . set tags=tags set tags+=.tags set tags+=./.tags "set tags+=~/.vim/systags -"set tags = +"set tags = Plugin 'https://github.com/majutsushi/tagbar.git' "ctags 配置:F3快捷键显示程序中的各种tags，包括变量和函数等。 @@ -173,7 +179,7 @@ Plugin 'The-NERD-tree' let NERDTreeIgnore=['\.pyc','\~$','\.swp'] "NERDTree 配置:F2快捷键显示当前目录树 map :NERDTreeToggle -let NERDTreeWinSize=25 +let NERDTreeWinSize=25 Plugin 'tiagofumo/vim-nerdtree-syntax-highlight' Plugin 'Xuyuanp/nerdtree-git-plugin' "Plugin 'ryanoasis/vim-devicons' @@ -221,7 +227,7 @@ func! CompileRunGcc() exec '!g++ % -o %<' exec '!time ./%<' elseif &filetype == 'cpp' - exec '!g++ % -o %<' + exec '!g++ % -o %< -lboost_system' exec '!time ./%<' elseif &filetype == 'python' exec '!time python %' @@ -276,9 +282,9 @@ set nobackup set noswapfile "搜索忽略大小写 set ignorecase -" 搜索时忽略大小写，但在有一个或以上大写字母时仍大小写敏感 -set ignorecase -set smartcase +" 搜索时忽略大小写，但在有一个或以上大写字母时仍大小写敏感 +set ignorecase +set smartcase "搜索逐字符高亮 @@ -324,9 +330,9 @@ map mc :set mouse=c:set nu!:set paste set mouse=a " 选中状态下 Ctrl+c 复制 -vnoremap "+y - -" Ctrl+v +vnoremap "+y + +" Ctrl+v "nmap "+p @@ -345,7 +351,7 @@ set scrolloff=3 " 为C程序提供自动缩进 set smartindent " 高亮显示普通txt文件（需要txt.vim脚本） - au BufRead,BufNewFile * setfiletype txt +au BufRead,BufNewFile * setfiletype txt filetype plugin indent on "打开文件类型检测, 加了这句才可以用智能补全 set completeopt=longest,menu @@ -364,7 +370,7 @@ fun! CleanExtraSpaces() silent! %s/\s\+$//e call setpos('.', save_cursor) call setreg('/', old_query) -endfun +endfun if has("autocmd") autocmd BufWritePre *.txt,*.js,*.py,*.wiki,*.sh,*.coffee,*.vue :call CleanExtraSpaces() diff --git a/vue/start_project.md b/vue/start_project.md old mode 100755 new mode 100644