unscroll func and other updates

1 files changed, 50 insertions, 9 deletions

diff --git a/.spacemacs b/.spacemacs
index ca0fea4..48f8f43 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -34,8 +34,6 @@ values."
      deft
      django
      emacs-lisp
-     eyebrowse
-     erc
      git
      gnus
      ;; github
@@ -45,6 +43,7 @@ values."
      markdown
      org
      osx
+     perspectives
      (python :variables
              ;;python-enable-yapf-format-on-save t
              )
@@ -69,6 +68,7 @@ values."
                                       hackernews
                                       ;; helm-dash ;; osx is broken
                                       ;; itail
+                                      jbeans-theme
                                       magit-gitflow
                                       ;; mentor ;; rTorrent client
                                       org-journal
@@ -121,7 +121,7 @@ values."
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
    ;; size to make separators look not too crappy.
    dotspacemacs-default-font '("Inconsolata for Powerline"
-                               :size 11
+                               :size 12
                                :weight normal
                                :width normal
                                :powerline-scale 1.0)
@@ -269,19 +269,57 @@ M-x ao/what-face."
   (let ((vc-follow-symlinks t))
     (apply orig-fun args)))
 
+(defun other-window-previous (&optional n)
+  "Move to the previous window"
+  (interactive "p")
+  (other-window (- n))
+  )
+;; Undo accidental scrolling
+(defvar unscroll-point nil
+  "Text position for next call to 'unscroll'.")
+(defvar unscroll-window-start nil
+  "Window start for next call to 'unscroll'.")
+(defvar unscroll-window-hscroll nil
+  "Hscroll for  next call to 'unscroll'.")
+(defun unscroll-maybe-remember ()
+  (if (not (or (eq last-command 'scroll-up-command)
+               (eq last-command 'scroll-down-command)))
+      (setq unscroll-point (point)
+            unscroll-window-start (window-start)
+            unscroll-window-hscroll (window-hscroll))))
+(defun unscroll ()
+  "Jump to location specified by 'unscroll-point'."
+  (interactive)
+  (if (not unscroll-point)
+      (error "Cannot unscroll yet"))
+
+  (goto-char unscroll-point)
+  (set-window-start nil unscroll-window-start)
+  (set-window-hscroll nil unscroll-window-hscroll))
+(defadvice scroll-down (before remember-for-unscroll
+                               activate compile)
+  "Remember where we started from, for 'unscroll'."
+  (unscroll-maybe-remember))
+(defadvice scroll-up (before remember-for-unscroll
+                               activate compile)
+  "Remember where we started from, for 'unscroll'."
+  (unscroll-maybe-remember))
+;; End accidental scrolling
+
 (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)
+  (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."
+  (require 'tls)
   (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
   (add-to-list 'load-path "~/.emacs.d/private/local/")
   )
@@ -292,12 +330,15 @@ user code."
 layers configuration."
 
   (setq org-agenda-files '("~/Code/org"))
-  (global-set-key (kbd "C-c C-g") 'evil-escape)
+  ;(global-set-key (kbd "C-c C-g") 'evil-escape)
   (global-vi-tilde-fringe-mode -1)
 
+  (global-set-key (kbd "C-<") 'other-window-previous)
+  (global-set-key (kbd "C->") 'other-window)
+
   (setq
    mac-command-modifier 'meta
-
+   diredp-hide-details-initially-flag nil
    org-agenda-include-diary t
 
    web-mode-enable-engine-detection t
@@ -327,7 +368,8 @@ layers configuration."
   (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)))
+      (apply orig-fun args))r)
+
 
 
   ;; then, in `user-config` in `~/.spacemacs`:
@@ -343,7 +385,6 @@ layers configuration."
   ;; or searches
   (global-evil-search-highlight-persist nil)
 
-
   ;; Dired
   (require 'dired-x) ; Enable dired-x
   (require 'dired+)  ; Enable dired+
@@ -389,7 +430,7 @@ layers configuration."
  '(ahs-inhibit-face-list nil)
  '(custom-safe-themes
    (quote
-    ("040d5032864c4b6ca2d7ebc89689cd3617edf585ff4db4244baa170f6d18c899" default)))
+    ("369c5ccf7acf67abbc1f4f46e8267044972cd9647b15f42214cb470e3b74d5cf" "4f131ca455f9de016ceecb37f821a9392948a65fc9c0ceb6222435f43ca6f16c" "040d5032864c4b6ca2d7ebc89689cd3617edf585ff4db4244baa170f6d18c899" default)))
  '(org-agenda-files
    (quote
     ("~/Code/enderlabs/eventboard.io/agenda.org" "/Users/jason/Code/org/aws.org")))