Clean up, create simple setup script

master
JD Cantrell 6 years ago
parent d6fc471d62
commit 784c30fbcd

@ -1,14 +1,16 @@
# vim: set filetype=sh :
export NVM_DIR="/Users/jcantrell/.nvm/"
[ -s "$NVM_DIR/nvm.sh" ] && . $NVM_DIR/nvm.sh # This loads nvm
nvm use default --delete-prefix
. $(brew --prefix)/etc/bash_completion
#osx with brew
export PATH="/usr/local/bin:/usr/local/sbin:~/.composer/vendor/bin:$PATH"
export PATH="$(brew --prefix homebrew/php/php56)/bin:$PATH"
export PATH="/usr/local/sbin:$PATH"
[ -s ".bash.tokens" ] && . .bash.tokens
. $(brew --prefix)/etc/bash_completion
export NVM_DIR="/Users/jcantrell/.nvm/"
[ -s "$NVM_DIR/nvm.sh" ] && . $NVM_DIR/nvm.sh --delete-prefix # This loads nvm
alias phpunit='php -dzend_extension=/usr/local/opt/php56-xdebug/xdebug.so /usr/local/bin/phpunit'

@ -10,18 +10,6 @@ HISTIGNORE='ls:bg:fg:history'
export CLICOLOR=1
export EDITOR='vim'
#virtualenv
export WORKON_HOME="~/.envs"
if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python2.7
source /usr/local/bin/virtualenvwrapper.sh
fi
if [ -f /usr/bin/virtualenvwrapper.sh ]; then
source /usr/bin/virtualenvwrapper.sh
fi
#alias type things
alias http-serve='python -m SimpleHTTPServer 40001'
alias socks='ssh -D 9999'

@ -1,412 +0,0 @@
# An example configuration file for MPD
# See the mpd.conf man page for a more detailed description of each parameter.
# Files and directories #######################################################
#
# This setting controls the top directory which MPD will search to discover the
# available audio files and add them to the daemon's online database. This
# setting defaults to the XDG directory, otherwise the music directory will be
# be disabled and audio files will only be accepted over ipc socket (using
# file:// protocol) or streaming files over an accepted protocol.
#
music_directory "~/Music"
#
# This setting sets the MPD internal playlist directory. The purpose of this
# directory is storage for playlists created by MPD. The server will use
# playlist files not created by the server but only if they are in the MPD
# format. This setting defaults to playlist saving being disabled.
#
playlist_directory "~/.mpd/playlists"
#
# This setting sets the location of the MPD database. This file is used to
# load the database at server start up and store the database while the
# server is not up. This setting defaults to disabled which will allow
# MPD to accept files over ipc socket (using file:// protocol) or streaming
# files over an accepted protocol.
#
db_file "~/.mpd/database"
#
# These settings are the locations for the daemon log files for the daemon.
# These logs are great for troubleshooting, depending on your log_level
# settings.
#
# The special value "syslog" makes MPD use the local syslog daemon. This
# setting defaults to logging to syslog, otherwise logging is disabled.
#
log_file "~/.mpd/log"
#
# This setting sets the location of the file which stores the process ID
# for use of mpd --kill and some init scripts. This setting is disabled by
# default and the pid file will not be stored.
#
pid_file "~/.mpd/pid"
#
# This setting sets the location of the file which contains information about
# most variables to get MPD back into the same general shape it was in before
# it was brought down. This setting is disabled by default and the server
# state will be reset on server start up.
#
state_file "~/.mpd/state"
#
# The location of the sticker database. This is a database which
# manages dynamic information attached to songs.
#
sticker_file "~/.mpd/sticker.sql"
#
###############################################################################
# General music daemon options ################################################
#
# This setting specifies the user that MPD will run as. MPD should never run as
# root and you may use this setting to make MPD change its user ID after
# initialization. This setting is disabled by default and MPD is run as the
# current user.
#
user "jcantrell"
#
# This setting specifies the group that MPD will run as. If not specified
# primary group of user specified with "user" setting will be used (if set).
# This is useful if MPD needs to be a member of group such as "audio" to
# have permission to use sound card.
#
#group "nogroup"
#
# This setting sets the address for the daemon to listen on. Careful attention
# should be paid if this is assigned to anything other then the default, any.
# This setting can deny access to control of the daemon.
#
# For network
#bind_to_address "any"
#
# And for Unix Socket
#bind_to_address "~/.mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
#port "6600"
#
# This setting controls the type of information which is logged. Available
# setting arguments are "default", "secure" or "verbose". The "verbose" setting
# argument is recommended for troubleshooting, though can quickly stretch
# available resources on limited hardware storage.
#
#log_level "default"
#
# If you have a problem with your MP3s ending abruptly it is recommended that
# you set this argument to "no" to attempt to fix the problem. If this solves
# the problem, it is highly recommended to fix the MP3 files with vbrfix
# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which
# point gapless MP3 playback can be enabled.
#
#gapless_mp3_playback "yes"
#
# This setting enables MPD to create playlists in a format usable by other
# music players.
#
#save_absolute_paths_in_playlists "no"
#
# This setting defines a list of tag types that will be extracted during the
# audio file discovery process. Optionally, 'comment' can be added to this
# list.
#
#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"
#
# This setting enables automatic update of MPD's database when files in
# music_directory are changed.
#
#auto_update "yes"
#
# Limit the depth of the directories being watched, 0 means only watch
# the music directory itself. There is no limit by default.
#
#auto_update_depth "3"
#
###############################################################################
# Symbolic link behavior ######################################################
#
# If this setting is set to "yes", MPD will discover audio files by following
# symbolic links outside of the configured music_directory.
#
#follow_outside_symlinks "yes"
#
# If this setting is set to "yes", MPD will discover audio files by following
# symbolic links inside of the configured music_directory.
#
#follow_inside_symlinks "yes"
#
###############################################################################
# Zeroconf / Avahi Service Discovery ##########################################
#
# If this setting is set to "yes", service information will be published with
# Zeroconf / Avahi.
#
#zeroconf_enabled "yes"
#
# The argument to this setting will be the Zeroconf / Avahi unique name for
# this MPD server on the network.
#
#zeroconf_name "Music Player"
#
###############################################################################
# Permissions #################################################################
#
# If this setting is set, MPD will require password authorization. The password
# can setting can be specified multiple times for different password profiles.
#
#password "password@read,add,control,admin"
#
# This setting specifies the permissions a user has who has not yet logged in.
#
#default_permissions "read,add,control,admin"
#
###############################################################################
# Input #######################################################################
#
input {
plugin "curl"
# proxy "proxy.isp.com:8080"
# proxy_user "user"
# proxy_password "password"
}
#
###############################################################################
# Audio Output ################################################################
#
# MPD supports various audio output types, as well as playing through multiple
# audio outputs at the same time, through multiple audio_output settings
# blocks. Setting this block is optional, though the server will only attempt
# autodetection for one sound card.
#
# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of
# other audio outputs.
#
# An example of an ALSA output:
#
audio_output {
type "osx"
name "MacAir"
mixer_type "software"
}
#audio_output {
# type "alsa"
# name "My ALSA Device"
## device "hw:0,0" # optional
## format "44100:16:2" # optional
## mixer_type "hardware" # optional
## mixer_device "default" # optional
## mixer_control "PCM" # optional
## mixer_index "0" # optional
#}
#
# An example of an OSS output:
#
#audio_output {
# type "oss"
# name "My OSS Device"
## device "/dev/dsp" # optional
## format "44100:16:2" # optional
## mixer_type "hardware" # optional
## mixer_device "/dev/mixer" # optional
## mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
#
#audio_output {
# type "shout"
# encoding "ogg" # optional
# name "My Shout Stream"
# host "localhost"
# port "8000"
# mount "/mpd.ogg"
# password "hackme"
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
## protocol "icecast2" # optional
## user "source" # optional
## description "My Stream Description" # optional
## genre "jazz" # optional
## public "no" # optional
## timeout "2" # optional
## mixer_type "software" # optional
#}
#
# An example of a recorder output:
#
#audio_output {
# type "recorder"
# name "My recorder"
# encoder "vorbis" # optional, vorbis or lame
# path "/var/lib/mpd/recorder/mpd.ogg"
## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
#}
#
# An example of a httpd output (built-in HTTP streaming server):
#
#audio_output {
# type "httpd"
# name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame
# port "8000"
# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6
## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
# max_clients "0" # optional 0=no limit
#}
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
#
#audio_output {
# type "pulse"
# name "My Pulse Output"
## server "remote_server" # optional
## sink "remote_server_sink" # optional
#}
#
## Example "pipe" output:
#
#audio_output {
# type "pipe"
# name "my pipe"
# command "aplay -f cd 2>/dev/null"
## Or if you're want to use AudioCompress
# command "AudioCompress -m | aplay -f cd 2>/dev/null"
## Or to send raw PCM stream through PCM:
# command "nc example.org 8765"
# format "44100:16:2"
#}
#
## An example of a null output (for no audio output):
#
#audio_output {
# type "null"
# name "My Null Output"
# mixer_type "none" # optional
#}
#
# This setting will change all decoded audio to be converted to the specified
# format before being passed to the audio outputs. By default, this setting is
# disabled.
#
#audio_output_format "44100:16:2"
#
# If MPD has been compiled with libsamplerate support, this setting specifies
# the sample rate converter to use. Possible values can be found in the
# mpd.conf man page or the libsamplerate documentation. By default, this is
# setting is disabled.
#
#samplerate_converter "Fastest Sinc Interpolator"
#
###############################################################################
# Normalization automatic volume adjustments ##################################
#
# This setting specifies the type of ReplayGain to use. This setting can have
# the argument "off", "album" or "track". See <http://www.replaygain.org>
# for more details. This setting is off by default.
#
#replaygain "album"
#
# This setting sets the pre-amp used for files that have ReplayGain tags. By
# default this setting is disabled.
#
#replaygain_preamp "0"
#
# This setting enables on-the-fly normalization volume adjustment. This will
# result in the volume of all playing audio to be adjusted so the output has
# equal "loudness". This setting is disabled by default.
#
#volume_normalization "no"
#
###############################################################################
# MPD Internal Buffering ######################################################
#
# This setting adjusts the size of internal decoded audio buffering. Changing
# this may have undesired effects. Don't change this if you don't know what you
# are doing.
#
#audio_buffer_size "2048"
#
# This setting controls the percentage of the buffer which is filled before
# beginning to play. Increasing this reduces the chance of audio file skipping,
# at the cost of increased time prior to audio playback.
#
#buffer_before_play "10%"
#
###############################################################################
# Resource Limitations ########################################################
#
# These settings are various limitations to prevent MPD from using too many
# resources. Generally, these settings should be minimized to prevent security
# risks, depending on the operating resources.
#
#connection_timeout "60"
#max_connections "10"
#max_playlist_length "16384"
#max_command_list_size "2048"
#max_output_buffer_size "8192"
#
###############################################################################
# Character Encoding ##########################################################
#
# If file or directory names do not display correctly for your locale then you
# may need to modify this setting.
#
#filesystem_charset "UTF-8"
#
# This setting controls the encoding that ID3v1 tags should be converted from.
#
#id3v1_encoding "ISO-8859-1"
#
###############################################################################
# SIDPlay decoder #############################################################
#
# songlength_database:
# Location of your songlengths file, as distributed with the HVSC.
# The sidplay plugin checks this for matching MD5 fingerprints.
# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
#
# default_songlength:
# This is the default playing time in seconds for songs not in the
# songlength database, or in case you're not using a database.
# A value of 0 means play indefinitely.
#
# filter:
# Turns the SID filter emulation on or off.
#
#decoder {
# plugin "sidplay"
# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt"
# default_songlength "120"
# filter "true"
#}
#
###############################################################################

@ -1,7 +0,0 @@
--recurse=yes
--tag-relative=yes
--exclude=.git
--exclude=node_modules
--langmap=php:.engine.inc.module.theme.install.php --php-kinds=+cf-v

279
irssi

@ -1,279 +0,0 @@
servers = (
{ address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; },
{ address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
{ address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; },
{
address = "irc.undernet.org";
chatnet = "Undernet";
port = "6667";
},
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
{
address = "irc.quakenet.org";
chatnet = "QuakeNet";
port = "6667";
},
{ address = "irc.oftc.net"; chatnet = "OFTC"; port = "6667"; },
{
address = "irc.gamesurge.net";
chatnet = "GameSurge";
port = "6667";
},
{ address = "irc.webchat.org"; chatnet = "WebChat"; port = "6667"; },
{ address = "irc.rizon.net"; chatnet = "Rizon"; port = "6667"; },
{ address = "irc.link-net.org"; chatnet = "LinkNet"; port = "6667"; },
{ address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
{
address = "irc.freenode.net";
chatnet = "freenode";
port = "6697";
use_ssl = "yes";
ssl_verify = "no";
autoconnect = "yes";
}
);
chatnets = {
IRCnet = {
type = "IRC";
max_kicks = "4";
max_msgs = "5";
max_whois = "4";
max_query_chans = "5";
};
EFNet = {
type = "IRC";
max_kicks = "4";
max_msgs = "3";
max_whois = "1";
};
Undernet = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
DALnet = {
type = "IRC";
max_kicks = "4";
max_msgs = "3";
max_whois = "30";
};
QuakeNet = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
OFTC = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
GameSurge = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
WebChat = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
Rizon = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
LinkNet = {
type = "IRC";
max_kicks = "1";
max_msgs = "3";
max_whois = "30";
};
SILC = { type = "SILC"; };
freenode = {
type = "IRC";
autosendcmd = "/msg NickServ identify 0booga0; wait 2000";
};
};
channels = (
{ name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
{ name = "silc"; chatnet = "silc"; autojoin = "No"; }
);
aliases = {
J = "join";
WJOIN = "join -window";
WQUERY = "query -window";
LEAVE = "part";
BYE = "quit";
EXIT = "quit";
SIGNOFF = "quit";
DESCRIBE = "action";
DATE = "time";
HOST = "userhost";
LAST = "lastlog";
SAY = "msg *";
WI = "whois";
WII = "whois $0 $0";
WW = "whowas";
W = "who";
N = "names";
M = "msg";
T = "topic";
C = "clear";
CL = "clear";
K = "kick";
KB = "kickban";
KN = "knockout";
BANS = "ban";
B = "ban";
MUB = "unban *";
UB = "unban";
IG = "ignore";
UNIG = "unignore";
SB = "scrollback";
UMODE = "mode $N";
WC = "window close";
WN = "window new hide";
SV = "say Irssi $J ($V) - http://irssi.org/";
GOTO = "sb goto";
CHAT = "dcc chat";
RUN = "SCRIPT LOAD";
CALC = "exec - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
SBAR = "STATUSBAR";
INVITELIST = "mode $C +I";
Q = "QUERY";
"MANUAL-WINDOWS" = "set use_status_window off;set autocreate_windows off;set autocreate_query_level none;set autoclose_windows off;set reuse_unused_windows on;save";
EXEMPTLIST = "mode $C +e";
ATAG = "WINDOW SERVER";
UNSET = "set -clear";
RESET = "set -default";
};
statusbar = {
# formats:
# when using {templates}, the template is shown only if it's argument isn't
# empty unless no argument is given. for example {sb} is printed always,
# but {sb $T} is printed only if $T isn't empty.
items = {
# start/end text in statusbars
barstart = "{sbstart}";
barend = "{sbend}";
topicbarstart = "{topicsbstart}";
topicbarend = "{topicsbend}";
# treated "normally", you could change the time/user name to whatever
time = "{sb $Z}";
user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}";
# treated specially .. window is printed with non-empty windows,
# window_empty is printed with empty windows
window = "{sb $winref:$tag/$itemname{sbmode $M}}";
window_empty = "{sb $winref{sbservertag $tag}}";
prompt = "{prompt $[.15]itemname}";
prompt_empty = "{prompt $winname}";
topic = " $topic";
topic_empty = " Irssi v$J - http://www.irssi.org";
# all of these treated specially, they're only displayed when needed
lag = "{sb Lag: $0-}";
act = "{sb Act: $0-}";
more = "-- more --";
};
# there's two type of statusbars. root statusbars are either at the top
# of the screen or at the bottom of the screen. window statusbars are at
# the top/bottom of each split window in screen.
default = {
# the "default statusbar" to be displayed at the bottom of the window.
# contains all the normal items.
window = {
disabled = "no";
# window, root
type = "window";
# top, bottom
placement = "bottom";
# number
position = "1";
# active, inactive, always
visible = "active";
# list of items in statusbar in the display order
items = {
barstart = { priority = "100"; };
time = { };
user = { };
window = { };
window_empty = { };
lag = { priority = "-1"; };
act = { priority = "10"; };
more = { priority = "-1"; alignment = "right"; };
barend = { priority = "100"; alignment = "right"; };
};
};
# statusbar to use in inactive split windows
window_inact = {
type = "window";
placement = "bottom";
position = "1";
visible = "inactive";
items = {
barstart = { priority = "100"; };
window = { };
window_empty = { };
more = { priority = "-1"; alignment = "right"; };
barend = { priority = "100"; alignment = "right"; };
};
};
# we treat input line as yet another statusbar :) It's possible to
# add other items before or after the input line item.
prompt = {
type = "root";
placement = "bottom";
# we want to be at the bottom always
position = "100";
visible = "always";
items = {
prompt = { priority = "-1"; };
prompt_empty = { priority = "-1"; };
# treated specially, this is the real input line.
input = { priority = "10"; };
};
};
# topicbar
topic = {
type = "root";
placement = "top";
position = "1";
visible = "always";
items = {
topicbarstart = { priority = "100"; };
topic = { };
topic_empty = { };
topicbarend = { priority = "100"; alignment = "right"; };
};
};
};
};
settings = {
core = {
real_name = "jd";
user_name = "pseudo-jd";
nick = "goodrobot_jd";
};
"fe-text" = { actlist_sort = "refnum"; };
"fe-common/core" = { completion_strict = "yes"; };
};

@ -1,34 +0,0 @@
{
"white": true,
"bitwise": true,
"camelcase": false,
"curly": true,
"eqeqeq": true,
"es3": true,
"forin": true,
"freeze": true,
"immed": true,
"indent": 2,
"latedef": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"undef": true,
"unused": true,
"trailing": true,
"maxcomplexity": 15,
"browser": true,
"jquery": true,
"predef": {
"_": true,
"Backbone": true,
"trulia": true,
"site_root": true,
"_SITE_ROOT": true,
"define" : true
}
}

@ -0,0 +1,58 @@
#!/bin/bash
set -e
CONFIG_FILES=(bashrc bash_profile inputrc vimrc gitconfig)
reset=$( tput sgr0 )
bold=$( tput bold )
green=$( tput setaf 2 || tput AF 2 )
txtgrn=$reset$green
bldgrn=$bold$green
TARGET=$PWD
SRC=$(dirname "${0%}")
for FILE in "${CONFIG_FILES[@]}"
do
ln -s "$SRC/$FILE" "$TARGET/.$FILE"
echo "${txtgrn}$TARGET/.$FILE$reset -> $SRC/$FILE"
done
read -r -p "Install local env bashrc? [y/n] " INSTALL_ENV
case "$INSTALL_ENV" in
[yY][eE][sS]|[yY])
case "$OSTYPE" in
darwin*)
ln -s "$SRC/bash.osx" "$TARGET/.bash.local"
echo "${txtgrn}$TARGET/.bash.local$reset -> $SRC/bash.osx"
;;
linux*)
ln -s "$SRC/bash.fedora" "$TARGET/.bash.local"
echo "${txtgrn}$TARGET/.bash.local$reset -> $SRC/bash.fedora"
;;
# solaris*) echo "SOLARIS" ;;
# bsd*) echo "BSD" ;;
# msys*) echo "WINDOWS" ;;
*)
echo "No local env bashrc to install for $OSTYPE"
;;
esac
;;
*)
echo "Okay, skipping local env bashrc."
;;
esac
if [ ! -d "$HOME/.vim" ]; then
read -r -p "Install vundle? [y/n] " INSTALL_VUNDLE
case "$INSTALL_VUNDLE" in
[yY][eE][sS]|[yY])
git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
;;
*)
echo "Okay, skipping vundle install."
;;
esac
fi
echo "${bldgrn}Done!${reset}"

@ -1,8 +0,0 @@
#status bar
set -g status-bg green
set -g status-fg colour230
source-file /usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf
setw -g automatic-rename on
set -g base-index 1

52
vimrc

@ -77,8 +77,8 @@
Plugin 'jdcantrell/syntastic-local-eslint.vim'
" typescript
Plugin 'Quramy/tsuquyomi'
Plugin 'HerringtonDarkholme/yats.vim'
" Plugin 'Quramy/tsuquyomi'
" Plugin 'HerringtonDarkholme/yats.vim'
Plugin 'dzeban/vim-log-syntax'
@ -442,38 +442,6 @@ set omnifunc=syntaxcomplete#Complete
" }
" Syntastic {
" set statusline+=%#warningmsg#
" set statusline+=%{SyntasticStatuslineFlag()}
" set statusline+=%*
" let g:syntastic_always_populate_loc_list = 1
" let g:syntastic_auto_loc_list = 0
" let g:syntastic_aggregate_errors = 0
" let g:syntastic_enable_signs = 0
" let g:syntastic_stl_format = "%E{E:%e}%W{ W:%w} (%F)"
" let g:syntastic_php_checkers = ['php', 'phpmd', 'phpcs', 'phan']
" let g:syntastic_php_phpcs_args = '--standard='.$VIMHOME.'/Work/code-quality-configs/CodeSniffer/phpcs.xml'
" let g:syntastic_php_phpmd_post_args = $VIMHOME.'/Work/trulia/phpmd.xml'
" let g:syntastic_python_checkers = ['pyflakes']
" let g:syntastic_python_flake8_args='--ignore=E501,E225'
" let g:syntastic_rst_checkers = ['rstcheck']
" let g:syntastic_javascript_checkers = ['eslint']
" let g:syntastic_javascript_eslint_args = '--rule "no-var: 1"'
" function! AggregateSyntasticErrors()
" let g:syntastic_aggregate_errors = 1
" execute 'SyntasticCheck'
" let g:syntastic_aggregate_errors = 0
" endfunction
" let g:tsuquyomi_disable_quickfix = 1
" let g:syntastic_typescript_checkers = ['tslint', 'tsuquyomi'] " You shouldn't use 'tsc' checker.
" let g:syntastic_typescript_tslint_args = '--config tslint.json'
" }
" OmniComplete
" Popup menu hightLight Group
"highlight Pmenu ctermbg=13 guibg=DarkBlue
@ -573,12 +541,16 @@ if has('gui_running')
colorscheme base16-unikitty-dark
else
set termguicolors
if &term =~# '^screen'
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
endif
set mouse=a
colorscheme base16-onedark
if v:version < 800
colorscheme tango
else
set termguicolors
if &term =~# '^screen'
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
endif
colorscheme base16-onedark
endif
endif

@ -1,2 +0,0 @@
export PATH="/usr/local/share/python:$HOME/.rbenv/bin:/usr/local/bin:$PATH"
export NODE_PATH="/usr/local/lib/node_modules"

176
zshrc

@ -1,176 +0,0 @@
#load zshuery
#git clone https://github.com/myfreeweb/zshuery.git
source $HOME/.zshuery/zshuery.sh
load_defaults
load_aliases
load_lol_aliases
load_completion $HOME/.zshuery/completion
load_correction
#group_propt="$fg[red]%R →$reset_color $fg[green]%r?$reset_color (Yes, No, Abort, Edit) "
zstyle ':completion:*' format "Completing $fg[blue]%d"
zstyle ':completion:*' group-name ''
#zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
#zstyle ':completion:*' completer _complete _ignored _correct _approximate
# disable svn completion
compdef -d svn
#disable user listing
zstyle ':completion:*' users off
#update paths
export PATH="/usr/local/Cellar/smlnj/110.75/libexec/bin/:usr/local/share/python:$HOME/.rbenv/bin:/usr/local/bin:/usr/local/sbin:$PATH"
export NODE_PATH="/usr/local/lib/node_modules"
export CLICOLOR=1
#rbenv
eval "$(rbenv init - zsh)"
source $HOME/.zprofile
#update editor
export EDITOR='vim'
function chpwd() {
update_terminal_cwd
}
# make tab completion not so worthless when using cd:
zstyle ':completion:*:cd:*' tag-order local-directories named-directories
#enable vim mode
bindkey -v
# make search up and down work, so partially type and hit up/down to find relevant stuff
bindkey '^[[A' up-line-or-search
bindkey '^[[B' down-line-or-search
bindkey '^R' history-incremental-search-backward
#aliases
alias fedev='ssh jcantrell@fedev.utah.trulia.com'
alias fedevdb='mysql -h fedevdb -u root -p'
alias vim='~/Applications/MacVim.app/Contents/MacOS/Vim'
alias subl='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
#open file in existing vim from command line
alias vo="open \"mvim://open?url=file://$1\""
alias http-serve='python -m SimpleHTTPServer 40001'
alias ls="ls -G"
alias socks='ssh -D 9999'
#git stuff simplified from oh-my-zsh
function git_prompt_info() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo "git:${ref#refs/heads/}$(git_dirty)"
}
# Checks if working tree is dirty
function git_dirty() {
if [[ -n $(git status -s --ignore-submodules=dirty 2> /dev/null) ]]; then
#dirty
echo "%{$fg[red]%}✗"
else
#clean
echo ""
fi
}
# Checks if there are commits ahead from remote
function git_prompt_ahead() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
if $(echo "$(git log origin/${ref#refs/heads/}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
echo "%{$fg_bold[green]%}+"
fi
}
#set up prompt
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="blue"; fi
prompts '%{$fg[$NCOLOR]%}%c %{$fg_bold[blue]%}➤ %{$reset_color%}' '%{$fg[$NCOLOR]%}%p %{$fg[green]%}$(git_prompt_ahead)$(git_prompt_info)%{$reset_color%}'
#Let me know when I am in vi mode
function zle-line-init zle-keymap-select {
if [[ ${KEYMAP} == "vicmd" ]]; then
RPROMPT="%{$bg_bold[green]%}%{$fg_bold[green]%} ~command~ %{$reset_color%}"
else
RPROMPT='%{$fg[$NCOLOR]%}%p %{$fg[green]%}$(git_prompt_ahead)$(git_prompt_info)%{$reset_color%}'
fi
zle reset-prompt
}
zle -N zle-line-init
zle -N zle-keymap-select
#virtualenv helpers
function pyenv {
if [ ! -d ~/.env/$1/ ]; then
virtualenv ~/.env/$1 --no-site-packages
fi
source ~/.env/$1/bin/activate
}
#svn alias
surl="svn+ssh://svn/usr/local/svnrepos/TRULIA/FE/www/branches/"
export surl
function s {
svn $1 svn+ssh://svn/usr/local/svnrepos/TRULIA/FE/www/branches/$2 $3
}
function cdiff {
new_rev=`ls -1 $1.r* | tail -1`
mvimdiff "$1".mine $new_rev
}
#search common from other directories
function js {
ack $@ --js --html
}
function cack {
ack $@ ~/FeDev/common
}
function wack {
ack $@ ~/FeDev/common --color-match="bold magenta"
echo
ack $@ ./
}
function sd {
if [ -z "$1" ]
then
svn st | cut -c8- | sed -e '/local.conf/d' -e '/.htaccess/d' -e '/site.conf/d' | xargs svn diff | colordiff | less -R
else
svn diff "${@}" | colordiff
fi
}
alias ss="svn st"
function sdv {
svn diff "${@}" | view -
}
function sdaily {
DATE1=${2-`date -v-1d "+%Y-%m-%d"`}
DATE2=${3-`date "+%Y-%m-%d"`}
USER=${1-jcantrell}
echo "svn log for $DATE1 to $DATE2 for $USER:"
svn log -r{$DATE1}:{$DATE2} | grep $USER -A 2 | sed -e '/^[-]*$/d' -e 's/ .* line$/ /' | sed -e '$!N;s/\n/- /'
}
function stoday {
sdaily ${1-jcantrell} `date "+%Y-%m-%d"` `date -v+1d "+%Y-%m-%d"`
}
# Opens a new tab and starts guard in ~/FeDev and then returns to the
# previous tab
function watch-dev() {
osascript 2>/dev/null <<EOF
tell application "System Events"
tell process "Terminal" to keystroke "t" using command down
end
tell application "Terminal"
do script with command "cd ~/FeDev/;guard; $*" in window 1
end tell
tell application "System Events"
tell process "Terminal" to keystroke "{" using {command down}
end
EOF
}
Loading…
Cancel
Save