From 04b05dafd479807b020eff0b4d648d2396b83f98 Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Tue, 23 Feb 2016 15:04:33 +0500 Subject: [PATCH 01/38] ignore .idea --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5980f7d01..b534fd0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.idea + # Compiled Python files *.pyc @@ -21,4 +23,4 @@ Thumbs.db .aws/ # Repo scratch directory -scratch/ \ No newline at end of file +scratch/ From 4ee08e0972ba792be36e941c567ce75f8127616c Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Tue, 23 Feb 2016 15:17:14 +0500 Subject: [PATCH 02/38] 4 space config for *.py files (pep8) --- .editorconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.editorconfig b/.editorconfig index bec755324..b11bfeb3f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,3 +6,8 @@ indent_style = tab end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true + +# 4 space indentation +[*.py] +indent_style = space +indent_size = 4 From 616c50776d5469d4464739f09d0c28ecaae773f0 Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Tue, 23 Feb 2016 15:23:59 +0500 Subject: [PATCH 03/38] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b534fd0dd..67d77cdcf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# IntelliJ IDEA IDE .idea # Compiled Python files From 281111c6457d9379c48a979f867ed4558df3a518 Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Tue, 23 Feb 2016 15:24:30 +0500 Subject: [PATCH 04/38] Update .editorconfig --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index b11bfeb3f..cd1adc20b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -# 4 space indentation +# 4 space indentation (pep8) [*.py] indent_style = space indent_size = 4 From 72379752c614f79c26ca6021e82bed4c5f5dc194 Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Tue, 23 Feb 2016 15:25:45 +0500 Subject: [PATCH 05/38] .editorconfig for Makefile --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index cd1adc20b..c7c113da8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,3 +11,6 @@ trim_trailing_whitespace = true [*.py] indent_style = space indent_size = 4 + +[Makefile] +indent_style = tab From 219c539d057c1b79639b95a54cfa87ebef2b3827 Mon Sep 17 00:00:00 2001 From: Roy Abou Assaly Date: Mon, 18 Apr 2016 23:10:13 -0400 Subject: [PATCH 06/38] Fix typo in README.md In the iTerm2 section (https://github.com/donnemartin/dev-setup#iterm2), where it says: $ curl -O https://raw.githubusercontent.com/donnemartin/mac-dev-setup/master/.alia ses should be: $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.aliases --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bb5209b4..40d581462 100644 --- a/README.md +++ b/README.md @@ -569,7 +569,7 @@ We'll come back to the details of that later, but for now, just download the fil $ cd ~ $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_profile $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_prompt - $ curl -O https://raw.githubusercontent.com/donnemartin/mac-dev-setup/master/.aliases + $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.aliases With that, open a new terminal tab (Cmd+T) and see the change! Try the list commands: `ls`, `ls -lh` (aliased to `ll`), `ls -lha` (aliased to `la`). From 457317d159e81e92bd9dd94e80b68b38f4fac668 Mon Sep 17 00:00:00 2001 From: David Portabella Date: Sun, 29 May 2016 01:22:43 +0200 Subject: [PATCH 07/38] fix pydata.sh. pip install virtualenv failed if PIP_REQUIRE_VIRTUALENV was true --- pydata.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pydata.sh b/pydata.sh index 1cd8faa18..169f9214b 100755 --- a/pydata.sh +++ b/pydata.sh @@ -20,6 +20,8 @@ echo "------------------------------" echo "Setting up virtual environments." # Install virtual environments globally +# It fails to install virtualenv if PIP_REQUIRE_VIRTUALENV was true +export PIP_REQUIRE_VIRTUALENV=false pip install virtualenv pip install virtualenvwrapper From 3af5ef6657a12547f72744f1683020954befb8f0 Mon Sep 17 00:00:00 2001 From: David Portabella Date: Sun, 29 May 2016 01:44:25 +0200 Subject: [PATCH 08/38] fix pydata.sh. create ~/.ipython directory if it does not exist --- pydata.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pydata.sh b/pydata.sh index 169f9214b..ebdb710d4 100755 --- a/pydata.sh +++ b/pydata.sh @@ -101,6 +101,7 @@ echo "------------------------------" echo "Installing IPython Notebook Default Profile" # Add the IPython profile +mkdir -p ~/.ipython cp -r init/profile_default/ ~/.ipython/profile_default echo "------------------------------" From 3193c3c3fe9ddf20810701130c755b925c44cbfc Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 06:54:31 -0400 Subject: [PATCH 09/38] Enable Sublime Text hot exit --- init/Preferences.sublime-settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Preferences.sublime-settings b/init/Preferences.sublime-settings index 39587d4ae..1546ce5c4 100644 --- a/init/Preferences.sublime-settings +++ b/init/Preferences.sublime-settings @@ -23,7 +23,7 @@ "font_face": "Monaco", "font_size": 10, "highlight_modified_tabs": true, - "hot_exit": false, + "hot_exit": true, "line_padding_bottom": 5, "match_brackets": true, "match_brackets_angle": true, From bc40d9621cb06e63600f470e0d3b9f13cca6f566 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 06:54:54 -0400 Subject: [PATCH 10/38] Set Sublime Text theme to Soda Dark --- init/Preferences.sublime-settings | 1 + 1 file changed, 1 insertion(+) diff --git a/init/Preferences.sublime-settings b/init/Preferences.sublime-settings index 1546ce5c4..3cf4cede3 100644 --- a/init/Preferences.sublime-settings +++ b/init/Preferences.sublime-settings @@ -35,6 +35,7 @@ "show_encoding": true, "show_line_endings": true, "tab_size": 4, + "theme": "Soda Dark 3.sublime-theme", "translate_tabs_to_spaces": true, "trim_trailing_white_space_on_save": true, "word_wrap": true From 26dcbb99bc6f2c5eb5a8d724b4d88fc4ce2ebf13 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:16:47 -0400 Subject: [PATCH 11/38] Rework iTerm2 guide Most of the described manual changes are done automatically through the setup scripts --- README.md | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 40d581462..c7f455b76 100644 --- a/README.md +++ b/README.md @@ -541,9 +541,7 @@ In Finder, drag and drop the iTerm Application file into the Applications folder You can now launch iTerm, through the Launchpad for instance. -Let's just quickly change some preferences. In iTerm > Preferences..., under the tab General, uncheck Confirm closing multiple sessions and Confirm "Quit iTerm2 (Cmd+Q)" command under the section Closing. - -In the tab Profiles, create a new one with the "+" icon, and rename it to your first name for example. Then, select Other Actions... > Set as Default. Under the section Window, change the size to something better, like Columns: 125 and Rows: 35. I also like to set General > Working Directory > Reuse previous session's directory. Finally, I change the wy the option key works so that I can quickly jump between words as described [here](https://coderwall.com/p/h6yfda/use-and-to-jump-forwards-backwards-words-in-iterm-2-on-os-x). +Let's just quickly change some preferences. In iTerm > Preferences..., in the tab Profiles, create a new one with the "+" icon, and rename it to your first name for example. Then, select Other Actions... > Set as Default. Under the section Window, change the size to something better, like Columns: 125 and Rows: 35. I also like to set General > Working Directory > Reuse previous session's directory. Finally, I change the way the option key works so that I can quickly jump between words as described [here](https://coderwall.com/p/h6yfda/use-and-to-jump-forwards-backwards-words-in-iterm-2-on-os-x). When done, hit the red "X" in the upper left (saving is automatic in OS X preference panes). Close the window and open a new one to see the size change. @@ -551,27 +549,9 @@ When done, hit the red "X" in the upper left (saving is automatic in OS X prefer Since we spend so much time in the terminal, we should try to make it a more pleasant and colorful place. What follows might seem like a lot of work, but trust me, it'll make the development experience so much better. -Let's go ahead and start by changing the font. In **iTerm > Preferences...**, under the tab **Profiles**, section **Text**, change both fonts to **Consolas 13pt**. - Now let's add some color. I'm a big fan of the [Solarized](http://ethanschoonover.com/solarized) color scheme. It is supposed to be scientifically optimal for the eyes. I just find it pretty. -Scroll down the page and download the latest version. Unzip the archive. In it you will find the `iterm2-colors-solarized` folder with a `README.md` file, but I will just walk you through it here: - -- In **iTerm2 Preferences**, under **Profiles** and **Colors**, go to **Load Presets... > Import...**, find and open the two **.itermcolors** files we downloaded. -- Go back to **Load Presets...** and select **Solarized Dark** to activate it. Voila! - -**Note**: You don't have to do this, but there is one color in the **Solarized Dark** preset I don't agree with, which is *Bright Black*. You'll notice it's too close to *Black*. So I change it to be the same as *Bright Yellow*, i.e. **R 83 G 104 B 112**. - -Not a lot of colors yet. We need to tweak a little bit our Unix user's profile for that. This is done (on OS X and Linux), in the `~/.bash_profile` text file (`~` stands for the user's home directory). - -We'll come back to the details of that later, but for now, just download the files [.bash_profile](https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_profile), [.bash_prompt](https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_prompt), [.aliases](https://raw.githubusercontent.com/donnemartin/dev-setup/master/.aliases) attached to this document into your home directory (`.bash_profile` is the one that gets loaded, I've set it up to call the others): - - $ cd ~ - $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_profile - $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.bash_prompt - $ curl -O https://raw.githubusercontent.com/donnemartin/dev-setup/master/.aliases - -With that, open a new terminal tab (Cmd+T) and see the change! Try the list commands: `ls`, `ls -lh` (aliased to `ll`), `ls -lha` (aliased to `la`). +- In **iTerm2 Preferences**, under **Profiles** and **Colors**, go to **Load Presets...** and select **Solarized Dark** to activate it. Voila! At this point you can also change your computer's name, which shows up in this terminal prompt. If you want to do so, go to **System Preferences** > **Sharing**. For example, I changed mine from "Donne's MacBook Pro" to just "MacBook Pro", so it shows up as `MacBook-Pro` in the terminal. From b43a49c00140b75f38d7f513f77c105e6729f458 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:17:05 -0400 Subject: [PATCH 12/38] Add note about testing on OS X 10.11 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7f455b76..023b62358 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ This repo takes a more **light-weight** approach to automation using a combinati ## Section 1: Installation -**Scripts tested on OS X 10.10 Yosemite.** +**Scripts tested on OS X 10.10 Yosemite and 10.11 El Capitan.** * [Single Setup Script](#single-setup-script) * [bootstrap.sh script](#bootstrapsh-script) From 863c10315aecce1c9b80c372316bfa1c16a7e5b3 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:18:06 -0400 Subject: [PATCH 13/38] Add Sublime Text instructions to tweak the Monokai theme --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 023b62358..c40d7d88a 100644 --- a/README.md +++ b/README.md @@ -496,6 +496,23 @@ While inside the `Packages` directory, clone the theme repository using the comm "theme": "Soda Light 3.sublime-theme" } +##### Changing Monokai Comment Color + +Although Monokai is a great color scheme, I find that comments can be difficult to see. You can follow these [instructions](http://stackoverflow.com/a/32686509) to change the color of the default theme. + +I set my comments color to `#E6DB74`. + +``` + + ... + + foreground + #E6DB74 + + ... + +``` + ### Atom

From 2789cbb6952bfa7ff819c2d1d9c6cc55bae762f9 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:35:54 -0400 Subject: [PATCH 14/38] Set default screenshots loc to Pictures/Screenshots --- osx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx.sh b/osx.sh index 782cb349b..c7ceea755 100755 --- a/osx.sh +++ b/osx.sh @@ -214,8 +214,8 @@ defaults write com.apple.screensaver askForPasswordDelay -int 0 #defaults write com.apple.screencapture location -string "${HOME}/Desktop" # Save screenshots to the Pictures/Screenshots -#mkdir ${HOME}/Pictures/Screenshots -#defaults write com.apple.screencapture location -string "${HOME}/Pictures/Screenshots" +mkdir ${HOME}/Pictures/Screenshots +defaults write com.apple.screencapture location -string "${HOME}/Pictures/Screenshots" # Save screenshots in PNG format (other options: BMP, GIF, JPG, PDF, TIFF) defaults write com.apple.screencapture type -string "png" From 4e7e7309bf7078377b9eea8cb174c5bb75a425f7 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:37:24 -0400 Subject: [PATCH 15/38] Fix intellij-idea-ce brew install This formula was moved to caskroom/versions --- android.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android.sh b/android.sh index 52efdcca9..5bc8868e0 100755 --- a/android.sh +++ b/android.sh @@ -20,9 +20,10 @@ brew update # Install Cask brew install caskroom/cask/brew-cask +brew tap caskroom/versions brew cask install --appdir="~/Applications" java -brew cask install --appdir="~/Applications" intellij-idea-ce +brew cask install --appdir="~/Applications" Caskroom/versions/intellij-idea-ce brew cask install --appdir="~/Applications" android-studio brew install android-sdk From cad55cee9b43c7a8fcc45f291f5306229145d5f6 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:38:54 -0400 Subject: [PATCH 16/38] Fix #16: Enable web.sh from .dots --- .dots | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dots b/.dots index b4efd27ee..80966acc0 100755 --- a/.dots +++ b/.dots @@ -85,7 +85,7 @@ function runDots() { echo "Setting up JavaScript web development environment." echo "------------------------------" echo "" - #./webdev.sh # coming soon + ./webdev.sh fi if [ $ARG == "android" ] || [ $ARG == "all" ]; then # Run the android.sh Script From df1203037b885cfd58b1f5ecd0b116f652e93629 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:43:28 -0400 Subject: [PATCH 17/38] Remove duplicate install of heroku-toolbelt from brew.sh It's already installed earlier in the process. --- brew.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/brew.sh b/brew.sh index 13cae6ba9..c2938da06 100755 --- a/brew.sh +++ b/brew.sh @@ -149,7 +149,6 @@ brew cask install --appdir="/Applications" sublime-text3 brew cask install --appdir="/Applications" atom brew cask install --appdir="/Applications" virtualbox brew cask install --appdir="/Applications" vagrant -brew cask install --appdir="/Applications" heroku-toolbelt brew cask install --appdir="/Applications" macdown # Misc casks From 4083adcf1e79e81a76a5e7666fda17aeb94842c1 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:43:50 -0400 Subject: [PATCH 18/38] Add 1password install to brew.sh --- brew.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/brew.sh b/brew.sh index c2938da06..f737da913 100755 --- a/brew.sh +++ b/brew.sh @@ -158,6 +158,7 @@ brew cask install --appdir="/Applications" skype brew cask install --appdir="/Applications" slack brew cask install --appdir="/Applications" dropbox brew cask install --appdir="/Applications" evernote +brew cask install --appdir="/Applications" 1password #brew cask install --appdir="/Applications" gimp #brew cask install --appdir="/Applications" inkscape From d5b86d803e12bcb3a01e307860edf538167a66d6 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:44:36 -0400 Subject: [PATCH 19/38] Tap caskroom/versions to properly install Sublime Text 3 in brew.sh --- brew.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/brew.sh b/brew.sh index f737da913..924a5de33 100755 --- a/brew.sh +++ b/brew.sh @@ -137,6 +137,7 @@ heroku update # Install Cask brew install caskroom/cask/brew-cask +brew tap caskroom/versions # Core casks brew cask install --appdir="/Applications" alfred From 206ea674df9b77e2b430b57833d437495b4ea9a1 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 11 Jun 2016 07:45:03 -0400 Subject: [PATCH 20/38] Update formula loc for xpdf in brew.sh --- brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brew.sh b/brew.sh index 924a5de33..9a349d11a 100755 --- a/brew.sh +++ b/brew.sh @@ -98,7 +98,7 @@ brew install tcpflow brew install tcpreplay brew install tcptrace brew install ucspi-tcp # `tcpserver` etc. -brew install xpdf +brew install homebrew/x11/xpdf brew install xz # Install other useful binaries. From 6fcd12a9960339e393d4adc3c4f5eb381dde0007 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Fri, 1 Jul 2016 05:43:07 -0400 Subject: [PATCH 21/38] Update contact info (#35) --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index c40d7d88a..a567ac150 100644 --- a/README.md +++ b/README.md @@ -1881,11 +1881,7 @@ See the [Credits Page](https://github.com/donnemartin/dev-setup/blob/master/CRED Feel free to contact me to discuss any issues, questions, or comments. -* Email: [donne.martin@gmail.com](mailto:donne.martin@gmail.com) -* Twitter: [@donne_martin](https://twitter.com/donne_martin) -* GitHub: [donnemartin](https://github.com/donnemartin) -* LinkedIn: [donnemartin](https://www.linkedin.com/in/donnemartin) -* Website: [donnemartin.com](http://donnemartin.com) +My contact info can be found on my [GitHub page](https://github.com/donnemartin). ### License From 1e8354c362a30c8c59a2ec3c76c27168e5821a3c Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sun, 24 Jul 2016 07:45:14 -0400 Subject: [PATCH 22/38] Add hub to brew.sh (#37) --- brew.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/brew.sh b/brew.sh index 9a349d11a..0678a1956 100755 --- a/brew.sh +++ b/brew.sh @@ -109,6 +109,7 @@ brew install git brew install git-lfs brew install git-flow brew install git-extras +brew install hub brew install imagemagick --with-webp brew install lua brew install lynx From 8d4d6c22a15ccebecdd1ba36dea607b7d19d652c Mon Sep 17 00:00:00 2001 From: Oscar Tanner Date: Wed, 10 Aug 2016 08:45:06 -0300 Subject: [PATCH 23/38] Remove duplicate word in README.md (#38) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a567ac150..6cf50b488 100644 --- a/README.md +++ b/README.md @@ -552,7 +552,7 @@ The [bootstrap.sh script](#bootstrapsh-script) and [osx.sh script](#osxsh-script

-I prefer iTerm2 over the stock Terminal, as it has some some additional [great features](https://www.iterm2.com/features.html). Download and install iTerm2 (the newest version, even if it says "beta release"). +I prefer iTerm2 over the stock Terminal, as it has some additional [great features](https://www.iterm2.com/features.html). Download and install iTerm2 (the newest version, even if it says "beta release"). In Finder, drag and drop the iTerm Application file into the Applications folder. From dd1f2d07171b8608662f426cef6403c4ff408de5 Mon Sep 17 00:00:00 2001 From: hronik1 Date: Mon, 17 Oct 2016 04:33:34 -0700 Subject: [PATCH 24/38] remove alfred link step which is no longer support, and change sublime-text3 to be sublime-text to reflect renaming (#43) --- brew.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/brew.sh b/brew.sh index 0678a1956..78318fc85 100755 --- a/brew.sh +++ b/brew.sh @@ -147,7 +147,7 @@ brew cask install --appdir="~/Applications" java brew cask install --appdir="~/Applications" xquartz # Development tool casks -brew cask install --appdir="/Applications" sublime-text3 +brew cask install --appdir="/Applications" sublime-text brew cask install --appdir="/Applications" atom brew cask install --appdir="/Applications" virtualbox brew cask install --appdir="/Applications" vagrant @@ -167,9 +167,6 @@ brew cask install --appdir="/Applications" 1password #Remove comment to install LaTeX distribution MacTeX #brew cask install --appdir="/Applications" mactex -# Link cask apps to Alfred -brew cask alfred link - # Install Docker, which requires virtualbox brew install docker brew install boot2docker From 194bd9d08bf278cedf787bf9f231f6d63a68d50f Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Fri, 28 Oct 2016 18:19:52 -0400 Subject: [PATCH 25/38] Set TextEdit tab width to 4 instead of the default 8 (#48) --- osx.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osx.sh b/osx.sh index c7ceea755..d2a921e40 100755 --- a/osx.sh +++ b/osx.sh @@ -689,6 +689,8 @@ defaults write com.apple.TextEdit RichText -int 0 # Open and save files as UTF-8 in TextEdit defaults write com.apple.TextEdit PlainTextEncoding -int 4 defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4 +# Set tab width to 4 instead of the default 8 +defaults write com.apple.TextEdit "TabWidth" '4' # Enable the debug menu in Disk Utility defaults write com.apple.DiskUtility DUDebugMenuEnabled -bool true From 79a09300e19946b42989aad5e46240f2a52c6d21 Mon Sep 17 00:00:00 2001 From: Mike Urich Date: Sun, 27 Nov 2016 08:36:26 -0500 Subject: [PATCH 26/38] Change webdev.sh to web.sh in .dots (#52) Fixes #51. --- .dots | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.dots b/.dots index 80966acc0..61103a9cd 100755 --- a/.dots +++ b/.dots @@ -79,13 +79,13 @@ function runDots() { echo "" ./datastores.sh fi - if [ $ARG == "webdev" ] || [ $ARG == "all" ]; then - # Run the webdev.sh Script + if [ $ARG == "web" ] || [ $ARG == "all" ]; then + # Run the web.sh Script echo "------------------------------" echo "Setting up JavaScript web development environment." echo "------------------------------" echo "" - ./webdev.sh + ./web.sh fi if [ $ARG == "android" ] || [ $ARG == "all" ]; then # Run the android.sh Script @@ -108,4 +108,4 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then runDots $@ fi; -unset runDots; \ No newline at end of file +unset runDots; From 30610914b81c7e638b86e740f62b0b2b303cf09f Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sat, 10 Dec 2016 06:12:41 -0500 Subject: [PATCH 27/38] Set SublimeText always_show_minimap_viewport to true (#54) --- init/Preferences.sublime-settings | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init/Preferences.sublime-settings b/init/Preferences.sublime-settings index 3cf4cede3..b76702689 100644 --- a/init/Preferences.sublime-settings +++ b/init/Preferences.sublime-settings @@ -38,5 +38,6 @@ "theme": "Soda Dark 3.sublime-theme", "translate_tabs_to_spaces": true, "trim_trailing_white_space_on_save": true, - "word_wrap": true + "word_wrap": true, + "always_show_minimap_viewport": true } From 423e609f94513531cbb1cf93666a6405e19d9721 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Thu, 11 May 2017 21:22:51 -0700 Subject: [PATCH 28/38] Add license disclaimer (#69) Clearly denote the repository license is from me, not my employer (Facebook). --- LICENSE | 2 ++ README.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/LICENSE b/LICENSE index d60c16af5..be7e0cf43 100644 --- a/LICENSE +++ b/LICENSE @@ -2,6 +2,8 @@ This repository contains a variety of content; some developed by Donne Martin, a The content developed by Donne Martin is distributed under the following license: +I am providing code and resources in this repository to you under an open source license. Because this is my personal repository, the license you receive to my code and resources is from me and not my employer (Facebook). + Copyright 2015 Donne Martin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/README.md b/README.md index 6cf50b488..ea1ce4a06 100644 --- a/README.md +++ b/README.md @@ -1889,6 +1889,8 @@ This repository contains a variety of content; some developed by Donne Martin, a The content developed by Donne Martin is distributed under the following license: +*I am providing code and resources in this repository to you under an open source license. Because this is my personal repository, the license you receive to my code and resources is from me and not my employer (Facebook).* + Copyright 2015 Donne Martin Licensed under the Apache License, Version 2.0 (the "License"); From ce4424e6baf9ffcd49aa91107c8d9ac42372d481 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Thu, 11 May 2017 21:36:56 -0700 Subject: [PATCH 29/38] Fix LICENSE line wrapping (#70) --- LICENSE | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index be7e0cf43..36ad24f8c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,12 @@ -This repository contains a variety of content; some developed by Donne Martin, and some from third-parties. The third-party content is distributed under the license provided by those parties. +This repository contains a variety of content; some developed by Donne Martin, +and some from third-parties. The third-party content is distributed under the +license provided by those parties. The content developed by Donne Martin is distributed under the following license: -I am providing code and resources in this repository to you under an open source license. Because this is my personal repository, the license you receive to my code and resources is from me and not my employer (Facebook). +I am providing code and resources in this repository to you under an open source +license. Because this is my personal repository, the license you receive to my +code and resources is from me and not my employer (Facebook). Copyright 2015 Donne Martin From bb3c6f1bbc2bcba2514517b87094f3e04fa6e646 Mon Sep 17 00:00:00 2001 From: Thor Date: Wed, 25 Oct 2017 03:20:15 +0200 Subject: [PATCH 30/38] Set blazingly fast keyboard repeat rate (#76) --- osx.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osx.sh b/osx.sh index d2a921e40..14cdfba54 100755 --- a/osx.sh +++ b/osx.sh @@ -185,7 +185,8 @@ defaults write com.apple.universalaccess closeViewZoomFollowsFocus -bool true defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false # Set a blazingly fast keyboard repeat rate -defaults write NSGlobalDomain KeyRepeat -int 0 +defaults write NSGlobalDomain KeyRepeat -int 1 +defaults write NSGlobalDomain InitialKeyRepeat -int 15 # Set language and text formats #defaults write NSGlobalDomain AppleLanguages -array "en" From cfd1e62e0c9730ff74b340234072f315581abf0f Mon Sep 17 00:00:00 2001 From: Thor Date: Sun, 18 Mar 2018 13:44:40 +0100 Subject: [PATCH 31/38] Remove redundant cask install from brew.sh (#74) --- brew.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/brew.sh b/brew.sh index 78318fc85..22a64c4f5 100755 --- a/brew.sh +++ b/brew.sh @@ -136,10 +136,6 @@ brew link libxslt --force brew install heroku-toolbelt heroku update -# Install Cask -brew install caskroom/cask/brew-cask -brew tap caskroom/versions - # Core casks brew cask install --appdir="/Applications" alfred brew cask install --appdir="~/Applications" iterm2 From 7f81c58ead6bf9a5f714e73bd1296b865d08ff57 Mon Sep 17 00:00:00 2001 From: Thor Date: Sun, 18 Mar 2018 13:45:49 +0100 Subject: [PATCH 32/38] Remove redundant cask install from android.sh (#75) --- android.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/android.sh b/android.sh index 5bc8868e0..a646696b9 100755 --- a/android.sh +++ b/android.sh @@ -18,12 +18,8 @@ fi # Make sure we’re using the latest Homebrew. brew update -# Install Cask -brew install caskroom/cask/brew-cask -brew tap caskroom/versions - brew cask install --appdir="~/Applications" java -brew cask install --appdir="~/Applications" Caskroom/versions/intellij-idea-ce +brew cask install --appdir="~/Applications" intellij-idea-ce brew cask install --appdir="~/Applications" android-studio brew install android-sdk From 4193cf96450440975f6d7147b11d9ec4f3fb0ae3 Mon Sep 17 00:00:00 2001 From: Erik <43416374+errrrk@users.noreply.github.com> Date: Sun, 10 Feb 2019 12:14:00 +0100 Subject: [PATCH 33/38] Replace betterzipql with betterzip (#92) The BetterZipQL plugin was integrated with BetterZip. --- brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brew.sh b/brew.sh index 22a64c4f5..78af4a34f 100755 --- a/brew.sh +++ b/brew.sh @@ -168,7 +168,7 @@ brew install docker brew install boot2docker # Install developer friendly quick look plugins; see https://github.com/sindresorhus/quick-look-plugins -brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzipql qlimagesize webpquicklook suspicious-package +brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package # Remove outdated versions from the cellar. brew cleanup From 52df4ed8171bc5a2df951acd6a2bf2c8d14a27ba Mon Sep 17 00:00:00 2001 From: Erik <43416374+errrrk@users.noreply.github.com> Date: Sun, 10 Feb 2019 12:16:45 +0100 Subject: [PATCH 34/38] Install Heroku CLI from heroku/brew/heroku (#93) --- brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brew.sh b/brew.sh index 78af4a34f..5f4f16ed8 100755 --- a/brew.sh +++ b/brew.sh @@ -133,7 +133,7 @@ brew link libxml2 --force brew link libxslt --force # Install Heroku -brew install heroku-toolbelt +brew install heroku/brew/heroku heroku update # Core casks From 16d4f1cb1496f1a60d87e942e405a51d4c0b1370 Mon Sep 17 00:00:00 2001 From: George Zhang Date: Sun, 10 Feb 2019 19:23:47 +0800 Subject: [PATCH 35/38] Update list of Quick Look plugins (#77) --- brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brew.sh b/brew.sh index 5f4f16ed8..6a5d547c8 100755 --- a/brew.sh +++ b/brew.sh @@ -168,7 +168,7 @@ brew install docker brew install boot2docker # Install developer friendly quick look plugins; see https://github.com/sindresorhus/quick-look-plugins -brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package +brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package quicklookase qlvideo # Remove outdated versions from the cellar. brew cleanup From 4bc1e95a2bf9253df11ca34b30f833b7953e3b39 Mon Sep 17 00:00:00 2001 From: Allan Date: Sun, 10 Feb 2019 13:38:12 +0200 Subject: [PATCH 36/38] Fix #84: Update softwareupdate verbose flag (#90) --- osxprep.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osxprep.sh b/osxprep.sh index 25f2301d6..d5f4d9a46 100755 --- a/osxprep.sh +++ b/osxprep.sh @@ -10,11 +10,11 @@ while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & echo "------------------------------" echo "Updating OSX. If this requires a restart, run the script again." # Install all available updates -sudo softwareupdate -iva +sudo softwareupdate -ia --verbose # Install only recommended available updates -#sudo softwareupdate -irv +#sudo softwareupdate -ir --verbose echo "------------------------------" echo "Installing Xcode Command Line Tools." # Install Xcode command line tools -xcode-select --install \ No newline at end of file +xcode-select --install From 1878427a1ba46bcf5dcb2052a7cdf3258a5a12b7 Mon Sep 17 00:00:00 2001 From: Jason Moody Date: Tue, 12 Feb 2019 04:58:50 -0600 Subject: [PATCH 37/38] Fix grammar in .dots script (#87) --- .dots | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dots b/.dots index 61103a9cd..5b5970a94 100755 --- a/.dots +++ b/.dots @@ -35,7 +35,7 @@ function runDots() { echo "" echo "------------------------------" echo "Installing Homebrew along with some common formulae and apps." - echo "This might awhile to complete, as some formulae need to be installed from source." + echo "This might take a while to complete, as some formulae need to be installed from source." echo "------------------------------" echo "" ./brew.sh From d86102d761afa5cc1853078200b844212f99e234 Mon Sep 17 00:00:00 2001 From: Etty Date: Sat, 13 Apr 2019 17:53:03 +0200 Subject: [PATCH 38/38] Remove deprecated brew commands (#98) @estyxx thank you! --- brew.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/brew.sh b/brew.sh index 6a5d547c8..2f8a7136f 100755 --- a/brew.sh +++ b/brew.sh @@ -31,10 +31,9 @@ brew install moreutils # Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed. brew install findutils # Install GNU `sed`, overwriting the built-in `sed`. -brew install gnu-sed --with-default-names +brew install gnu-sed # Install Bash 4. brew install bash -brew tap homebrew/versions brew install bash-completion2 # We installed the new shell, now we have to activate it echo "Adding the newly installed shell to the list of allowed shells"