Permalink
Browse files

New sublime theme, more git aliases.

  • Loading branch information...
1 parent 002adf2 commit 919d3d80b4f6e46171c888f11cf576f9494791b6 @paulmillr committed Mar 19, 2015
Showing with 14 additions and 14 deletions.
  1. +6 −6 home/.zshrc.sh
  2. +7 −7 sublime/Packages/User/Preferences.sublime-settings
  3. +1 −1 terminal/startup.sh
View
@@ -33,9 +33,6 @@ alias lint=jshint
# Faster NPM for europeans.
alias npme='npm --registry http://registry.npmjs.eu'
-# Useful global aliases.
-alias -g 'GR'='| grep -i'
-
# Some OS X-only stuff.
if [[ "$OSTYPE" == darwin* ]]; then
# Short-cuts for copy-paste.
@@ -98,6 +95,8 @@ function gcp() {
}
alias gcl='git clone'
alias gch='git checkout'
+alias gbr='git branch'
+alias gbrd='git branch -D'
alias gl='git log --no-merges'
# own git workflow in hy origin with Tower
alias gsync='git pull origin master && git push hy master'
@@ -108,8 +107,6 @@ alias gsync='git pull origin master && git push hy master'
# Brunch.
alias bb='brunch build'
alias bbp='brunch build --production'
-alias dbb="DEBUG='brunch:*' brunch build"
-alias dbw="DEBUG='brunch:*' brunch watch"
alias bw='brunch watch'
alias bws='brunch watch --server'
@@ -119,11 +116,14 @@ alias bis='bower install --save'
alias ni='npm install'
alias nis='npm install --save'
alias nibi='npm install && bower install'
+alias nibir='rm -rf {bower_components,node_modules} && npm install && bower install'
+alias ns='npm search'
alias jk='jekyll serve --watch' # lol jk
alias serve='python -m SimpleHTTPServer'
# Ruby.
+alias bx='bundle exec'
alias bex='bundle exec'
# Nginx short-cuts.
@@ -197,7 +197,7 @@ alias e=edit
# Execute commands for each file in current directory.
function each() {
for dir in *; do
- echo "${dir}:"
+ # echo "${dir}:"
cd $dir
$@
cd ..
@@ -1,12 +1,11 @@
{
"bold_folder_labels": true,
- "color_scheme": "Packages/Theme - Brogrammer/brogrammer.tmTheme",
+ "color_scheme": "Packages/Seti_UI/Scheme/Seti.tmTheme",
"ensure_newline_at_eof_on_save": true,
"file_exclude_patterns":
[
".DS_Store",
- "*.map",
- "*.min.js"
+ "*.map"
],
"fold_buttons": false,
"folder_exclude_patterns":
@@ -16,18 +15,19 @@
"tmp",
"node_modules"
],
- "font_face": "Source Code Pro",
+ "font_face": "Input Serif",
"font_size": 13,
- "highlight_line": false,
+ "highlight_line": true,
"highlight_modified_tabs": true,
"ignored_packages":
[
"Vintage"
],
+ "line_numbers": false,
"save_on_focus_lost": false,
- "side_bar_width": 210,
+ "side_bar_width": 220,
"tab_size": 2,
- "theme": "Brogrammer.sublime-theme",
+ "theme": "Tech49.sublime-theme",
"translate_tabs_to_spaces": true,
"trim_trailing_white_space_on_save": true,
"word_wrap": true
View
@@ -372,7 +372,7 @@ alias ln='nocorrect ln'
alias man='nocorrect man'
alias mkdir='nocorrect mkdir'
alias mv='nocorrect mv'
-alias mysql='nocorrect mysql'
+# alias mysql='nocorrect mysql'
alias rm='nocorrect rm'
# Disable globbing.

0 comments on commit 919d3d8

Please sign in to comment.