1 files changed, 206 insertions, 95 deletions

diff --git a/.spacemacs b/.spacemacs
index e210354..ca0fea4 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -3,8 +3,14 @@
 ;; It must be stored in your home directory.
 
 (defun dotspacemacs/layers ()
-  "Configuration Layers declaration."
+  "Configuration Layers declaration.
+You should not put any user code in this function besides modifying the variable
+values."
   (setq-default
+   ;; Base distribution to use. This is a layer contained in the directory
+   ;; `+distribution'. For now available distributions are `spacemacs-base'
+   ;; or `spacemacs'. (default 'spacemacs)
+   dotspacemacs-distribution 'spacemacs
    ;; List of additional paths where to look for configuration layers.
    ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
    dotspacemacs-configuration-layer-path '()
@@ -19,10 +25,11 @@
      ;; ----------------------------------------------------------------
      auto-completion
      ;; better-defaults
-     ;; (colors :variables
+     (colors :variables
      ;;         colors-enable-rainbow-identifiers t
      ;;         colors-enable-nyan-cat-progress bar ,(display-graphic p)
-     ;;         )
+             )
+     cscope
      dash
      deft
      django
@@ -33,6 +40,7 @@
      gnus
      ;; github
      html
+     jabber
      javascript
      markdown
      org
@@ -55,34 +63,40 @@
    ;; packages then consider to create a layer, you can also put the
    ;; configuration in `dotspacemacs/config'.
    dotspacemacs-additional-packages '(
+                                      dired+
                                       editorconfig
                                       elfeed
                                       hackernews
                                       ;; helm-dash ;; osx is broken
-                                      itail
+                                      ;; itail
                                       magit-gitflow
                                       ;; mentor ;; rTorrent client
+                                      org-journal
                                       ;; sx
-                                       znc
+                                      ;; 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'
+   ;; the list `dotspacemacs-configuration-layers'. (default t)
    dotspacemacs-delete-orphan-packages t))
 
 (defun dotspacemacs/init ()
   "Initialization function.
 This function is called at the very startup of Spacemacs initialization
-before layers configuration."
+before layers configuration.
+You should not put any user code in there besides modifying the variable
+values."
   ;; 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.
+   ;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the
+   ;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid'
+   ;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil
+   ;; unchanged. (default 'vim)
+   dotspacemacs-editing-style 'emacs
+   ;; If non nil output loading progress in `*Messages*' buffer. (default nil)
    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
@@ -90,21 +104,23 @@ before layers configuration."
    ;; 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
+   dotspacemacs-startup-banner 'random
    ;; 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)
+   ;; Possible values are: `recents' `bookmarks' `projects'.
+   ;; (default '(recents projects))
+   dotspacemacs-startup-lists '(recents 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
+
+   dotspacemacs-themes '(jbeans
                          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"
+   dotspacemacs-default-font '("Inconsolata for Powerline"
                                :size 11
                                :weight normal
                                :width normal
@@ -112,85 +128,193 @@ before layers configuration."
    ;; The leader key
    dotspacemacs-leader-key "SPC"
    ;; The leader key accessible in `emacs state' and `insert state'
+   ;; (default "M-m")
    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.
+   ;; pressing `<leader> m`. Set it to `nil` to disable it. (default ",")
    dotspacemacs-major-mode-leader-key ","
-   ;; Major mode leader key accessible in `emacs state' and `insert state'
+   ;; Major mode leader key accessible in `emacs state' and `insert state'.
+   ;; (default "C-M-m)
    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 ":"
+   ;; If non nil `Y' is remapped to `y$'. (default t)
+   dotspacemacs-remap-Y-to-y$ t
    ;; 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'.
+   ;; (default '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.
+   ;; `find-files' (SPC f f), `find-spacemacs-file' (SPC f e s), and
+   ;; `find-contrib-file' (SPC f e c) are replaced. (default nil)
    dotspacemacs-use-ido nil
+   ;; If non nil, `helm' will try to miminimize the space it uses. (default nil)
+   dotspacemacs-helm-resize nil
+   ;; if non nil, the helm header is hidden when there is only one source.
+   ;; (default nil)
+   dotspacemacs-helm-no-header nil
+   ;; define the position to display `helm', options are `bottom', `top',
+   ;; `left', or `right'. (default 'bottom)
+   dotspacemacs-helm-position 'bottom
    ;; If non nil the paste micro-state is enabled. When enabled pressing `p`
-   ;; several times cycle between the kill ring content.
+   ;; several times cycle between the kill ring content. (default nil)
    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
+   ;; Which-key delay in seconds. The which-key buffer is the popup listing
+   ;; the commands bound to the current keystroke sequence. (default 0.4)
+   dotspacemacs-which-key-delay 0.4
+   ;; Which-key frame position. Possible values are `right', `bottom' and
+   ;; `right-then-bottom'. right-then-bottom tries to display the frame to the
+   ;; right; if there is insufficient space it displays it at the bottom.
+   ;; (default 'bottom)
+   dotspacemacs-which-key-position 'bottom
    ;; 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.
+   ;; nil to boost the loading time. (default t)
    dotspacemacs-loading-progress-bar t
-   ;; If non nil the frame is fullscreen when Emacs starts up.
+   ;; If non nil the frame is fullscreen when Emacs starts up. (default nil)
    ;; (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."
+   ;; Use to disable fullscreen animations in OSX. (default nil)
    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)
+   ;; (default 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'.
+   ;; Transparency can be toggled through `toggle-transparency'. (default 90)
    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'.
+   ;; Transparency can be toggled through `toggle-transparency'. (default 90)
    dotspacemacs-inactive-transparency 90
-   ;; If non nil unicode symbols are displayed in the mode line.
+   ;; If non nil unicode symbols are displayed in the mode line. (default t)
    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.
+   ;; point when it reaches the top or bottom of the screen. (default t)
    dotspacemacs-smooth-scrolling t
    ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
+   ;; (default nil)
    dotspacemacs-smartparens-strict-mode nil
-   ;; Select a scope to highlight delimiters. Possible value is `all',
-   ;; `current' or `nil'. Default is `all'
+   ;; Select a scope to highlight delimiters. Possible values are `any',
+   ;; `current', `all' or `nil'. Default is `all' (highlight any scope and
+   ;; emphasis the current one). (default 'all)
    dotspacemacs-highlight-delimiters 'all
    ;; If non nil advises quit functions to keep server open when quitting.
+   ;; (default nil)
    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'.
+   ;; (default '("ag" "pt" "ack" "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.
+   ;; Not used for now. (default nil)
    dotspacemacs-default-package-repository nil
-   )
-  ;; User initialization goes here
+   ))
+
+(defvar ao/v-dired-omit t
+  "If dired-omit-mode enabled by default. Don't setq me.")
+
+(defun ao/dired-omit-switch ()
+  "This function is a small enhancement for `dired-omit-mode', which will
+   \"remember\" omit state across Dired buffers."
+  (interactive)
+  (if (eq ao/v-dired-omit t)
+      (setq ao/v-dired-omit nil)
+    (setq ao/v-dired-omit t))
+  (ao/dired-omit-caller)
+  (when (equal major-mode 'dired-mode)
+    (revert-buffer)))
+
+(defun ao/dired-omit-caller ()
+  (if ao/v-dired-omit
+      (setq dired-omit-mode t)
+    (setq dired-omit-mode nil)))
+
+(defun ao/dired-back-to-top()
+  "Move to the first file."
+  (interactive)
+  (beginning-of-buffer)
+  (dired-next-line 2))
+
+(defun ao/dired-jump-to-bottom()
+  "Move to last file."
+  (interactive)
+  (end-of-buffer)
+  (dired-next-line -1))
+
+(defun ao/what-face (pos)
+  "Describes the face at the current cursor position.
+Helps making themes, put your cursor at the point you want to know the face of, and
+M-x ao/what-face."
+  (interactive "d")
+  (let ((face (or (get-char-property (point) 'read-face-name)
+                  (get-char-property (point) 'face))))
+    (if face (message "Face: %s" face) (message "No face at %d" pos))))
+
+(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)))
+
+(defun ao/find-dotfile (orig-fun &rest args)
+  "Always follow symlink when using `SPC f e d'."
+  (let ((vc-follow-symlinks t))
+    (apply orig-fun args)))
+
+(defun load-ropemacs ()
+  "Load pymacs and ropemacs"
+  (interactive)
+  (require 'pymacs)
+  (pymacs-load "ropemacs" "rope-")
+  ;; Automatically save project python buffers before refactorings
+  (setq ropemacs-confirm-saving 'nil)
+  )
+
+(defun dotspacemacs/user-init ()
+  "Initialization function for user code.
+It is called immediately after `dotspacemacs/init'.  You are free to put any
+user code."
+  (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
+  (add-to-list 'load-path "~/.emacs.d/private/local/")
   )
 
-(defun dotspacemacs/config ()
-  "Configuration function.
+(defun dotspacemacs/user-config ()
+  "Configuration function for user code.
  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")
+
+  (setq org-agenda-files '("~/Code/org"))
+  (global-set-key (kbd "C-c C-g") 'evil-escape)
+  (global-vi-tilde-fringe-mode -1)
+
+  (setq
+   mac-command-modifier 'meta
+
+   org-agenda-include-diary t
+
+   web-mode-enable-engine-detection t
+   web-mode-engines-alist '(("django" . "\\.html\\'"))
+
+   neo-vc-integration nil
+   neo-theme 'nerd
+   neo-show-hidden-files nil
+   neo-hidden-regexp-list '("\\.pyc$" "~$" "^#.#$" "\\.elc$" "^__pycache__")
+
+   jabber-invalid-certificate-servers '("im.zzq.org")
+   jabber-account-list '(("jason@im.zzq.org"
+                          (:network-server . "im.zzq.org")))
+
+   magit-refresh-file-buffer-hook '(magit-revert-buffer magit-update-vc-modeline)
+   )
+
   (add-hook 'python-mode-hook
             (lambda ()
               ;; (setq python-shell-interpreter "python")
@@ -212,7 +336,6 @@ layers configuration."
   ;; 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
@@ -220,52 +343,37 @@ layers configuration."
   ;; 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)
+  ;; Dired
+  (require 'dired-x) ; Enable dired-x
+  (require 'dired+)  ; Enable dired+
+  (setq-default dired-omit-files-p t)  ; Don't show hidden files by default
+  (setq dired-omit-files (concat dired-omit-files "\\|^\\..+$\\|\\.pyc$"))
+  (add-hook 'dired-mode-hook 'ao/dired-omit-caller)
+  (define-key evil-normal-state-map (kbd "_") 'projectile-dired)
+  (define-key evil-normal-state-map (kbd "-") 'dired-jump)
+  (setq diredp-hide-details-initially-flag nil)
+  (advice-add 'spacemacs/find-dotfile :around 'ao/find-dotfile)
+  ;; Make `gg' and `G' do the correct thing
+  (eval-after-load "dired-mode"
+    (evilify dired-mode dired-mode-map
+             "f" 'helm-find-files
+             "h" 'diredp-up-directory-reuse-dir-buffer
+             "l" 'diredp-find-file-reuse-dir-buffer
+             "I" 'ao/dired-omit-switch
+             "gg" 'ao/dired-back-to-top
+             "G" 'ao/dired-jump-to-bottom))
 
 
-  (setq web-mode-enable-engine-detection t)
-  (setq web-mode-engines-alist
-        '(("django"  .  "\\.html\\'")))
+  ;; (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)
 
-)
+  )
 
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.
@@ -279,15 +387,19 @@ layers configuration."
  '(ahs-idle-interval 0.25)
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
- '(elfeed-feeds (quote ("http://nullprogram.com/feed/")))
+ '(custom-safe-themes
+   (quote
+    ("040d5032864c4b6ca2d7ebc89689cd3617edf585ff4db4244baa170f6d18c899" default)))
+ '(org-agenda-files
+   (quote
+    ("~/Code/enderlabs/eventboard.io/agenda.org" "/Users/jason/Code/org/aws.org")))
  '(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)))))
+   (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.
@@ -296,7 +408,6 @@ layers configuration."
  '(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")))
-
+'(elfeed-feeds
+  (quote
+   ("http://www.commandlinefu.com/commands/browse/rss")))