Updates

install/cli-tools.sh

@@ -8,10 +8,18 @@ brew install git-flow
 brew install git-ftp
 brew install imagemagick
 brew install mariadb
+brew install mkcert 
+brew install nss
 brew install mozjpeg
-brew install nginx
+brew install httpd
+brew install dnsmasq
 brew install openssl
 brew install php
 brew install ripgrep
 brew install youtube-dl
 
+# dnsmasq
+echo 'address=/.localhost/127.0.0.1' > /usr/local/etc/dnsmasq.conf
+sudo brew services start dnsmasq
+sudo mkdir -v /etc/resolver
+sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/localhost'

install/node.sh

@@ -13,7 +13,6 @@ npm install -g jsonlint
 npm install -g neovim
 npm install -g npm-check-updates
 npm install -g prettier
-npm install -g @prettier/plugin-php
 npm install -g pure-prompt
 npm install -g sass-lint
 npm install -g trash-cli

install/software.sh

@@ -17,9 +17,11 @@ brew cask install imagealpha
 brew cask install imageoptim
 brew cask install kap
 brew cask install karabiner-elements
+brew cask install libreoffice
 brew cask install ngrok
 brew cask install qlcolorcode
 brew cask install qlstephen
+brew cask install selfcontrol
 brew cask install sequel-pro
 brew cask install signal
 brew cask install sketch

nvim/plugins.vim

@@ -46,7 +46,6 @@ let g:ale_fixers = {
   \ 'json': ['prettier'],
   \ 'jsx': ['prettier'],
   \ 'markdown': ['prettier'],
-  \ 'php': ['prettier'],
   \ 'scss': ['prettier'],
   \ 'yaml': ['prettier'],
 \}

zsh/aliases

@@ -66,10 +66,6 @@ alias np="npm run production"
 alias npmre='rm -f package-lock.json && rm -rf node_modules && npm install'
 alias yre='rm -f yarn.lock && rm -rf node_modules && yarn'
 
-# easy hosts / apache / php editing
-alias hosts='sudo $EDITOR /etc/hosts'
-alias vhosts='$EDITOR /usr/local/etc/nginx/servers/'
-
 # often used folder shortcuts
 alias web='cd ~/Sites && ls'
 alias rep='cd ~/Repositories && ls'

zsh/zsh-syntax-highlighting

@@ -1 +1 @@
-Subproject commit 2f3b98ff6f94ed1b205e8c47d4dc54e6097eacf4
+Subproject commit 809443f5c5232c89536e7d7a585f7e3976d43475