@@ -177,12 +177,24 @@ With a prefix ARG invalidates the cache first."

   (define-key evil-normal-state-map "gf" 'project-aware-ffap))

+(use-package cl-generic

+  :ensure t)

+

+(cl-defgeneric fwoar--pl-selector ()

+  (:method ()

+           (slime-selector))

+  (:method (&context (major-mode clojure-mode))

+           (cider-selector)))

+(defun fwoar-pl-selector ()

+  (interactive)

+  (fwoar--pl-selector))

+(define-key evil-normal-state-map " o" 'fwoar--pl-selector)

+

+

 (use-package cider

   :config

   (define-key evil-normal-state-map " t" 'cider-test-run-ns-tests)

   (evil-define-key 'normal clojure-mode-map " '" 'helm-cider-apropos)

-  (evil-define-key 'normal clojure-mode-map " o" 'cider-selector)

-  (evil-define-key 'normal cider-repl-mode-map " o" 'cider-selector)

   (add-hook 'cider-mode-hook

             (lambda ()

@@ -315,9 +327,11 @@ With a prefix ARG invalidates the cache first."

 (setq custom-file "~/.emacs.d/custom.el")

+(defvar *dotfiles-repo* "~/git_repos/dotfiles/")

 (defun edit-init-el ()

   (interactive)

-  (find-file "~/.emacs.d/init.el"))

+  (let ((default-directory *dotfiles-repo*))

+    (helm-projectile-find-file)))

 (setq gc-cons-threshold (* 100 1024))

@@ -371,7 +385,7 @@ With a prefix ARG invalidates the cache first."

 (define-key evil-motion-state-map (kbd "C-w C-w") 'evil-window-mru)

 (defvar passwords ())

-(defun get-passwd (id prompt)

+(defslimefun get-passwd (id prompt)

   (let ((val (assoc id passwords)))

     (cdr

      (if val val

@@ -10,7 +10,6 @@

               (lambda (&rest args)

                 (evil-visual-mark-render)))

-  (evil-define-key 'normal lisp-mode-map " o" 'slime-selector)

   (define-key evil-insert-state-map (kbd "TAB") 'company-indent-or-complete-common)

   (evil-mode)

   (use-package evil-smartparens

@@ -122,14 +122,14 @@

 (message (format "s-c-c is: %s" slime-company-completion))

-(setq slime-contribs

-      '(slime-fancy

-        slime-company

-        slime-macrostep

-        slime-trace-dialog

-        slime-mdot-fu

-        slime-buffer-streams

-        slime-indentation))

+(setq slime-contribs '(slime-fancy

+                       slime-company

+                       slime-macrostep

+                       slime-trace-dialog

+                       slime-mdot-fu

+                       slime-buffer-streams

+                       slime-indentation)

+      slime-export-save-file t)

 (slime-setup)

@@ -158,3 +158,34 @@

       ;;(xcl   ("xcl"))

       (sbcl  ("sbcl" "--dynamic-space-size" "8192")))))

+

+(defun sp-absorb-forward-sexp (&optional arg)

+  "Absorb previous expression.

+

+Save the expressions preceding point and delete them.  Then slurp

+an expression backward and insert the saved expressions.

+

+With ARG positive N, absorb that many expressions.

+

+Examples:

+

+​  (do-stuff 1)         (save-excursion

+​  (save-excursion  ->   |(do-stuff 1)

+​   |(do-stuff 2))        (do-stuff 2))

+

+  foo bar (concat |baz quux) -> (concat |foo bar baz quux) ;; 2"

+  (interactive "p")

+  (sp-forward-whitespace)

+  (let* ((old (point))

+         (raise (progn

+                  (sp-end-of-sexp)

+                  (buffer-substring (point) old))))

+    (delete-region old (point))

+    (sp-forward-slurp-sexp arg)

+    (sp-backward-whitespace)

+    (sp-end-of-sexp)

+    (insert raise)

+    (save-excursion

+      (sp-backward-up-sexp)

+      (indent-sexp)))

+  (sp-backward-whitespace))

@@ -8,3 +8,4 @@

 10180

 cjo/ztest-container*

 .ensime*

+.history