From 699645bd1bfeb0353ba46f29eb8f0b2c3407c33e Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sun, 19 Jun 2016 15:09:02 +0100 Subject: [PATCH] delete unused things --- .gitmodules | 3 - ack/ackrc.symlink | 21 ---- applescripts/mail.scpt | 65 ---------- applescripts/tunes.scpt | 13 -- bin/battery_indicator.sh | 26 ---- git/hooks/jscs.pre-commit | 37 ------ git/hooks/jshint.pre-commit | 37 ------ install/brew.sh | 36 ------ install/nginx.sh | 42 ------- install/osx.sh | 210 --------------------------------- jscsrc.symlink | 68 ----------- jshintrc.symlink | 68 ----------- nginx/dnsmasq.conf | 1 - nginx/nginx.conf | 121 ------------------- nginx/sites-available/code.dev | 34 ------ 15 files changed, 782 deletions(-) delete mode 100644 .gitmodules delete mode 100644 ack/ackrc.symlink delete mode 100755 applescripts/mail.scpt delete mode 100755 applescripts/tunes.scpt delete mode 100755 bin/battery_indicator.sh delete mode 100755 git/hooks/jscs.pre-commit delete mode 100755 git/hooks/jshint.pre-commit delete mode 100755 install/brew.sh delete mode 100755 install/nginx.sh delete mode 100755 install/osx.sh delete mode 100644 jscsrc.symlink delete mode 100644 jshintrc.symlink delete mode 100644 nginx/dnsmasq.conf delete mode 100644 nginx/nginx.conf delete mode 100755 nginx/sites-available/code.dev diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b3c977d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule ".config/base16-shell"] - path = .config/base16-shell - url = git@github.com:chriskempson/base16-shell.git diff --git a/ack/ackrc.symlink b/ack/ackrc.symlink deleted file mode 100644 index 4b80e62..0000000 --- a/ack/ackrc.symlink +++ /dev/null @@ -1,21 +0,0 @@ -# General ack Settings -########################################################## - -# only search with case-sensitivity if there is mixed case ---smart-case -# follow symlinks ---follow - -# ignore directories ---ignore-dir=node_modules - -# added file types ---type-set=css=.css,.less,.scss,.styl ---type-set=styl=.styl ---type-set=less=.less ---type-set=html=.html,.mustache,.handlebars,.tmpl ---type-set=json=.json ---type-set=md=.markdown,.md ---type-set=svg=.svg ---type-set=ts=.ts ---type-set=style=.scss,.sass,.styl,.less,.css diff --git a/applescripts/mail.scpt b/applescripts/mail.scpt deleted file mode 100755 index d18d753..0000000 --- a/applescripts/mail.scpt +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/osascript -property defaultAccount : "Pollen" -property defaultMailbox : "INBOX" - -on run args - set justUnread to false - set theAccount to missing value - set theMailbox to missing value - - if defaultAccount = missing value then set defaultAccount to "-g" - if defaultMailbox = missing value then set defaultMailbox to "INBOX" - - set theCount to the count of args - - if theCount > 0 then - if item 1 of args = "-u" then - set justUnread to true - set theCount to theCount - 1 - set args to the rest of args - else if item 1 of args = "-ug" or item 1 of args = "-gu" then - set justUnread to true - set item 1 of args to "-g" - else if theCount > 1 and ¬ - item 1 of args = "-g" and item 2 of args = "-u" then - set justUnread to true - set theCount to theCount - 1 - set args to the rest of args - set item 1 of args to "-g" - end if - end if - - tell application "Mail" - if theCount = 0 then - set theAccount to defaultAccount - set theMailbox to defaultMailbox - else if theCount = 1 then - set theAccount to item 1 of args - set theMailbox to defaultMailbox - else if theCount = 2 then - set theAccount to item 1 of args - set theMailbox to item 2 of args - else - error character id 10 ¬ - & "Usage: inbox-count [-u] [[account] mailbox]" & character id 10 ¬ - & " inbox-count [-u] -g [mailbox]" - end if - - set mailboxValue to missing value - if theAccount = "-g" then - if theMailbox = "INBOX" then - set mailboxValue to inbox - else - set mailboxValue to mailbox theMailbox - end if - else - set mailboxValue to mailbox theMailbox of account theAccount - end if - - if justUnread then - return the unread count of mailboxValue - else - return the count of messages of mailboxValue - end if - end tell -end run diff --git a/applescripts/tunes.scpt b/applescripts/tunes.scpt deleted file mode 100755 index 56ff428..0000000 --- a/applescripts/tunes.scpt +++ /dev/null @@ -1,13 +0,0 @@ -(* Get the current song from iTunes or Spotify *) -if application "iTunes" is running then - tell application "iTunes" - if exists current track then - set theName to the name of the current track - set theArtist to the artist of the current track - try - return "♫ " & theName & " - " & theArtist - on error err - end try - end if - end tell -end if diff --git a/bin/battery_indicator.sh b/bin/battery_indicator.sh deleted file mode 100755 index 202cffe..0000000 --- a/bin/battery_indicator.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# modified from http://ficate.com/blog/2012/10/15/battery-life-in-the-land-of-tmux/ - -HEART='♥ ' - -if [[ `uname` == 'Linux' ]]; then - current_charge=$(cat /proc/acpi/battery/BAT1/state | grep 'remaining capacity' | awk '{print $3}') - total_charge=$(cat /proc/acpi/battery/BAT1/info | grep 'last full capacity' | awk '{print $4}') -else - battery_info=`ioreg -rc AppleSmartBattery` - current_charge=$(echo $battery_info | grep -o '"CurrentCapacity" = [0-9]\+' | awk '{print $3}') - total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | awk '{print $3}') -fi - -charged_slots=$(echo "((($current_charge/$total_charge)*10)/3)+1" | bc -l | cut -d '.' -f 1) -if [[ $charged_slots -gt 3 ]]; then - charged_slots=3 -fi - -echo -n '#[fg=colour196]' -for i in `seq 1 $charged_slots`; do echo -n "$HEART"; done - -if [[ $charged_slots -lt 3 ]]; then - echo -n '#[fg=colour254]' - for i in `seq 1 $(echo "3-$charged_slots" | bc)`; do echo -n "$HEART"; done -fi diff --git a/git/hooks/jscs.pre-commit b/git/hooks/jscs.pre-commit deleted file mode 100755 index ffb46ce..0000000 --- a/git/hooks/jscs.pre-commit +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# JSCS Pre-Commit -# If a JavaScript file is trying to be committed and it fails style checking -# then fail the commit - -EXIT_CODE=0 -COLOR_RED="\x1B[31m" -COLOR_YELLOW="\x1B[1;33m" -COLOR_GREEN="\x1B[32m" -COLOR_NONE="\x1B[0m" - -if ! jscs > /dev/null 2>&1; then - echo "${COLOR_YELLOW}JSCS is not installed. Exiting.${COLOR_NONE}" - exit 0 -fi - -repo=$( git rev-parse --show-toplevel ) - -for file in $( exec git diff-index --cached --name-only HEAD ); do - if [ ${file: -3} == ".js" ]; then - status=$( exec git status --porcelain $file ) - - if [[ $status != D* ]]; then - jscs ${repo}/${file} - EXIT_CODE=$((${EXIT_CODE} + $?)) - fi - fi -done - -echo "" -if [[ ${EXIT_CODE} -ne 0 ]]; then - echo "${COLOR_RED}✘ JSCS detected syntax problems.${COLOR_NONE}" -else - echo "${COLOR_GREEN}✔ JSCS detected no errors.${COLOR_NONE}" -fi - -exit $((${EXIT_CODE})) diff --git a/git/hooks/jshint.pre-commit b/git/hooks/jshint.pre-commit deleted file mode 100755 index 8e4590d..0000000 --- a/git/hooks/jshint.pre-commit +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# JSHint Pre-Commit -# If a JavaScript file is trying to be committed and it fails linting -# then fail the commit - -EXIT_CODE=0 -COLOR_RED="\x1B[31m" -COLOR_YELLOW="\x1B[1;33m" -COLOR_GREEN="\x1B[32m" -COLOR_NONE="\x1B[0m" - -if ! jshint > /dev/null 2>&1; then - echo "${COLOR_YELLOW}JSHint is not installed. Exiting.${COLOR_NONE}" - exit 0 -fi - -repo=$( git rev-parse --show-toplevel ) - -for file in $( exec git diff-index --cached --name-only HEAD ); do - if [ ${file: -3} == ".js" ]; then - status=$( exec git status --porcelain $file ) - - if [[ $status != D* ]]; then - jshint ${repo}/${file} - EXIT_CODE=$((${EXIT_CODE} + $?)) - fi - fi -done - -echo "" -if [[ ${EXIT_CODE} -ne 0 ]]; then - echo "${COLOR_RED}✘ JSHINT detected syntax problems.${COLOR_NONE}" -else - echo "${COLOR_GREEN}✔ JSHINT detected no errors.${COLOR_NONE}" -fi - -exit $((${EXIT_CODE})) diff --git a/install/brew.sh b/install/brew.sh deleted file mode 100755 index 5df89ac..0000000 --- a/install/brew.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -if test ! $(which brew); then - echo "Installing homebrew" - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -fi - -echo -e "\n\nInstalling homebrew packages..." -echo "==============================" - -# cli tools -brew install ack -brew install tree -brew install wget - -# development server setup -brew install nginx -brew install dnsmasq - -# development tools -brew install git -brew install hub -brew install macvim --override-system-vim -brew install reattach-to-user-namespace -brew install tmux -brew install zsh -brew install highlight -brew install nvm -brew install z -brew install markdown -brew install diff-so-fancy - -# install neovim -brew install neovim/neovim/neovim - -exit 0 diff --git a/install/nginx.sh b/install/nginx.sh deleted file mode 100755 index d65e963..0000000 --- a/install/nginx.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -echo -e "\n\nInstalling nginx" -echo "==============================" - -###################################################### -# nginx setup -###################################################### - -$DOTFILES=$HOME/.dotfiles - -# first, make sure apache is off -sudo launchctl unload -w /System/Library/LaunchDaemons/org.apache.httpd.plist - -# run nginx when osx starts -sudo cp /usr/local/opt/nginx/homebrew.mxcl.nginx.plist /Library/LaunchDaemons -launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.nginx.plist - -mkdir -p /usr/local/etc/nginx/sites-enabled -cp -R nginx/sites-available /usr/local/etc/nginx/sites-available -mv /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf.orig -ln -s $DOTFILES/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf - -sites=$( ls -1 -d $DOTFILES/nginx/sites-available) -for site in $sites ; do - echo "linking $site" - ln -s $DOTFILES/nginx/sites-available/$site /usr/local/etc/nginx/sites-enabled/$site -done - - -###################################################### -# dnsmasq setup -###################################################### - -echo "installing dnsmasq" - -# move dnsmasq config into place -ln -s $DOTFILES/nginx/dnsmasq.conf /usr/local/etc/ - -# setup dnsmasq -sudo cp -fv /usr/local/opt/dnsmasq/homebrew.mxcl.dnsmasq.plist /Library/LaunchDaemons -sudo launchctl load /Library/LaunchDaemons/homebrew.mxcl.dnsmasq diff --git a/install/osx.sh b/install/osx.sh deleted file mode 100755 index 752fd1c..0000000 --- a/install/osx.sh +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/env sh - -echo -e "\n\nSetting OS X settings" -echo "==============================" - -# echo "Finder: show all filename extensions" -defaults write NSGlobalDomain AppleShowAllExtensions -bool true - -# echo "show hidden files by default" -defaults write com.apple.Finder AppleShowAllFiles -bool false - -# echo "only use UTF-8 in Terminal.app" -defaults write com.apple.terminal StringEncodings -array 4 - -# echo "expand save dialog by default" -defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode -bool true - -# echo "show the ~/Library folder in Finder" -chflags nohidden ~/Library - -# echo "disable resume system wide" -# defaults write NSGlobalDomainNSQuitAlwaysKeepWindows -bool false - -echo "Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)" -defaults write NSGlobalDomain AppleKeyboardUIMode -int 3 - -echo "Enable subpixel font rendering on non-Apple LCDs" -defaults write NSGlobalDomain AppleFontSmoothing -int 2 - -# echo "Enable the 2D Dock" -# defaults write com.apple.dock no-glass -bool true - -# Automatically hide and show the Dock -# defaults write com.apple.dock autohide -bool true - -# echo "Make Dock icons of hidden applications translucent" -# defaults write com.apple.dock showhidden -bool true - -#echo "Enable iTunes track notifications in the Dock" -#defaults write com.apple.dock itunes-notifications -bool true - -# Disable menu bar transparency -#defaults write NSGlobalDomain AppleEnableMenuBarTransparency -bool false - -# Show remaining battery time; hide percentage -# defaults write com.apple.menuextra.battery ShowPercent -string "NO" -# defaults write com.apple.menuextra.battery ShowTime -string "YES" - -# echo "Always show scrollbars" -# defaults write NSGlobalDomain AppleShowScrollBars -string "Auto" - -#echo "Allow quitting Finder via ⌘ + Q; doing so will also hide desktop icons" -#defaults write com.apple.finder QuitMenuItem -bool true - -# Disable window animations and Get Info animations in Finder -# defaults write com.apple.finder DisableAllAnimations -bool true - -echo "Use current directory as default search scope in Finder" -defaults write com.apple.finder FXDefaultSearchScope -string "SCcf" - -echo "Show Path bar in Finder" -defaults write com.apple.finder ShowPathbar -bool true - -echo "Show Status bar in Finder" -defaults write com.apple.finder ShowStatusBar -bool true - -# echo "Expand print panel by default" -# defaults write NSGlobalDomain PMPrintingExpandedStateForPrint -bool true - -#echo "Disable the “Are you sure you want to open this application?” dialog" -#defaults write com.apple.LaunchServices LSQuarantine -bool false - -#echo "Disable shadow in screenshots" -#defaults write com.apple.screencapture disable-shadow -bool true - -# echo "Enable highlight hover effect for the grid view of a stack (Dock)" -# defaults write com.apple.dock mouse-over-hilte-stack -bool true - -# echo "Enable spring loading for all Dock items" -# defaults write enable-spring-load-actions-on-all-items -bool true - -# echo "Show indicator lights for open applications in the Dock" -# defaults write com.apple.dock show-process-indicators -bool true - -# Don’t animate opening applications from the Dock -# defaults write com.apple.dock launchanim -bool false - -#echo "Display ASCII control characters using caret notation in standard text views" -# Try e.g. `cd /tmp; unidecode "\x{0000}" > cc.txt; open -e cc.txt` -#defaults write NSGlobalDomain NSTextShowsControlCharacters -bool true - -echo "Disable press-and-hold for keys in favor of key repeat" -defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false - -echo "Set a blazingly fast keyboard repeat rate" -defaults write NSGlobalDomain KeyRepeat -int 2 - -echo "Set a shorter Delay until key repeat" -defaults write NSGlobalDomain InitialKeyRepeat -int 15 - -#echo "Disable auto-correct" -#defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false - -# Disable opening and closing window animations -# defaults write NSGlobalDomain NSAutomaticWindowAnimationsEnabled -bool false - -# echo "Disable disk image verification" -# defaults write com.apple.frameworks.diskimages skip-verify -bool true -# defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true -# defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true - -# echo "Automatically open a new Finder window when a volume is mounted" -# defaults write com.apple.frameworks.diskimages auto-open-ro-root -bool true -# defaults write com.apple.frameworks.diskimages auto-open-rw-root -bool true -# defaults write com.apple.finder OpenWindowForNewRemovableDisk -bool true - -# echo "Display full POSIX path as Finder window title" -# defaults write com.apple.finder _FXShowPosixPathInTitle -bool true - -# Increase window resize speed for Cocoa applications -# defaults write NSGlobalDomain NSWindowResizeTime -float 0.001 - -# echo "Avoid creating .DS_Store files on network volumes" -# defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true - -# echo "Disable the warning when changing a file extension" -# defaults write com.apple.finder FXEnableExtensionChangeWarning -bool false - -# echo "Show item info below desktop icons" -# /usr/libexec/PlistBuddy -c "Set :DesktopViewSettings:IconViewSettings:showItemInfo true" ~/Library/Preferences/com.apple.finder.plist - -# echo "Enable snap-to-grid for desktop icons" -# /usr/libexec/PlistBuddy -c "Set :DesktopViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist - -# echo "Disable the warning before emptying the Trash" -# defaults write com.apple.finder WarnOnEmptyTrash -bool false - -# Empty Trash securely by default -# defaults write com.apple.finder EmptyTrashSecurely -bool true - -#echo "Require password immediately after sleep or screen saver begins" -#defaults write com.apple.screensaver askForPassword -int 1 -#defaults write com.apple.screensaver askForPasswordDelay -int 0 - -echo "Enable tap to click (Trackpad)" -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true - -#echo "Map bottom right Trackpad corner to right-click" -#defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadCornerSecondaryClick -int 2 -#defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadRightClick -bool true - -# echo "Disable Safari’s thumbnail cache for History and Top Sites" -# defaults write com.apple.Safari DebugSnapshotsUpdatePolicy -int 2 - -echo "Enable Safari’s debug menu" -defaults write com.apple.Safari IncludeInternalDebugMenu -bool true - -# echo "Make Safari’s search banners default to Contains instead of Starts With" -# defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false - -# Remove useless icons from Safari’s bookmarks bar -# defaults write com.apple.Safari ProxiesInBookmarksBar "()" - -# echo "Add a context menu item for showing the Web Inspector in web views" -# defaults write NSGlobalDomain WebKitDeveloperExtras -bool true - -#echo "Only use UTF-8 in Terminal.app" -#defaults write com.apple.terminal StringEncodings -array 4 - -# echo "Disable the Ping sidebar in iTunes" -# defaults write com.apple.iTunes disablePingSidebar -bool true - -# echo "Disable all the other Ping stuff in iTunes" -# defaults write com.apple.iTunes disablePing -bool true - -# echo "Make ⌘ + F focus the search input in iTunes" -# defaults write com.apple.iTunes NSUserKeyEquivalents -dict-add "Target Search Field" "@F" - -# Disable send and reply animations in Mail.app -# defaults write com.apple.Mail DisableReplyAnimations -bool true -# defaults write com.apple.Mail DisableSendAnimations -bool true - -# Disable Resume system-wide -# defaults write NSGlobalDomain NSQuitAlwaysKeepsWindows -bool false - -# echo "Disable the “reopen windows when logging back in” option" -# This works, although the checkbox will still appear to be checked. -# defaults write com.apple.loginwindow TALLogoutSavesState -bool false -# defaults write com.apple.loginwindow LoginwindowLaunchesRelaunchApps -bool false - -# echo "Enable Dashboard dev mode (allows keeping widgets on the desktop)" -# defaults write com.apple.dashboard devmode -bool true - -#echo "Reset Launchpad" -#[ -e ~/Library/Application\ Support/Dock/*.db ] && rm ~/Library/Application\ Support/Dock/*.db - -# echo "Disable local Time Machine backups" -# hash tmutil &> /dev/null && sudo tmutil disablelocal - -#echo "Remove Dropbox’s green checkmark icons in Finder" -#file=/Applications/Dropbox.app/Contents/Resources/check.icns -#[ -e "$file" ] && mv -f "$file" "$file.bak" -#unset file - -#Fix for the ancient UTF-8 bug in QuickLook (http://mths.be/bbo) -# Commented out, as this is known to cause problems when saving files in Adobe Illustrator CS5 :( -#echo "0x08000100:0" > ~/.CFUserTextEncoding - -echo "Kill affected applications" -for app in Safari Finder Dock Mail SystemUIServer; do killall "$app" >/dev/null 2>&1; done diff --git a/jscsrc.symlink b/jscsrc.symlink deleted file mode 100644 index f6d0a80..0000000 --- a/jscsrc.symlink +++ /dev/null @@ -1,68 +0,0 @@ -{ - "requireCurlyBraces": [ - "if", "else", "for", "while", "do", "try", - "catch" - ], - "requireSpaceAfterKeywords": [ - "if", "else", "for", "while", "do", "switch", - "return", "try", "catch" - ], - "requireSpaceBeforeBlockStatements": true, - "requireParenthesesAroundIIFE": true, - "requireSpacesInConditionalExpression": true, - "requireSpacesInAnonymousFunctionExpression": { - "beforeOpeningRoundBrace": true, - "beforeOpeningCurlyBrace": true - }, - "requireSpacesInNamedFunctionExpression": { - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInNamedFunctionExpression": { - "beforeOpeningRoundBrace": true - }, - "requireSpacesInFunctionDeclaration": { - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInFunctionDeclaration": { - "beforeOpeningRoundBrace": true - }, - "disallowMultipleVarDecl": true, - "requireBlocksOnNewline": true, - "disallowEmptyBlocks": true, - "requireSpacesInsideObjectBrackets": "allButNested", - "requireSpacesInsideArrayBrackets": "allButNested", - "disallowQuotedKeysInObjects": "allButReserved", - "disallowSpaceAfterObjectKeys": true, - "requireCommaBeforeLineBreak": true, - "requireOperatorBeforeLineBreak": true, - "disallowSpaceAfterPrefixUnaryOperators": true, - "disallowSpaceBeforePostfixUnaryOperators": true, - "requireSpaceBeforeBinaryOperators": true, - "requireSpaceAfterBinaryOperators": true, - "disallowImplicitTypeConversion": [ - "binary" - ], - "requireCamelCaseOrUpperCaseIdentifiers": true, - "disallowKeywords": [ - "with" - ], - "disallowMultipleLineStrings": true, - "disallowMultipleLineBreaks": true, - "validateQuoteMarks": { - "mark": "'", - "escape": true - }, - "validateIndentation": "\t", - "disallowMixedSpacesAndTabs": "smart", - "disallowTrailingWhitespace": true, - "disallowTrailingComma": true, - "requireKeywordsOnNewLine": [ - "else" - ], - "requireLineFeedAtFileEnd": true, - "maximumLineLength": 120, - "requireCapitalizedConstructors": true, - "requireDotNotation": true, - "disallowYodaConditions": true, - "requireSpaceAfterLineComment": true -} \ No newline at end of file diff --git a/jshintrc.symlink b/jshintrc.symlink deleted file mode 100644 index 248076c..0000000 --- a/jshintrc.symlink +++ /dev/null @@ -1,68 +0,0 @@ -{ - "asi": false, - "bitwise": false, - "boss": false, - "browser": true, - "camelcase": true, - "couch": false, - "curly": true, - "debug": false, - "devel": true, - "dojo": false, - "eqeqeq": true, - "eqnull": true, - "esversion": 6, - "evil": false, - "expr": true, - "forin": false, - "funcscope": true, - "globalstrict": false, - "immed": true, - "iterator": false, - "jquery": false, - "lastsemic": false, - "latedef": false, - "laxbreak": true, - "laxcomma": false, - "loopfunc": true, - "mootools": false, - "multistr": false, - "newcap": true, - "noarg": true, - "node": false, - "noempty": false, - "nonew": true, - "nonstandard": false, - "nomen": false, - "onecase": false, - "onevar": false, - "passfail": false, - "plusplus": false, - "proto": false, - "prototypejs": false, - "regexdash": true, - "regexp": false, - "rhino": false, - "undef": true, - "unused": true, - "scripturl": true, - "shadow": false, - "smarttabs": true, - "strict": false, - "sub": false, - "supernew": false, - "trailing": true, - "validthis": true, - "withstmt": false, - "white": true, - "worker": false, - "wsh": false, - "yui": false, - "indent": 4, - "globals": { - "require": true, - "define": true - }, - "quotmark": true, - "maxcomplexity": 10 -} diff --git a/nginx/dnsmasq.conf b/nginx/dnsmasq.conf deleted file mode 100644 index 22f93a3..0000000 --- a/nginx/dnsmasq.conf +++ /dev/null @@ -1 +0,0 @@ -address=/.dev/127.0.0.1 diff --git a/nginx/nginx.conf b/nginx/nginx.conf deleted file mode 100644 index 3406047..0000000 --- a/nginx/nginx.conf +++ /dev/null @@ -1,121 +0,0 @@ - -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - include sites-enabled/*.dev; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - server { - listen 80; - server_name 10.0.1.9 localhost code.dev rugen.local; - - #charset koi8-r; - - #access_log logs/host.access.log main; - - location / { - root /Users/nicknisi/code; - index index.html index.php; - include /usr/local/etc/nginx/conf.d/php-fpm; - autoindex on; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} - } - - - # another virtual host using mix of IP-, name-, and port-based configuration - # - #server { - # listen 8000; - # listen somename:8080; - # server_name somename alias another.alias; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - - - # HTTPS server - # - #server { - # listen 443; - # server_name localhost; - - # ssl on; - # ssl_certificate cert.pem; - # ssl_certificate_key cert.key; - - # ssl_session_timeout 5m; - - # ssl_protocols SSLv2 SSLv3 TLSv1; - # ssl_ciphers HIGH:!aNULL:!MD5; - # ssl_prefer_server_ciphers on; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - -} diff --git a/nginx/sites-available/code.dev b/nginx/sites-available/code.dev deleted file mode 100755 index 7bfd65c..0000000 --- a/nginx/sites-available/code.dev +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen 80; - server_name app localhost .dev; - - # the location of our projects directory - set $basepath "/Users/nicknisi/code"; - - set $domain $host; - if ($domain ~ "^(.*)\.dev$") { - set $domain $1; - } - set $rootpath "${domain}"; - if (-d $basepath/$domain/public) { - set $rootpath "${domain}/public"; - } - if (-f $basepath/$domain/index.html) { - set $rootpath $domain; - } - - root $basepath/$rootpath; - - location / { - # enable index view of the directory - autoindex on; - # a 405 is thrown when posting to a static file. this corrects it - error_page 405 = $uri; - } - - # redirect server error pages to the static page /50x.html - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } -}