@@ -15,8 +15,11 @@

 (use-package color-theme :ensure t)

 ;; (use-package zenburn-theme :ensure t)

+(add-to-list 'load-path "~/.emacs.d/themes/")

+(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")

 (require 'el-zenburn-theme)

 (color-theme-initialize)

+

 (load-theme 'el-zenburn t)

 (load-package-configuration 'evil)

@@ -62,21 +65,10 @@

   :config

   (define-key evil-insert-state-map (kbd "C-c ,") 'emmet-expand-line))

-(use-package lisp-skeletons

-  :config

-  (add-hook 'skeleton-end-hook 'skeleton-make-markers)

-

-  (define-key evil-insert-state-map (kbd "C-c j") 'skeleton-next-position)

-  (define-key evil-insert-state-map (kbd "C-c k") 'skeleton-prev-position)

-  (define-key evil-normal-state-map " g" 'helm-generate-lisp-skeleton)

-  (define-key evil-visual-state-map " g" 'helm-generate-lisp-skeleton))

-

-(load-package-configuration 'slime)

 (use-package company-posframe

   :ensure t)

 (use-package company

-  :defer 5

   :config

   ;; keybindings

   (progn (define-key company-active-map (kbd "C-c h") 'company-quickhelp-manual-begin)

@@ -93,6 +85,7 @@

           company-xcode

           company-cmake

           company-capf

+          company-slime

           company-files

           (company-dabbrev-code

            company-gtags

@@ -103,6 +96,18 @@

   (add-hook 'company-mode-hook (lambda () (company-posframe-mode 1)))

   )

+(use-package lisp-skeletons

+  :config

+  (add-hook 'skeleton-end-hook 'skeleton-make-markers)

+

+  (define-key evil-insert-state-map (kbd "C-c j") 'skeleton-next-position)

+  (define-key evil-insert-state-map (kbd "C-c k") 'skeleton-prev-position)

+  (define-key evil-normal-state-map " g" 'helm-generate-lisp-skeleton)

+  (define-key evil-visual-state-map " g" 'helm-generate-lisp-skeleton))

+

+(load-package-configuration 'slime)

+(global-company-mode 1)

+

 (use-package projectile

   :ensure t

   :config

@@ -143,6 +148,7 @@

 (ensure-use-packages

  ;;(ac-js2)

  (ag)

+ (aggressive-indent)

  (css-eldoc)

  (csv-mode)

  (eldoc-eval)

@@ -14,22 +14,27 @@

         (concat "file://" common-lisp-hyperspec-root)))

 ;; Replace "sbcl" with the path to your implementation

-(setq inferior-lisp-program "~/sbcl/bin/sbcl"

-      slime-company-completion 'fuzzy) 

-(add-hook 'lisp-mode-hook

-          '(lambda ()

-             ;;(define-key evil-insert-state-map "^N" 'slime-fuzzy-indent-and-complete-symbol)

-             ;; (unless (string= "*slime-scratch*" (buffer-name))

-             ;;   (paredit-mode)

-             ;;   (evil-paredit-mode))

-             (rainbow-delimiters-mode))) 

+(setq inferior-lisp-program "~/sbcl/bin/sbcl") 

-(setq slime-contribs

-      '(slime-fancy

-        slime-company

-        slime-macrostep

-        slime-trace-dialog

-        slime-mdot-fu))

+(defun setup-lisp-mode ()

+  (comment

+   (unless (string= "*slime-scratch*" (buffer-name))

+     (paredit-mode)

+     (evil-paredit-mode)))

+

+  (unless (string= "*slime-scratch*" (buffer-name))

+    (smartparens-strict-mode 1)

+    (evil-smartparens-mode 1)

+    (aggressive-indent-mode 1))

+

+  (define-key evil-insert-state-map "^N" 'slime-fuzzy-indent-and-complete-symbol)

+  (unless (string= "*slime-scratch*" (buffer-name))

+    (paredit-mode)

+    (evil-paredit-mode))

+  (rainbow-delimiters-mode))

+

+(add-hook 'lisp-mode-hook 'setup-lisp-mode) 

+(add-hook 'emacs-lisp-mode-hook 'setup-lisp-mode) 

 (modify-syntax-entry ?- "w" lisp-mode-syntax-table)

@@ -77,7 +82,52 @@

          slime-selector-methods

          :key #'car)

+(defun slime-ecl ()

+  (interactive)

+  (let ((inferior-lisp-program "ecl"))

+    (slime)))

+

+(defun slime-cmucl ()

+  (interactive)

+  (let ((inferior-lisp-program "cmucl"))

+    (slime)))

+

+(defun slime-sbcl ()

+  (interactive)

+  (let ((inferior-lisp-program "sbcl"))

+    (slime)))

+

+(defun slime-ccl ()

+  (interactive)

+  (let ((inferior-lisp-program "ccl"))

+    (slime)))

+

+(defun find-use-clause (current-form)

+  (when current-form

+    (destructuring-bind (discriminator . packages) current-form

+      (case discriminator

+        (:use (remove-if (op (or (eql :cl _)))

+                         (cdr current-form)))

+        (defpackage (find-use-clause

+                     (find-if (lambda (f)

+                                (and (listp f)

+                                     (eql (car f) :use)))

+                              '(defpackage :tracking-sim (:use :cl :alexandria :serapeum) (:export)))))))))

+

+(defun load-package-uses ()

+  (interactive)

+  (slime-eval-async `(ql:quickload ',(find-use-clause (list-at-point)))))

+

+

+(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-setup)

  ;;;;; }}}

@@ -44,42 +44,6 @@

                                             (mark))))

                   :components)))

-(defun slime-ecl ()

-  (interactive)

-  (let ((inferior-lisp-program "ecl"))

-    (slime)))

-

-(defun slime-cmucl ()

-  (interactive)

-  (let ((inferior-lisp-program "cmucl"))

-    (slime)))

-

-(defun slime-sbcl ()

-  (interactive)

-  (let ((inferior-lisp-program "sbcl"))

-    (slime)))

-

-(defun slime-ccl ()

-  (interactive)

-  (let ((inferior-lisp-program "ccl"))

-    (slime)))

-

-(defun find-use-clause (current-form)

-  (when current-form

-    (destructuring-bind (discriminator . packages) current-form

-      (case discriminator

-        (:use (remove-if (op (or (eql :cl _)))

-                         (cdr current-form)))

-        (defpackage (find-use-clause

-                     (find-if (lambda (f)

-                                (and (listp f)

-                                     (eql (car f) :use)))

-                              '(defpackage :tracking-sim (:use :cl :alexandria :serapeum) (:export)))))))))

-

-(defun load-package-uses ()

-  (interactive)

-  (slime-eval-async `(ql:quickload ',(find-use-clause (list-at-point)))))

-

 (defmacro comment (&rest _))

 (comment

@@ -150,9 +114,7 @@ started from a shell."

   (global-linum-mode)

   (set-exec-path-from-shell-PATH)

   ;; NOTE: this must be here...

-  (global-company-mode 1)

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

-  (slime-setup))

+  (global-company-mode 1))

 (defun cold-boot ()

   (setq fwoar.is-ordinary (not (string= invocation-name "EmacsNotes")))