5 files changed, 314 insertions, 2 deletions

diff --git a/.spacemacs b/.spacemacs
new file mode 100644
index 0000000..e210354
--- /dev/null
+++ b/.spacemacs
@@ -0,0 +1,302 @@
+;; -*- mode: emacs-lisp -*-
+;; This file is loaded by Spacemacs at startup.
+;; It must be stored in your home directory.
+
+(defun dotspacemacs/layers ()
+  "Configuration Layers declaration."
+  (setq-default
+   ;; List of additional paths where to look for configuration layers.
+   ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
+   dotspacemacs-configuration-layer-path '()
+   ;; List of configuration layers to load. If it is the symbol `all' instead
+   ;; of a list then all discovered layers will be installed.
+   dotspacemacs-configuration-layers
+   '(
+     ;; ----------------------------------------------------------------
+     ;; Example of useful layers you may want to use right away.
+     ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
+     ;; <M-m f e R> (Emacs style) to install them.
+     ;; ----------------------------------------------------------------
+     auto-completion
+     ;; better-defaults
+     ;; (colors :variables
+     ;;         colors-enable-rainbow-identifiers t
+     ;;         colors-enable-nyan-cat-progress bar ,(display-graphic p)
+     ;;         )
+     dash
+     deft
+     django
+     emacs-lisp
+     eyebrowse
+     erc
+     git
+     gnus
+     ;; github
+     html
+     javascript
+     markdown
+     org
+     osx
+     (python :variables
+             ;;python-enable-yapf-format-on-save t
+             )
+     (shell :variables
+            shell-default-height 20
+            shell-default-term-shell "/bin/zsh"
+            shell-default-position 'bottom)
+     ruby
+     ;; salt
+     syntax-checking
+     vagrant
+     version-control
+     )
+   ;; List of additional packages that will be installed without being
+   ;; wrapped in a layer. If you need some configuration for these
+   ;; packages then consider to create a layer, you can also put the
+   ;; configuration in `dotspacemacs/config'.
+   dotspacemacs-additional-packages '(
+                                      editorconfig
+                                      elfeed
+                                      hackernews
+                                      ;; helm-dash ;; osx is broken
+                                      itail
+                                      magit-gitflow
+                                      ;; mentor ;; rTorrent client
+                                      ;; sx
+                                       znc
+                                      )
+   ;; A list of packages and/or extensions that will not be install and loaded.
+   dotspacemacs-excluded-packages '()
+   ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
+   ;; are declared in a layer which is not a member of
+   ;; the list `dotspacemacs-configuration-layers'
+   dotspacemacs-delete-orphan-packages t))
+
+(defun dotspacemacs/init ()
+  "Initialization function.
+This function is called at the very startup of Spacemacs initialization
+before layers configuration."
+  ;; This setq-default sexp is an exhaustive list of all the supported
+  ;; spacemacs settings.
+  (setq-default
+   ;; Either `vim' or `emacs'. Evil is always enabled but if the variable
+   ;; is `emacs' then the `holy-mode' is enabled at startup.
+   dotspacemacs-editing-style 'vim
+   ;; If non nil output loading progress in `*Messages*' buffer.
+   dotspacemacs-verbose-loading nil
+   ;; Specify the startup banner. Default value is `official', it displays
+   ;; the official spacemacs logo. An integer value is the index of text
+   ;; banner, `random' chooses a random text banner in `core/banners'
+   ;; directory. A string value must be a path to an image format supported
+   ;; by your Emacs build.
+   ;; If the value is nil then no banner is displayed.
+   dotspacemacs-startup-banner 'official
+   ;; List of items to show in the startup buffer. If nil it is disabled.
+   ;; Possible values are: `recents' `bookmarks' `projects'."
+   dotspacemacs-startup-lists '(bookmarks projects)
+   ;; List of themes, the first of the list is loaded when spacemacs starts.
+   ;; Press <SPC> T n to cycle to the next theme in the list (works great
+   ;; with 2 themes variants, one dark and one light)
+   dotspacemacs-themes '(subatomic256
+                         monokai
+                         zenburn)
+   ;; If non nil the cursor color matches the state color.
+   dotspacemacs-colorize-cursor-according-to-state t
+   ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
+   ;; size to make separators look not too crappy.
+   dotspacemacs-default-font '("Source Code Pro for Powerline"
+                               :size 11
+                               :weight normal
+                               :width normal
+                               :powerline-scale 1.0)
+   ;; The leader key
+   dotspacemacs-leader-key "SPC"
+   ;; The leader key accessible in `emacs state' and `insert state'
+   dotspacemacs-emacs-leader-key "M-m"
+   ;; Major mode leader key is a shortcut key which is the equivalent of
+   ;; pressing `<leader> m`. Set it to `nil` to disable it.
+   dotspacemacs-major-mode-leader-key ","
+   ;; Major mode leader key accessible in `emacs state' and `insert state'
+   dotspacemacs-major-mode-emacs-leader-key "C-M-m"
+   ;; The command key used for Evil commands (ex-commands) and
+   ;; Emacs commands (M-x).
+   ;; By default the command key is `:' so ex-commands are executed like in Vim
+   ;; with `:' and Emacs commands are executed with `<leader> :'.
+   dotspacemacs-command-key ":"
+   ;; Location where to auto-save files. Possible values are `original' to
+   ;; auto-save the file in-place, `cache' to auto-save the file to another
+   ;; file stored in the cache directory and `nil' to disable auto-saving.
+   ;; Default value is `cache'.
+   dotspacemacs-auto-save-file-location 'cache
+   ;; If non nil then `ido' replaces `helm' for some commands. For now only
+   ;; `find-files' (SPC f f) is replaced.
+   dotspacemacs-use-ido nil
+   ;; If non nil the paste micro-state is enabled. When enabled pressing `p`
+   ;; several times cycle between the kill ring content.
+   dotspacemacs-enable-paste-micro-state nil
+   ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing
+   ;; the commands bound to the current keystrokes.
+   dotspacemacs-guide-key-delay 0.4
+   ;; If non nil a progress bar is displayed when spacemacs is loading. This
+   ;; may increase the boot time on some systems and emacs builds, set it to
+   ;; nil ;; to boost the loading time.
+   dotspacemacs-loading-progress-bar t
+   ;; If non nil the frame is fullscreen when Emacs starts up.
+   ;; (Emacs 24.4+ only)
+   dotspacemacs-fullscreen-at-startup nil
+   ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen.
+   ;; Use to disable fullscreen animations in OSX."
+   dotspacemacs-fullscreen-use-non-native nil
+   ;; If non nil the frame is maximized when Emacs starts up.
+   ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil.
+   ;; (Emacs 24.4+ only)
+   dotspacemacs-maximized-at-startup nil
+   ;; A value from the range (0..100), in increasing opacity, which describes
+   ;; the transparency level of a frame when it's active or selected.
+   ;; Transparency can be toggled through `toggle-transparency'.
+   dotspacemacs-active-transparency 90
+   ;; A value from the range (0..100), in increasing opacity, which describes
+   ;; the transparency level of a frame when it's inactive or deselected.
+   ;; Transparency can be toggled through `toggle-transparency'.
+   dotspacemacs-inactive-transparency 90
+   ;; If non nil unicode symbols are displayed in the mode line.
+   dotspacemacs-mode-line-unicode-symbols t
+   ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth
+   ;; scrolling overrides the default behavior of Emacs which recenters the
+   ;; point when it reaches the top or bottom of the screen.
+   dotspacemacs-smooth-scrolling t
+   ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
+   dotspacemacs-smartparens-strict-mode nil
+   ;; Select a scope to highlight delimiters. Possible value is `all',
+   ;; `current' or `nil'. Default is `all'
+   dotspacemacs-highlight-delimiters 'all
+   ;; If non nil advises quit functions to keep server open when quitting.
+   dotspacemacs-persistent-server nil
+   ;; List of search tool executable names. Spacemacs uses the first installed
+   ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'.
+   dotspacemacs-search-tools '("ag" "pt" "ack" "grep")
+   ;; The default package repository used if no explicit repository has been
+   ;; specified with an installed package.
+   ;; Not used for now.
+   dotspacemacs-default-package-repository nil
+   )
+  ;; User initialization goes here
+  )
+
+(defun dotspacemacs/config ()
+  "Configuration function.
+ This function is called at the very end of Spacemacs initialization after
+layers configuration."
+  ;;(setq anaconda-mode-remote-p "private")
+  ;;(setq anaconda-mode-host "localhost")
+  ;;(setq anaconda-mode-port 9000)
+  ;; (setenv "PYTHONPATH" "/Users/jason/Code/enderlabs/eventboard.io/apps")
+  (add-hook 'python-mode-hook
+            (lambda ()
+              ;; (setq python-shell-interpreter "python")
+              ;; (setq anaconda-mode-server-script
+              ;;       "/usr/local/lib/python2.7/site-packages/anaconda_mode.py")
+              (fci-mode t)
+              (auto-fill-mode t)))
+  (add-hook 'after-init-hook #'global-flycheck-mode)
+
+  (defun ao/find-dotfile (orig-fun &rest args)
+    "Always follow symlink when using `SPC f e d'."
+    (let ((vc-follow-symlinks t))    ; Set `vc-follow-symlinks` to t just for this
+      (apply orig-fun args)))
+
+
+  ;; then, in `user-config` in `~/.spacemacs`:
+  (advice-add 'spacemacs/find-dotfile :around 'ao/find-dotfile)
+
+  ;; Open neotree after selecting a project
+  (setq projectile-switch-project-action 'neotree-projectile-action)
+
+  ;; show line numbers by default
+  (global-linum-mode t)
+
+  ;; don't highlight current line
+  (global-hl-line-mode -1)
+  ;; or searches
+  (global-evil-search-highlight-persist nil)
+
+  (setq magit-refresh-file-buffer-hook '(magit-revert-buffer magit-update-vc-modeline))
+
+  (setq indent-tabs-mode nil)
+
+  ;; (setq magit-revert-buffers 'ask)
+
+  (setq neo-vc-integration nil)
+  (setq neo-theme 'nerd)
+  (setq neo-show-hidden-files nil)
+  (setq neo-hidden-regexp-list '("\\.pyc$" "~$" "^#.*#$" "\\.elc$" "^__pycache__$"))
+
+  ;; you can select levels of indents with it.  If you wanted to select the
+  ;; entire body of a class, you just go to the first indent level (any
+  ;; variable or function definition) and type `vii'.  If you want to include 
+  ;; the `class Whatever` line, it's `viI' `vai' and `vaI' include whitespace
+  ;; at the top and bottom
+  (evil-define-text-object evil-inner-buffer (count &optional beg end type)
+    (evil-select-paren "\\`" "\\'" beg end type count nil))
+  (define-key evil-inner-text-objects-map "g" 'evil-inner-buffer)
+
+  ;; fixes an anaconda mode bug
+  ;; (evil-leader/set-key-for-mode 'python-mode
+  ;;   "mhh" 'anaconda-mode-show-doc
+  ;;   "mgg" 'anaconda-mode-find-definitions
+  ;;   "mga" 'anaconda-mode-find-assignments
+  ;;   "mgu" 'anaconda-mode-find-references)
+  ;; (evil-leader/set-key-for-mode 'cython-mode
+  ;;   "mhh" 'anaconda-mode-view-doc
+  ;;   "mgg" 'anaconda-mode-goto
+  ;;   "mgu" 'anaconda-mode-usages)
+
+  (defun ao/expand-completion-table (orig-fun &rest args)
+    "Extract all symbols from COMPLETION-TABLE before calling projectile--tags."
+    (let ((completion-table (all-completions "" (car args))))
+      (funcall orig-fun completion-table)))
+
+  ;; Tags
+  (advice-add 'projectile--tags :around #'ao/expand-completion-table)
+
+
+  (setq web-mode-enable-engine-detection t)
+  (setq web-mode-engines-alist
+        '(("django"  .  "\\.html\\'")))
+
+
+)
+
+;; Do not write anything past this comment. This is where Emacs will
+;; auto-generate custom variable definitions.
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(ahs-case-fold-search nil)
+ '(ahs-default-range (quote ahs-range-whole-buffer))
+ '(ahs-idle-interval 0.25)
+ '(ahs-idle-timer 0 t)
+ '(ahs-inhibit-face-list nil)
+ '(elfeed-feeds (quote ("http://nullprogram.com/feed/")))
+ '(paradox-github-token t)
+ '(ring-bell-function (quote ignore) t)
+ '(safe-local-variable-values
+  (quote
+   (
+    (python-shell-virtualenv-path . "/Users/jason/.virtualenvs/eb")
+    (projectile-tags-command . "ctags --exclude=migrations --exclude=dumps --exclude=media --exclude=.git --exclude=.vagrant --exclude=\"*.js\" --exclude=\"*.css\" --exclude=\"*.html\" --exclude=\"*.scss\" -Re -f \"%s\" %s")
+    (engine . django)))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(default ((t (:background "#1c1c1c" :foreground "#d7d7d7"))))
+ '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
+ '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))
+ '(elfeed-feeds
+   (quote
+    ("http://www.commandlinefu.com/commands/browse/rss")))
+
diff --git a/amethyst b/amethyst
index 332baf9..6929ad6 100644
--- a/amethyst
+++ b/amethyst
@@ -223,7 +223,9 @@
         "com.zaal.cjournalmac",
         "com.dayoneapp.dayone",
         "com.enderlabs.EBTerminal",
-        "com.kapeli.dash"
+        "com.kapeli.dash",
+        "com.jriver.MediaCenter20",
+        "com.perforce.p4merge"
     ],
     "float-small-windows": true,
     "mouse-follows-focus": false,
diff --git a/os-x_move_in.sh b/os-x_move_in.sh
index a2a852f..ac73ab8 100755
--- a/os-x_move_in.sh
+++ b/os-x_move_in.sh
@@ -71,3 +71,8 @@ fi
 ./common_move_in.sh
 
 open "/opt/homebrew-cask/Caskroom/little-snitch/3.5.1/Little Snitch Installer.app"
+
+cd /System/Library/LaunchAgents
+launchctl unload -w com.apple.photolibraryd.plist
+launchctl unload -w com.apple.screensharing.MessagesAgent.plist
+launchctl unload -w com.apple.screensharing.agent.plist
diff --git a/vim/plugins/floobits-neovim b/vim/plugins/floobits-neovim
deleted file mode 160000
-Subproject 9b737c3474f8286d4c79d1a7f94abfef2f5304f
diff --git a/zshrc b/zshrc
index 7d61a80..cc4e71c 100644
--- a/zshrc
+++ b/zshrc
@@ -48,7 +48,7 @@ DISABLE_CORRECTION="true"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(zsh-syntax-highlighting git git-extras docker fabric gpg-agent pep8 pip pyenv virtualenvwrapper pylint python vagrant web-search wd)
+plugins=(zsh-syntax-highlighting git git-extras docker fabric gpg-agent pep8 pip pyenv pylint python vagrant web-search wd)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -74,3 +74,6 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
 
 alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
 alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
+alias bib='source ~/.virtualenvs/bib/bin/activate'
+alias ducks='du -cks * |sort -rn |head -11'
+source /usr/local/bin/virtualenvwrapper_lazy.sh