Mysql updates, vim and zsh tweaks

This commit is contained in:
Josh Sherman 2016-10-10 14:43:19 -05:00
parent bef2ffc73d
commit 7f3276185d
7 changed files with 17 additions and 7 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
git/gitconfig.local.symlink
mysql/my.cnf.local.symlink
vim.symlink/bundle
vim.symlink/.netrwhist

View file

@ -1,5 +0,0 @@
[mysql]
pager = grcat ~/.grcat
[client]
user = root

View file

@ -0,0 +1,3 @@
[client]
user = CLIENT_USER
password = CLIENT_PASSWORD

4
mysql/my.cnf.symlink Normal file
View file

@ -0,0 +1,4 @@
!include ~/.my.cnf.local
[mysql]
pager = grcat ~/.grcat

View file

@ -52,7 +52,7 @@ autocmd BufNewFile,BufRead nginx.conf set filetype=nginx
autocmd BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache
autocmd BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache
autocmd FileType javascript,dustjs,handlebars,css,scss setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType javascript,dustjs,html.handlebars,css,scss setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
" Automatically wraps markdown and text to 80 columns

View file

@ -5,7 +5,7 @@ function username() {
}
function server() {
if [[ `hostname` != Josh* ]]; then
if [[ `hostname` != josh-* ]]; then
echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
fi
}

View file

@ -66,6 +66,7 @@ alias vd="vimdiff"
# }
# This is kinda fucked, I outta rework into a separate grep alias to skip stuff
# TODO Evidently this is deprecated and I should be using an alias
export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules --exclude-dir=.sass-cache"
# I dunno about all of this either
@ -85,6 +86,12 @@ export NODE_ENV=development
# TODO Barks on Linux
# export NVM_DIR=~/.nvm
# source $(brew --prefix nvm)/nvm.sh
export NVM_DIR="/home/josh/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
# This is to get sudo access to NVM
alias sudo='sudo env PATH=$PATH:$NVM_BIN'
# Need to run this conditionally on OSX
# TODO: Barks on Linux