Skip to content

Commit

Permalink
Update dotfiles for latest setup
Browse files Browse the repository at this point in the history
  • Loading branch information
akshayp committed Nov 16, 2016
1 parent e1c7e4f commit 7d6b60f
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 52 deletions.
2 changes: 2 additions & 0 deletions .ackrc
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@
--ignore-dir=dist
--ignore-dir=.vscode
--ignore-dir=typings
--ignore-dir=Carthage
--ignore-file=ext:jsbundle
14 changes: 11 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
'node': true,
'es6': true
},
'parser': 'babel-eslint',
'parserOptions': {
'ecmaVersion': 6,
'sourceType': 'module',
Expand Down Expand Up @@ -64,8 +65,15 @@ module.exports = {
'react/no-danger': 2,
'react/no-deprecated': 2,
'react/no-direct-mutation-state': 2,
'react/no-direct-mutation-state': 2,
'react/sort-comp': 2,
'react/sort-comp': [2, {
order: [
'type-annotations',
'static-methods',
'lifecycle',
'everything-else',
'render'
]
}],
'react/wrap-multilines': 2,
'semi': [2, 'always'],
'space-before-blocks': 2,
Expand All @@ -75,5 +83,5 @@ module.exports = {
'valid-jsdoc': 2,
'wrap-iife': [2, 'inside']
},
'plugins': ['react']
'plugins': ['react', 'babel', 'flowtype']
};
5 changes: 5 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[user]
name = Akshay Patel
email = [email protected]
signingkey = B3C09CF8F65DC094

[core]
excludesfile = ~/.gitignore
Expand Down Expand Up @@ -65,3 +66,7 @@
[pager]
diff = diff-so-fancy
show = diff-so-fancy
[url "[email protected]:"]
insteadOf = https://github.com/
[commit]
gpgsign = true
38 changes: 22 additions & 16 deletions .vim/autoload/pathogen.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.3
" Version: 2.4

" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
Expand Down Expand Up @@ -90,27 +90,30 @@ function! pathogen#cycle_filetype() abort
endfunction

" Check if a bundle is disabled. A bundle is considered disabled if its
" basename or full name is included in the list g:pathogen_disabled.
" basename or full name is included in the list g:pathogen_blacklist or the
" comma delimited environment variable $VIMBLACKLIST.
function! pathogen#is_disabled(path) abort
if a:path =~# '\~$'
return 1
endif
let sep = pathogen#slash()
let blacklist = map(
let blacklist =
\ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
\ pathogen#split($VIMBLACKLIST),
\ 'substitute(v:val, "[\\/]$", "", "")')
\ pathogen#split($VIMBLACKLIST)
if !empty(blacklist)
call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
endif
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
endfunction "}}}1
endfunction

" Prepend the given directory to the runtime path and append its corresponding
" after directory. Curly braces are expanded with pathogen#expand().
function! pathogen#surround(path) abort
let sep = pathogen#slash()
let rtp = pathogen#split(&rtp)
let path = fnamemodify(a:path, ':p:?[\\/]\=$??')
let path = fnamemodify(a:path, ':s?[\\/]\=$??')
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
call filter(rtp, 'index(before + after, v:val) == -1')
let &rtp = pathogen#join(before, rtp, after)
return &rtp
Expand All @@ -128,7 +131,7 @@ function! pathogen#interpose(name) abort
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
else
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
endif
Expand Down Expand Up @@ -171,22 +174,25 @@ endfunction
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
" and globbed. Actual globs are preserved.
function! pathogen#expand(pattern) abort
function! pathogen#expand(pattern, ...) abort
let after = a:0 ? a:1 : ''
if a:pattern =~# '{[^{}]\+}'
let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
let found = map(split(pat, ',', 1), 'pre.v:val.post')
let results = []
for pattern in found
call extend(results, pathogen#expand(pattern))
endfor
return results
elseif a:pattern =~# '{}'
let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
let post = a:pattern[strlen(pat) : -1]
return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
else
return [a:pattern]
let results = [a:pattern]
endif
let vf = pathogen#slash() . 'vimfiles'
call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
return filter(results, '!empty(v:val)')
endfunction

" \ on Windows unless shellslash is set, / everywhere else.
Expand All @@ -202,12 +208,12 @@ endfunction
function! pathogen#glob(pattern) abort
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
endfunction "}}}1
endfunction

" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction "}}}1
endfunction

" Remove duplicates from a list.
function! pathogen#uniq(list) abort
Expand Down Expand Up @@ -239,7 +245,7 @@ function! pathogen#fnameescape(string) abort
endfunction

" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#runtime_findfile(file,count) abort "{{{1
function! pathogen#runtime_findfile(file,count) abort
let rtp = pathogen#join(1,pathogen#split(&rtp))
let file = findfile(a:file,rtp,a:count)
if file ==# ''
Expand Down
2 changes: 1 addition & 1 deletion .vim/bundle/vim-airline
Submodule vim-airline updated from 14d14c to 2dae2b
1 change: 1 addition & 0 deletions .vim/bundle/vim-airline-themes
Submodule vim-airline-themes added at e03e9f
2 changes: 1 addition & 1 deletion .vim/bundle/vim-fugitive
Submodule vim-fugitive updated from dba8a0 to b754bc
12 changes: 10 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,26 @@ alias sup="ps auxwww"
alias df="df -h"

#Plugins
plugins=(git brew colored-man docker extract git-extras node npm svn colorize)
plugins=(git colored-man docker extract git-extras node npm svn colorize)
source $ZSH/oh-my-zsh.sh

#Override
alias lst='tree'

# Exports
export NPM_PATH="/usr/local/share/npm"
export NODE_PATH="/usr/local/lib/node_modules:/usr/local/share/npm"
export GOPATH=$HOME/Dev/go
export PATH=/usr/local/share/npm/bin:$GOPATH/bin:/usr/local/bin:/usr/X11/bin:/usr/local/bin/localizr_cli/bin:/usr/local/opt/go/libexec/bin:$PATH
export GOROOT=/usr/local/go
export ANDROID_HOME=/usr/local/opt/android-sdk
export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
export PATH=$NPM_PATH/bin:$GOPATH/bin:$GOROOT/bin:/usr/local/bin:/usr/X11/bin:$PATH
export TERM="xterm-color"
export CLICOLOR="true"
export EDITOR='subl -n -w'



# History Management
HISTFILE=~/.history
export HISTSIZE=10000
Expand All @@ -100,3 +106,5 @@ fi
ulimit -n 10000

fpath=(/usr/local/share/zsh-completions $fpath)

export PATH="$HOME/.yarn/bin:$PATH"
33 changes: 4 additions & 29 deletions setup
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ function brewski() {
brew install "${@}"
}

function installcask() {
info " ├─ Casking ${@}"
brew cask install "${@}" 2> /dev/null
}

# Start Magic
if test ! $(which brew); then
log "Installing Brew ✈ ✈ ✈"
Expand All @@ -57,36 +52,16 @@ brewski git-extras
brewski n
brewski ncdu
brewski wget
brewski hub
brewski htop
brewski go
brew tap phinze/homebrew-cask
brewski brew-cask
brewski ios_webkit_debug_proxy
brewski memcached
brewski mvn
brewski selenium-server
brewski ruby
brewski ack
brewski gradle
brewski postgresql
brewski redis

log "Install Node Latest and Stable"
n latest
n stable

log "Casking OSX Software ..."
installcask adium-beta
installcask dropbox
installcask evernote
installcask expan-drive
installcask google-chrome
installcask firefox
installcask imagealpha
installcask imageoptim
installcask iterm2
installcask sublime-text3
installcask skype
installcask the-unarchiver
installcask virtualbox

log "Cleanup Brew ..."
brew cleanup

Expand Down

0 comments on commit 7d6b60f

Please sign in to comment.