improved rakefile for installing vim stuff, misc tweaks to git config for line endings, and tweaked bash_alias for ls
parent
58c7879e0b
commit
7522b6fd10
|
|
@ -6,7 +6,7 @@ alias pd="pushd $1"
|
|||
alias fuck='$(thefuck $(fc -ln -1))'
|
||||
|
||||
# list files
|
||||
alias ll='ls --color=always -l'
|
||||
alias ll='ls -hGla'
|
||||
|
||||
#rake
|
||||
alias bake='bundle exec rake'
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ if [ -d "${HOME}/tools/vim" ] ; then
|
|||
PATH=${HOME}/tools/vim:${PATH}
|
||||
fi
|
||||
|
||||
PATH=${GOPATH}/bin:${GOROOT}/bin:${PATH}
|
||||
PATH=/usr/local/bin:${GOPATH}/bin:${GOROOT}/bin:${PATH}
|
||||
|
||||
# http://stackoverflow.com/questions/410616/increasing-the-maximum-number-of-tcp-ip-connections-in-linux
|
||||
# run these to increase concurrent connections in linux
|
||||
|
|
|
|||
|
|
@ -86,7 +86,8 @@
|
|||
# Make `git rebase` safer on OS X
|
||||
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
||||
trustctime = false
|
||||
autocrlf = input
|
||||
autocrlf = true
|
||||
eol = 'lf'
|
||||
editor = $EDITOR
|
||||
|
||||
[color]
|
||||
|
|
|
|||
1
.profile
1
.profile
|
|
@ -35,7 +35,6 @@ if [ -f ~/.extensions ]; then
|
|||
. ~/.extensions
|
||||
# Sources a folder with shell extensions
|
||||
elif [ -d ~/.extensions ]; then
|
||||
echo "sourcing plugins"
|
||||
for plugin in ~/.extensions/; do
|
||||
echo $plugin
|
||||
done
|
||||
|
|
|
|||
30
.vimrc
30
.vimrc
|
|
@ -1,14 +1,10 @@
|
|||
" change runtime path
|
||||
set runtimepath=,$VIMRUNTIME,$VIM/vimfiles,~/tools/vim
|
||||
|
||||
set runtimepath=$VIMRUNTIME,~/tools/vim
|
||||
|
||||
execute pathogen#infect()
|
||||
execute pathogen#helptags()
|
||||
|
||||
|
||||
set omnifunc=syntaxcomplete#Complete
|
||||
set completeopt-=preview
|
||||
|
||||
"we don't want vi compatibility AKA Make Vim more useful
|
||||
set nocompatible
|
||||
|
||||
|
|
@ -38,6 +34,10 @@ colorscheme CandyPaper
|
|||
"morning
|
||||
"elflord
|
||||
|
||||
set omnifunc=syntaxcomplete#Complete
|
||||
set completeopt-=preview
|
||||
|
||||
|
||||
let mapleader = ","
|
||||
|
||||
map <Space> :noh<CR>
|
||||
|
|
@ -78,6 +78,7 @@ map <F1> <Nop>
|
|||
noremap <leader>W :w !sudo tee % > /dev/null<CR>
|
||||
|
||||
set noswapfile
|
||||
set backupcopy=yes
|
||||
set autoread
|
||||
set selection=exclusive
|
||||
set ttimeoutlen=50
|
||||
|
|
@ -97,6 +98,14 @@ set gdefault
|
|||
set encoding=utf-8 "nobomb
|
||||
" Change mapleader
|
||||
let mapleader=","
|
||||
|
||||
" enable neocomplete
|
||||
let g:neocomplete#enable_at_startup = 1
|
||||
|
||||
" Use smartcase
|
||||
let g:neocomplete#enable_smart_case = 1
|
||||
|
||||
|
||||
" Don't add empty newlines at the end of files
|
||||
set binary
|
||||
set noeol
|
||||
|
|
@ -105,13 +114,13 @@ set t_Co=256
|
|||
|
||||
" Centralize backups, swapfiles and undo history
|
||||
if exists("&backupdir")
|
||||
set backupdir=~/Tools/vim/backups
|
||||
set backupdir=~/tools/vim/backups
|
||||
endif
|
||||
if exists("&directory")
|
||||
set directory=~/Tools/vim/swaps
|
||||
set directory=~/tools/vim/swaps
|
||||
endif
|
||||
if exists("&undodir")
|
||||
set undodir=~/Tools/vim/undo
|
||||
set undodir=~/tools/vim/undo
|
||||
endif
|
||||
|
||||
" Respect modeline in files
|
||||
|
|
@ -257,15 +266,14 @@ let g:airline#extensions#branch#enabled = 1
|
|||
|
||||
" syntastic settings
|
||||
let g:syntastic_always_populate_loc_list = 1
|
||||
" let g:syntastic_auto_loc_list = 1
|
||||
let g:syntastic_auto_loc_list = 1
|
||||
let g:syntastic_check_on_open = 1
|
||||
let g:syntastic_check_on_wq = 0
|
||||
|
||||
let g:syntastic_javascript_checkers = ['standard']
|
||||
|
||||
" Enable file type detection
|
||||
filetype plugin on
|
||||
filetype on
|
||||
filetype plugin indent on
|
||||
|
||||
" Automatic commands
|
||||
if has("autocmd")
|
||||
|
|
|
|||
12
rakefile
12
rakefile
|
|
@ -5,7 +5,7 @@ vimFolder = "tools/vim"
|
|||
bundles_dir = File.join(File.dirname(__FILE__), "#{vimFolder}/bundle/")
|
||||
pluginsFile = File.join(File.dirname(__FILE__), "#{vimFolder}/plugins.txt")
|
||||
|
||||
CLOBBER.include "#{bundles_dir}/*"
|
||||
CLOBBER.include "#{bundles_dir}"
|
||||
|
||||
task :default => ['clobber', 'vim:reinstall']
|
||||
|
||||
|
|
@ -19,9 +19,11 @@ namespace :vim do
|
|||
lines = IO.readlines pluginsFile
|
||||
puts "Loading #{lines.length} plugins..."
|
||||
lines.each { |source|
|
||||
loadTask = Rake::Task['vim:loadPlugin']
|
||||
loadTask.invoke source.sub "\n", ''
|
||||
loadTask.reenable()
|
||||
if source[0] != ";" then
|
||||
loadTask = Rake::Task['vim:loadPlugin']
|
||||
loadTask.invoke source.sub "\n", ''
|
||||
loadTask.reenable()
|
||||
end
|
||||
}
|
||||
puts "Plugins installed!"
|
||||
end
|
||||
|
|
@ -33,7 +35,7 @@ namespace :vim do
|
|||
puts "Installing #{dir}...."
|
||||
Dir.chdir bundles_dir do
|
||||
sh "git clone #{args.source} #{dir}"
|
||||
FileUtils.rm_rf(File.join(dir, ".git"))
|
||||
#FileUtils.rm_rf(File.join(dir, ".git"))
|
||||
end
|
||||
puts "\n\n"
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue