diff --git a/dots/.bash/aliases b/dots/.bash/aliases index a3a694b..3be2986 100644 --- a/dots/.bash/aliases +++ b/dots/.bash/aliases @@ -33,12 +33,13 @@ alias la="ls -la" # ------------------------------------------------------------------------------ alias desk='cd ~/Desktop' -alias code='cd ~/Code' +alias dev='cd ~/Code' alias hosts='subl /etc/hosts' alias showFiles='defaults write com.apple.finder AppleShowAllFiles YES; killall Finder /System/Library/CoreServices/Finder.app' alias hideFiles='defaults write com.apple.finder AppleShowAllFiles NO; killall Finder /System/Library/CoreServices/Finder.app' +alias nodemods='cd /usr/local/lib/node_modules' # Git @@ -50,12 +51,16 @@ alias gd="git diff" alias gr="git rm" alias gs="git status" alias gco="git checkout" +alias gcm="git checkout master" alias gpl="git pull" alias gph="git push" +alias gl="git log --pretty=oneline" -# Laravel +# Misc # ------------------------------------------------------------------------------ alias homestead='function __homestead() { (cd ~/Code/homestead && vagrant $*); unset -f __homestead; }; __homestead' + +alias server='php -S localhost:1982' diff --git a/dots/.bash/exports b/dots/.bash/exports index dfc82bb..8e96f62 100644 --- a/dots/.bash/exports +++ b/dots/.bash/exports @@ -3,15 +3,23 @@ # ------------------------------------------------------------------------------ # Exports # ------------------------------------------------------------------------------ +export PATH=/usr/local/sbin:$PATH +# @todo investigate why running source ~/.bash_profile does not take into account +# updates made to $PATH. +export PATH=/usr/local/opt/node@14/bin:$PATH # PATH # ------------------------------------------------------------------------------ -export PATH=$(brew --prefix coreutils)/libexec/gnubin:$PATH +# @see https://github.com/Homebrew/legacy-homebrew/issues/19238 +# @see https://apple.stackexchange.com/questions/69223/how-to-replace-mac-os-x-utilities-with-gnu-core-utilities +# export PATH=$(brew --prefix coreutils)/libexec/gnubin:$PATH # MANPATH # ------------------------------------------------------------------------------ -export MANPATH=$(brew --prefix coreutils)/libexec/gnuman:$MANPATH +# @see https://github.com/Homebrew/legacy-homebrew/issues/19238 +# @see https://apple.stackexchange.com/questions/69223/how-to-replace-mac-os-x-utilities-with-gnu-core-utilities +# export MANPATH=$(brew --prefix coreutils)/libexec/gnuman:$MANPATH diff --git a/dots/.gitconfig b/dots/.gitconfig index fcc688a..7028cb9 100644 --- a/dots/.gitconfig +++ b/dots/.gitconfig @@ -8,15 +8,23 @@ co = checkout [user] - name = Diego Lorenzo - email = diego@diegolorenzo.com + name = Diego Lorenzo + email = diego@diegolorenzo.com [color] ui = true [core] excludesfile = ~/.gitignore + editor = /usr/bin/vim [push] default = simple - \ No newline at end of file + +[filter "lfs"] + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f +[pull] + rebase = false diff --git a/sublime/settings/Package Control.sublime-settings b/sublime/settings/Package Control.sublime-settings index bda4ba5..89049da 100644 --- a/sublime/settings/Package Control.sublime-settings +++ b/sublime/settings/Package Control.sublime-settings @@ -10,11 +10,17 @@ "DocBlockr", "EditorConfig", "Emmet", + "GitGutter", + "GraphQL", + "Jade", + "JsPrettier", "Laravel Blade Highlighter", "MarkdownEditing", "Origami", "Package Control", "PHP Companion", + "PlainTasks", + "Pretty JSON", "Sass", "SublimeLinter", "SublimeLinter-html-tidy", diff --git a/sublime/settings/Preferences.sublime-settings b/sublime/settings/Preferences.sublime-settings index 53b7caf..a5f34e0 100644 --- a/sublime/settings/Preferences.sublime-settings +++ b/sublime/settings/Preferences.sublime-settings @@ -3,13 +3,16 @@ "caret_style": "phase", "color_scheme": "Packages/User/SublimeLinter/Twilight (SL).tmTheme", "disable_tab_abbreviations": true, + "ensure_newline_at_eof_on_save": true, "fade_fold_buttons": true, "fold_buttons": true, + "font_size": 17, "gutter": true, "highlight_line": true, "ignored_packages": [ "Markdown", + "Pretty JSON", "Vintage" ], "indent_guide_options":