@@ -1,5 +1,4 @@

 ;; -*- mode: Emacs-Lisp;tab-width: 8;indent-tabs-mode: nil; -*-

-

 (setq gc-cons-threshold 100000000

       inhibit-splash-screen t

       inhibit-startup-message t)

@@ -15,6 +14,11 @@

                (bottom-divider-width . 2)))

        (modify-all-frames-parameters default-frame-alist))

+(let ((my-theme-path (expand-file-name "~/.emacs.d/themes/")))

+  (add-to-list 'load-path my-theme-path)

+  (add-to-list 'custom-theme-load-path my-theme-path)

+  (load-theme 'fwoar-zenburn t))

+

 (tool-bar-mode 0)

 (scroll-bar-mode 0)

@@ -22,18 +26,19 @@

 (let ((default-directory  "~/.emacs.d/lisp/"))

   (make-directory default-directory t)

-  (normal-top-level-add-to-load-path '("."))

+  (add-to-list 'load-path (expand-file-name default-directory))

   (normal-top-level-add-subdirs-to-load-path)

   (load "utils"))

 (cold-boot)

-

+(load "site-lisp")

 (load-package-configuration 'evil)

-(use-package multifiles

-  :config

-  (define-key evil-visual-state-map " m" 'mf/mirror-region-in-multifile))

+;;(use-package multifiles

+;;  :config

+;;  (define-key evil-visual-state-map " m" 'mf/mirror-region-in-multifile)

+;;  )

 (use-package org

   :pin "org"

@@ -62,6 +67,7 @@

   (define-key evil-visual-state-map " c" 'org-capture))

 (use-package org-projectile

+  :ensure t

   :config

   (progn

     (org-projectile-per-project)

@@ -74,6 +80,7 @@

   :ensure t)

 (use-package org-projectile-helm

+  :ensure t

   :after org-projectile

   :config

   (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))

@@ -91,8 +98,6 @@

   :config

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

-(use-package company-posframe

-  :ensure t)

 (use-package company

   :config

   ;; keybindings

@@ -116,7 +121,12 @@

            company-etags

            company-keywords)

           company-oddmuse

-          company-dabbrev))

+          company-dabbrev)))

+

+(use-package company-posframe

+  :ensure t

+  :after company

+  :config

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

 (use-package lisp-skeletons

@@ -128,10 +138,8 @@

   (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 js2-mode

   :ensure t

   :defer t

@@ -471,11 +479,36 @@ With a prefix ARG invalidates the cache first."

 (use-package highlight-parentheses :ensure t :config

   (global-highlight-parentheses-mode 1))

-(use-package magit :ensure t :config

+

+

+(use-package magit :ensure t

+  :config

   (evil-define-key 'normal magit-file-mode-map " a" 'magit)

-  (magit-define-popup-action 'magit-dispatch-popup 106 "Browse remote" 'browse-at-remote)

+  ;; TODO: figure this out with transients

+  ;;(magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)

   'magit-dispatch)

+

+(defvar *fwoar-git-repos*

+  (file-name-as-directory

+   (expand-file-name (car (file-expand-wildcards "~/git*_repos"))

+                     "~")))

+

+(defun fwoar-git-repo (name remote)

+  (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))

+    (unless (file-exists-p dir-name)

+      (magit-run-git-with-input "clone" remote dir-name))

+    dir-name))

+

+(defvar *dotfiles-repo*

+  (fwoar-git-repo "dotfiles" "git@git.fiddlerwoaroof.com:dotfiles.git"))

+

+;; slime depends on fwoar-git-repo

+(load-package-configuration 'slime)

+(global-company-mode 1)

+

+

+

 (use-package markdown-mode :ensure t)

 (use-package project-explorer :ensure t)

@@ -546,8 +579,9 @@ With a prefix ARG invalidates the cache first."

 (global-set-key (kbd "s-v") 'yank)

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

+(load-file custom-file)

+

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

 (defun edit-init-el ()

   (interactive)

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

@@ -569,24 +603,6 @@ With a prefix ARG invalidates the cache first."

 (setq org-agenda-files '("~/org/notes.org"))

-(load-file custom-file)

-

-(defun read-sexps-in-file (fn)

-  (with-temp-buffer

-    (save-excursion

-      (insert "(")

-      (insert-file fn)

-      (goto-char (point-max))

-      (insert "\n)"))

-    (read (current-buffer))))

-

-(comment

- (use-package circe

-   :config

-   (setq circe-server-buffer-name "{host}:{port}"

-         circe-reduce-lurker-spam t

-         circe-network-options (read-sexps-in-file "~/.circe-info"))))

-

 (defvar url-pattern (car (read-sexps-in-file "~/.pastebin-name")))

 (defun pastebin-buffer ()

   (interactive)

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

   (interactive "P")

   (sp-wrap-with-pair "${"))

+(defun fwoar-delete-mru-window ()

+  (interactive)

+  (delete-window

+   (get-mru-window nil nil t)))

 (use-package evil

   :ensure t

   :config

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

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

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

   (define-key evil-normal-state-map "ZZ" 'save-buffer)

@@ -154,3 +158,5 @@

   (define-key evil-normal-state-map "gT" 'centaur-tabs-backward-tab)

   (define-key global-map (kbd "<header-line> <wheel-down>") 'centaur-tabs-backward-tab)

   (define-key global-map (kbd "s-{") 'centaur-tabs-backward-tab))

+ 

+

@@ -1,10 +1,33 @@

 ;;;; SLIME SETUP {{{

 ;; (load (expand-file-name "~/quicklisp/slime-helper.el"))

-(add-to-list 'load-path "~/git_repos/3dp/slime/")

+(add-to-list 'load-path (fwoar-git-repo "3dp/slime/" "git@github.com:slime/slime.git"))

 (require 'slime)

-(use-package slime-company

-  :ensure t)

+;; put slime-company in load-path

+;; (require 'slime-company)

+

+(defmacro define-lisp-implementations (&rest decl)

+  `(progn

+     ,@(cl-loop for (symbol . args) in decl

+                collect `(progn

+                           (defun ,symbol ()

+                             (interactive)

+                             (slime ',symbol))

+                           (cl-pushnew '(,symbol ,@args) slime-lisp-implementations

+                                       :key 'car)))))

+

+(with-eval-after-load "slime"

+  (when (or (eq system-type 'gnu/linux)

+            (eq system-type 'darwin))

+    (define-lisp-implementations

+      (abcl  ("abcl"))

+      (ccl ("ccl"))

+      (clisp ("clisp"))

+      (cmucl ("cmucl" "-quiet"))

+      (ecl   ("ecl"))

+      ;;(mkcl  ("mkcl"))

+      ;;(xcl   ("xcl"))

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

 (global-set-key (kbd "C-c x") 'slime-export-symbol-at-point)

@@ -126,43 +149,10 @@

   (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-buffer-streams

-                       slime-indentation)

-      slime-export-save-file t)

-

-(slime-setup)

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

 ;;;;; }}}

-(defmacro define-lisp-implementations (&rest decl)

-  `(progn

-     ,@(cl-loop for (symbol . args) in decl

-                collect `(progn

-                           (defun ,symbol ()

-                             (interactive)

-                             (slime ',symbol))

-                           (cl-pushnew '(,symbol ,@args) slime-lisp-implementations

-                                       :key 'car)))))

-

-(with-eval-after-load "slime"

-  (when (or (eq system-type 'gnu/linux)

-            (eq system-type 'darwin))

-    (define-lisp-implementations

-      (abcl  ("abcl"))

-      (ccl ("ccl"))

-      (clisp ("clisp"))

-      (cmucl ("cmucl" "-quiet"))

-      (ecl   ("ecl"))

-      ;;(mkcl  ("mkcl"))

-      ;;(xcl   ("xcl"))

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

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

@@ -219,3 +209,14 @@ Examples:

                            (lambda (r)

                              (message "Loading ASDs done: %s" r))))))

            (:one-liner "Load asd for current project")))

+

+(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 slime-contribs)

@@ -1,16 +1,25 @@

 (require 'cl)

+(defun read-sexps-in-file (fn)

+  (with-temp-buffer

+    (save-excursion

+      (insert "(")

+      (insert-file fn)

+      (goto-char (point-max))

+      (insert "\n)"))

+    (read (current-buffer))))

+

 (defun op--collect-args (body)

   (cl-flet ((walker (body &optional args)

-                 (if (null body)

-                     args

-                   (if (symbolp body)

-                       (when (eql ?\_ (elt (symbol-name body) 0))

-                         (cons body args))

-                     (if (listp body)

-                         (append (op--collect-args (car body))

-                                 (op--collect-args (cdr body))

-                                 ))))))

+                    (if (null body)

+                        args

+                      (if (symbolp body)

+                          (when (eql ?\_ (elt (symbol-name body) 0))

+                            (cons body args))

+                        (if (listp body)

+                            (append (op--collect-args (car body))

+                                    (op--collect-args (cdr body))

+                                    ))))))

     (sort (walker body)

           (lambda (a b)

             (< (string-to-number (subseq (symbol-name a) 1))

@@ -66,10 +75,14 @@ that used by the user's shell.

 started from a shell."

   (interactive)

   (let ((path-from-shell

-         (replace-regexp-in-string "[ \t\n]*$" ""

-                                   (shell-command-to-string

-                                    "zsh -c 'source ~/.zsh.d/dependencies/utils.zsh;source ~/.zsh.d/dependencies/path-setup.zsh;echo $PATH'")

-)))

+         (replace-regexp-in-string

+          "[ \t\n]*$" ""

+          (shell-command-to-string

+           (concat "zsh -c '"

+                   "  source ~/.zsh.d/dependencies/utils.zsh;"

+                   "  source ~/.zsh.d/dependencies/path-setup.zsh;"

+                   "  echo $PATH"

+                   "'")))))

     (setenv "PATH" path-from-shell)

     (setq exec-path (split-string path-from-shell path-separator))))

@@ -131,7 +144,9 @@ started from a shell."

   ;; (paredit-mode)

   ;;(global-company-mode)

   ;; (setq linum-format "%5d\u2502")

-  (global-display-line-numbers-mode)

+  (if (version<= "26.0.50" emacs-version )

+      (global-display-line-numbers-mode)

+    (global-linum-mode))

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

   ;; NOTE: this must be here...

   (global-company-mode 1))