Skip to content

Commit 45e7a79

Browse files
authored
Merge pull request #120 from atomantic/new_hosts
adding new stevenblack hosts
2 parents 2d3d2f5 + cca52b9 commit 45e7a79

9 files changed

Lines changed: 61 additions & 12138 deletions

File tree

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ homedir/.vim/temp/*
1616
homedir/.vim/.netrwhist
1717
homedir/.vim/bundle/*
1818
!homedir/.vim/bundle/.gitignore
19-
!homedir/.vim/bundle/Vundle.vim
19+
!homedir/.vim/bundle/Vundle.vim
20+
configs/hosts.local
21+
stevenblack-hosts/myhosts
22+
stevenblack-hosts/whitelist
23+
stevenblack-hosts/blacklist

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "homedir/.vim/bundle/Vundle.vim"]
88
path = homedir/.vim/bundle/Vundle.vim
99
url = https://github.com/VundleVim/Vundle.vim.git
10+
[submodule "stevenblack-hosts"]
11+
path = stevenblack-hosts
12+
url = https://github.com/StevenBlack/hosts.git

HISTORY.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
22
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
33

4-
**Table of Contents** _generated with [DocToc](https://github.com/thlorenz/doctoc)_
5-
64
- [Release History](#release-history)
5+
- [v6.1.0](#v610)
6+
- [v6.0.1](#v601)
77
- [v5.12.0](#v5120)
8-
- [v5.2.0](#v520)
98
- [v5.1.0](#v510)
109
- [v5.0.0](#v500)
1110
- [v4.4.2](#v442)
@@ -31,6 +30,22 @@
3130

3231
# Release History
3332

33+
## v6.1.0
34+
35+
- use the [StevenBlack/hosts](https://github.com/StevenBlack/hosts) project to manage `/etc/hosts`
36+
- allow local host overrides via `./configs/hosts.local`
37+
38+
## v6.0.1
39+
40+
- fix brew require (font installs)
41+
- remove sleep at 24 hours instead of 1 hour (use macos default)
42+
- remove wallpaper feature
43+
- update /etc/hosts file with curl
44+
- using new macos tools for configs (e.g. sysadminctl)
45+
- remove bluetooth audio tweaks (let apple figure that out)
46+
- convert node.js installer to ESM to support latest module deps
47+
- removed a bunch of old settings that are no longer needed or useful
48+
3449
## v5.12.0
3550

3651
- no more Ruby (`git-up` is now a gitconfig alias: `git up` that equates to `git pull --autostash --rebase`)
@@ -56,7 +71,7 @@
5671
- replace `NERDtree` in vim with `netrw`
5772
- add spell check to `vim`
5873
- fix package installs (run in series to prevent homebrew from stepping on itself in parallel)
59-
- update /etc/hosts file from someonewhocares.org
74+
- build /etc/hosts file using stevenblack-hosts
6075

6176
## v4.4.2
6277

@@ -75,7 +90,7 @@
7590
- install node stable (rather than old 4.x.x version)
7691
- make gitshots optional (and only install `imagesnap` and `imagemagick` if this is on)
7792
- fix passwordless sudo for Sierra (optional)
78-
- prompt to overwrite /etc/hosts with someonewhocares.org hosts file (saved in ./configs/hosts in this project)
93+
- prompt to overwrite /etc/hosts with someonewhocares.org hosts file
7994
- fix default wallpaper in Sierra (Sierra 2)
8095
- remove sudden motion disable (already disabled: https://github.com/mathiasbynens/dotfiles/pull/755/files)
8196
- no longer setting hibernation mode to 0 (leaving default 3): https://github.com/mathiasbynens/dotfiles/commit/a3f91f67e07b6b31760b52320e0e890f93ff4e97#commitcomment-20715991

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ You don't need to install or configure anything upfront! This works with a brand
3030
- [Dashboard, iCal, TextEdit, and Disk Utility](#dashboard-ical-textedit-and-disk-utility)
3131
- [Mac App Store](#mac-app-store)
3232
- [Messages](#messages)
33-
- [SizeUp.app](#sizeupapp)
3433
- [Software Installation](#software-installation)
35-
- [Utilities](#utilities)
36-
- [Apps](#apps)
37-
- [NPM Global Modules](#npm-global-modules)
3834
- [License](#license)
3935
- [Contributions](#contributions)
4036
- [Loathing, Mehs and Praise](#loathing-mehs-and-praise)
@@ -137,7 +133,7 @@ Here is the current list:
137133
The following will only happen if you agree on the prompt
138134

139135
- install a gitshots script to take a photo using your camera on every git commit (these go in as a post-commit hook to your .git_template)
140-
- overwrite your /etc/hosts file with a copy from someonewhocares.org (see ./configs/hosts for the file that will be used)
136+
- overwrite your /etc/hosts file using the [StevenBlack/hosts](https://github.com/StevenBlack/hosts) project. Add custom entries in `./configs/hosts.local`.
141137

142138
## Security
143139

0 commit comments

Comments
 (0)