@@ -1,7 +1,9 @@

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

-(setq gc-cons-threshold 100000000

-      inhibit-splash-screen t

-      inhibit-startup-message t)

+(setq read-process-output-max (* 1024 1024))

+(setq

+ ;;gc-cons-threshold 100000000

+ inhibit-splash-screen t

+ inhibit-startup-message t)

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

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

@@ -31,8 +33,11 @@

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

   (load "utils"))

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

 (cold-boot)

+(use-package general

+  :ensure t)

 (use-package flycheck

   :ensure t)

 (use-package company

@@ -50,10 +55,11 @@

            company-bbdb

            company-nxml

            company-css

-           company-xcode

+           ;;company-xcode

            company-cmake

            company-capf

-           company-slime)

+           ;;company-slime

+           )

           company-files

           (company-dabbrev-code

            company-gtags

@@ -158,8 +164,13 @@

 (use-package browse-at-remote

   :after magit

   :ensure t

-  :config (push (cons "gitlab.cj.com" "gitlab")

-                browse-at-remote-remote-type-domains))

+  :config

+  (push (cons "gitlab.cj.com" "gitlab")

+        browse-at-remote-remote-type-domains)

+  (push (cons "gitlab.cj.dev" "gitlab")

+        browse-at-remote-remote-type-domains)

+  (push (cons "git.cnvrmedia.net" "stash")

+        browse-at-remote-remote-type-domains))

 (eval-and-compile

   (defvar *fwoar-git-repos*

@@ -181,13 +192,28 @@

                   "git@git.fiddlerwoaroof.com:dotfiles.git"

                   "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

-

-(defun load-package-configuration (package)

-  (let* ((local-configs "~/.emacs.d/lisp/configurations/")

+(defun fwoar/setup-load-path ()

+  (let* ((new-load-path (cl-adjoin "~/.emacs.d/lisp/configurations/"

+                                   load-path

+                                   :test 'equal))

+         (new-load-path (cl-adjoin (concat *dotfiles-repo*

+                                           "emacs.d/lisp/configurations/")

+                                   new-load-path

+                                   :test 'equal)))

+    (setq load-path new-load-path)))

+

+(fwoar/setup-load-path)

+(defun fwoar/package-configuration (package)

+  (fwoar/setup-load-path)

+  (let* ((local-configs)

          (git-configs (concat *dotfiles-repo*

                               "emacs.d/lisp/configurations/"))

          (conf-file (concat (symbol-name package) "-conf.el"))

          (load-path (list* local-configs git-configs load-path)))

+    conf-file))

+

+(defun load-package-configuration (package)

+  (let ((conf-file (fwoar/package-configuration package)))

     (load conf-file)))

 (defun fwoar/load-local-packages ()

@@ -200,11 +226,11 @@

   (fwoar/load-local-packages))

 (load-package-configuration 'evil)

+(load-package-configuration 'helm)

 (use-package projectile

   :ensure t

   :config

-  (define-key evil-normal-state-map " h" 'helm-projectile-find-file-dwim)

   (setq

    ;;       projectile-enable-caching t

    projectile-generic-command "rg --files -0"

@@ -237,7 +263,7 @@

 ;;(use-package multifiles

 ;;  :config

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

+;; (evil-define-key 'visual 'global (kbd "<leader>m") 'mf/mirror-region-in-multifile)

 ;;  )

 (defun safe-files ()

@@ -290,7 +316,7 @@

      (haskell . t)))

   (define-key global-map "\C-cc" 'org-capture)

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

+  (evil-define-key 'visual 'global (kbd "<leader>c") 'org-capture))

 (use-package org-projectile

   :ensure t

@@ -306,15 +332,6 @@

     (define-key projectile-mode-map (kbd "C-c c") 'org-capture))

   :ensure t)

-(use-package helm-org

-  :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))

-

 (use-package delight

   :ensure t)

@@ -324,7 +341,7 @@

 (use-package deft

   :ensure t

   :config

-  (define-key evil-normal-state-map " v" 'deft))

+  (evil-define-key 'normal 'global (kbd "<leader>v") 'deft))

 (use-package emmet-mode

   :ensure t

@@ -337,8 +354,8 @@

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

+  (evil-define-key 'normal 'global (kbd "<leader>g") 'helm-generate-lisp-skeleton)

+  (evil-define-key 'visual 'global (kbd "<leader>g") 'helm-generate-lisp-skeleton))

@@ -486,12 +503,12 @@ With a prefix ARG invalidates the cache first."

 (defun fwoar-pl-selector ()

   (interactive)

   (fwoar--pl-selector))

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

+(evil-define-key 'normal 'global (kbd "<leader>o") 'fwoar-pl-selector)

 (use-package imenu

   :config

-  (define-key evil-normal-state-map " d" 'helm-imenu-in-all-buffers))

+  (evil-define-key 'normal 'global (kbd "<leader>d") 'helm-imenu-in-all-buffers))

 (defun fwoar--read-register-name ()

   (let ((overlay (make-overlay (point) (point)))

@@ -527,33 +544,6 @@ With a prefix ARG invalidates the cache first."

 (use-package eldoc-eval :ensure t)

-(use-package helm :ensure t :config

-  (require 'helm-config)

-  (helm-mode)

-  (global-set-key (kbd "M-x") 'helm-M-x)

-  (global-set-key (kbd "C-x C-f") 'helm-find-files)

-  (define-key evil-normal-state-map " f" 'helm-projectile)

-  (define-key evil-normal-state-map " j" 'helm-buffers-list)

-  (define-key evil-normal-state-map " s" 'helm-occur)

-  (define-key evil-normal-state-map " S" 'helm-projectile-rg)

-  (define-key helm-map (kbd "C-r") 'fwoar--paste-register-from-helm-current-buffer)

-  (define-key helm-map (kbd "<right>") 'helm-execute-persistent-action)

-  (define-key helm-map

-    (kbd "<left>")

-    'helm-find-files-up-one-level))

-

-(use-package helm-ag :ensure t)

-

-(use-package helm-ag-r :ensure t)

-

-(use-package helm-rg :ensure t)

-

-(use-package helm-css-scss :ensure t)

-

-(use-package helm-ls-git :ensure t)

-

-(use-package helm-projectile :ensure t)

-

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

   (global-highlight-parentheses-mode 1))

@@ -561,8 +551,6 @@ With a prefix ARG invalidates the cache first."

 (use-package markdown-mode :ensure t)

-(use-package project-explorer :ensure t)

-

 (use-package rainbow-delimiters :ensure t)

 (use-package ripgrep :ensure t)

@@ -644,7 +632,7 @@ With a prefix ARG invalidates the cache first."

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

     (helm-projectile-find-file)))

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

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

 (unless fwoar.is-ordinary

   (setq with-editor-emacsclient-executable "/usr/local/bin/emacsclient")

@@ -677,14 +665,6 @@ With a prefix ARG invalidates the cache first."

   (delete-window

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

-(defvar passwords ())

-(defslimefun get-passwd (id prompt)

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

-    (cdr

-     (if val val

-       (car (push (cons id (read-passwd prompt))

-                  passwords))))))

-

 (add-to-list 'browse-url-filename-alist

              '("/Users/\\([^/]+\\)/\\(Sites\\|public_html\\)\\(/.*\\)" . "https://localhost/~\\1\\3"))

@@ -788,8 +768,8 @@ With a prefix ARG invalidates the cache first."

   :hook java-mode

   :config

   (evil-define-key 'normal maven-test-mode-map

-    " t" 'maven-test-all

-    " T" 'maven-test-toggle-between-test-and-class-other-window))

+    (kbd "<leader>t") 'maven-test-all

+    (kbd "<leader>T") 'maven-test-toggle-between-test-and-class-other-window))

 (use-package lsp-java

   :ensure t

   :hook (java-mode . lsp))

@@ -802,6 +782,7 @@ With a prefix ARG invalidates the cache first."

   ;; Comment/uncomment this line to see interactions between lsp client/server.

   ;;(setq lsp-log-io t)

   )

+

 (progn

   (require 'ansi-color)

   (defun colorize-compilation-buffer ()

@@ -809,3 +790,4 @@ With a prefix ARG invalidates the cache first."

     (ansi-color-apply-on-region compilation-filter-start (point))

     (toggle-read-only))

   (add-hook 'compilation-filter-hook 'colorize-compilation-buffer))

+(put 'list-timers 'disabled nil)

@@ -35,6 +35,7 @@

   (require 'cider-selector)

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

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

+  (evil-define-key 'normal clojure-mode-map (kbd "SPC") 'evil-send-leader)

   (def-cider-selector-method ?S "find clojure project file"

     (fwoar--find-system))

@@ -16,35 +16,36 @@

   :ensure t

   :config

-  (define-key evil-motion-state-map (kbd "TAB") nil)

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

+  (evil-define-key 'motion 'global  (kbd "TAB") nil)

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

+  (evil-define-key 'motion 'global  (kbd "C-w C-w") 'evil-window-mru)

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

+  (evil-define-key 'normal 'global (kbd "ZZ") 'save-buffer)

   (advice-add 'evil-delete-marks :after

               (lambda (&rest args)

                 (evil-visual-mark-render)))

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

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

   (evil-mode)

+  (evil-set-leader '(normal) (kbd "<SPC>"))

   (progn ;; navigation

-    (define-key evil-normal-state-map " f" 'helm-projectile)

-    (define-key evil-normal-state-map " ;" 'helm-semantic-or-imenu)

-    (define-key evil-normal-state-map " j" 'helm-buffers-list)

-    (define-key evil-normal-state-map " u" 'undo-tree-visualize))

+    (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)

+    (evil-define-key 'normal 'global (kbd "<leader>;") 'helm-semantic-or-imenu)

+    (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)

+    (evil-define-key 'normal 'global (kbd "<leader>u") 'undo-tree-visualize))

   (progn ;; completion

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

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

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

+  (evil-define-key 'normal magit-file-mode-map (kbd "<leader>a") 'magit)

   (progn ;; error jumping

-    (define-key evil-motion-state-map "]e" 'flycheck-next-error)

-    (define-key evil-motion-state-map "[e" 'flycheck-previous-error))

+    (evil-define-key 'motion 'global (kbd "]e") 'flycheck-next-error)

+    (evil-define-key 'motion 'global (kbd "[e") 'flycheck-previous-error))

   ;; make evil keybindings apply right away when I open a new buffer

   (add-hook 'window-configuration-change-hook 'evil-normalize-keymaps))

@@ -55,11 +56,6 @@

   :config

   (global-evil-surround-mode))

-(use-package evil-leader

-  :ensure t

-  :after evil

-  :config (evil-leader/set-leader "ß"))

-

 (use-package evil-smartparens

   :ensure t

   :delight

@@ -68,21 +64,21 @@

   (evil-smartparens-mode 1)

   (progn ;; wrapping

-    (define-key evil-normal-state-map ",W" 'sp-wrap-round)

-    (define-key evil-normal-state-map (kbd "C-, W") 'sp-wrap-round)

-    (define-key evil-normal-state-map (kbd "C-, C-W") 'sp-wrap-round)

+    (evil-define-key 'normal 'global (kbd ",W") 'sp-wrap-round)

+    (evil-define-key 'normal 'global  (kbd "C-, W") 'sp-wrap-round)

+    (evil-define-key 'normal 'global  (kbd "C-, C-W") 'sp-wrap-round)

-    (define-key evil-normal-state-map ",w(" 'sp-wrap-round)

-    (define-key evil-normal-state-map ",w)" 'sp-wrap-round)

+    (evil-define-key 'normal 'global (kbd ",w(") 'sp-wrap-round)

+    (evil-define-key 'normal 'global (kbd ",w)") 'sp-wrap-round)

     (define-key global-map (kbd "C-, (") 'sp-wrap-round)

     (define-key global-map (kbd "C-, C-(") 'sp-wrap-round)

     (define-key global-map (kbd "C-, )") 'sp-wrap-round)

     (define-key global-map (kbd "C-, C-)") 'sp-wrap-round)

-    (define-key evil-normal-state-map ",w$" 'wrap-in-dollar-brace)

-    (define-key evil-normal-state-map (kbd "C-, $") 'wrap-in-dollar-brace)

-    (define-key evil-normal-state-map ",w{" 'sp-wrap-curly)

-    (define-key evil-normal-state-map ",w}" 'sp-wrap-curly)

+    (evil-define-key 'normal 'global (kbd ",w$") 'wrap-in-dollar-brace)

+    (evil-define-key 'normal 'global  (kbd "C-, $") 'wrap-in-dollar-brace)

+    (evil-define-key 'normal 'global (kbd ",w{") 'sp-wrap-curly)

+    (evil-define-key 'normal 'global (kbd ",w}") 'sp-wrap-curly)

     (define-key global-map (kbd "C-, {") 'sp-wrap-curly)

     (define-key global-map (kbd "C-, C-{") 'sp-wrap-curly)

     (define-key global-map (kbd "C-, }") 'sp-wrap-curly)

@@ -90,8 +86,8 @@

     (define-key global-map (kbd "C-, w {") 'sp-wrap-curly)

     (define-key global-map (kbd "C-, w }") 'sp-wrap-curly)

-    (define-key evil-normal-state-map ",w[" 'sp-wrap-square)

-    (define-key evil-normal-state-map ",w]" 'sp-wrap-square)

+    (evil-define-key 'normal 'global (kbd ",w[") 'sp-wrap-square)

+    (evil-define-key 'normal 'global (kbd ",w]") 'sp-wrap-square)

     (define-key global-map (kbd "C-, w [") 'sp-wrap-square)

     (define-key global-map (kbd "C-, <escape>") 'sp-wrap-square)

     (define-key global-map (kbd "C-, [") 'sp-wrap-square)

@@ -99,51 +95,51 @@

     (define-key global-map (kbd "C-, C-]") 'sp-wrap-square)

     (define-key global-map (kbd "C-, ]") 'sp-wrap-square)

-    (define-key evil-normal-state-map ",w\"" 'wrap-with-doublequote)

+    (evil-define-key 'normal 'global (kbd ",w\"") 'wrap-with-doublequote)

     (define-key cider-mode-map (kbd "C-, w \"") 'sp-wrap-doublequote))

   (progn ;; splicing

-    (define-key evil-normal-state-map ",S" 'sp-splice-sexp)

+    (evil-define-key 'normal 'global (kbd ",S") 'sp-splice-sexp)

     (define-key cider-mode-map (kbd "C-, S") 'sp-splice-sexp)

     (define-key cider-mode-map (kbd "C-, C-S") 'sp-splice-sexp)

-    (define-key evil-normal-state-map ",A" 'sp-splice-sexp-killing-backward)

+    (evil-define-key 'normal 'global (kbd ",A") 'sp-splice-sexp-killing-backward)

     (define-key cider-mode-map (kbd "C-, A") 'sp-splice-sexp-killing-backward)

     (define-key cider-mode-map (kbd "C-, C-A") 'sp-splice-sexp-killing-backward)

-    (define-key evil-normal-state-map ",D" 'sp-splice-sexp-killing-forward)

+    (evil-define-key 'normal 'global (kbd ",D") 'sp-splice-sexp-killing-forward)

     (define-key cider-mode-map (kbd "C-, D") 'sp-splice-sexp-killing-forward)

     (define-key cider-mode-map (kbd "C-, C-D") 'sp-splice-sexp-killing-forward)

-    (define-key evil-normal-state-map ",F" 'sp-splice-sexp-killing-around)

+    (evil-define-key 'normal 'global (kbd ",F") 'sp-splice-sexp-killing-around)

     (define-key cider-mode-map (kbd "C-, F") 'sp-splice-sexp-killing-around)

     (define-key cider-mode-map (kbd "C-, C-F") 'sp-splice-sexp-killing-around))

   (progn ;; barf/slurp

-    (define-key evil-normal-state-map ",," 'sp-backward-barf-sexp)

+    (evil-define-key 'normal 'global (kbd ",,") 'sp-backward-barf-sexp)

     (define-key cider-mode-map (kbd "C-, ,") 'sp-backward-barf-sexp)

     (define-key cider-mode-map (kbd "C-, C-,") 'sp-backward-barf-sexp)

-    (define-key evil-normal-state-map ",." 'sp-forward-barf-sexp)

+    (evil-define-key 'normal 'global (kbd ",.") 'sp-forward-barf-sexp)

     (define-key cider-mode-map (kbd "C-, .") 'sp-forward-barf-sexp)

     (define-key cider-mode-map (kbd "C-, C-.") 'sp-forward-barf-sexp)

-    (define-key evil-normal-state-map ",<" 'sp-backward-slurp-sexp)

+    (evil-define-key 'normal 'global (kbd ",<") 'sp-backward-slurp-sexp)

     (define-key cider-mode-map (kbd "C-, <") 'sp-backward-slurp-sexp)

     (define-key cider-mode-map (kbd "C-, C-<") 'sp-backward-slurp-sexp)

-    (define-key evil-normal-state-map ",>" 'sp-forward-slurp-sexp)

+    (evil-define-key 'normal 'global (kbd ",>") 'sp-forward-slurp-sexp)

     (define-key cider-mode-map (kbd "C-, >") 'sp-forward-slurp-sexp)

     (define-key cider-mode-map (kbd "C-, C->") 'sp-forward-slurp-sexp))

   (progn ;; misc

-    (define-key evil-normal-state-map ",~" 'sp-convolute-sexp)

-    (define-key evil-normal-state-map ",a" 'sp-absorb-sexp)

-    (define-key evil-normal-state-map ",e" 'sp-emit-sexp)

-    (define-key evil-normal-state-map ",`" 'sp-clone-sexp)

-    (define-key evil-normal-state-map ",J" 'sp-join-sexp)

-    (define-key evil-normal-state-map ",|" 'sp-split-sexp))

+    (evil-define-key 'normal 'global (kbd ",~") 'sp-convolute-sexp)

+    (evil-define-key 'normal 'global (kbd ",a") 'sp-absorb-sexp)

+    (evil-define-key 'normal 'global (kbd ",e") 'sp-emit-sexp)

+    (evil-define-key 'normal 'global (kbd ",`") 'sp-clone-sexp)

+    (evil-define-key 'normal 'global (kbd ",J") 'sp-join-sexp)

+    (evil-define-key 'normal 'global (kbd ",|") 'sp-split-sexp))

   (progn ;; narrowing

-    (define-key evil-normal-state-map " n(" 'sp-narrow-to-sexp)

-    (define-key evil-normal-state-map " n)" 'sp-narrow-to-sexp)

-    (define-key evil-normal-state-map " nn" 'narrow-to-defun)

-    (define-key evil-normal-state-map " nr" 'narrow-to-region)

-    (define-key evil-normal-state-map " nw" 'widen)))

+    (evil-define-key 'normal 'global (kbd "<leader>n(") 'sp-narrow-to-sexp)

+    (evil-define-key 'normal 'global (kbd "<leader>n)") 'sp-narrow-to-sexp)

+    (evil-define-key 'normal 'global (kbd "<leader>nn") 'narrow-to-defun)

+    (evil-define-key 'normal 'global (kbd "<leader>nr") 'narrow-to-region)

+    (evil-define-key 'normal 'global (kbd "<leader>nw") 'widen)))

 (use-package centaur-tabs

   :ensure t

@@ -153,10 +149,10 @@

         centaur-tabs-adjust-buffer-order 'right)

   (centaur-tabs-enable-buffer-reordering)

-  (define-key evil-normal-state-map "gt" 'centaur-tabs-forward-tab)

+  (evil-define-key 'normal 'global (kbd "gt") 'centaur-tabs-forward-tab)

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

   (define-key global-map (kbd "s-}") 'centaur-tabs-forward-tab)

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

+  (evil-define-key 'normal 'global (kbd "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))

new file mode 100644

@@ -0,0 +1,43 @@

+

+(use-package helm :ensure t :config

+  (require 'helm-config)

+  (helm-mode)

+  (global-set-key (kbd "M-x") 'helm-M-x)

+  (global-set-key (kbd "C-x C-f") 'helm-find-files)

+  (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)

+  (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)

+  (evil-define-key 'normal 'global (kbd "<leader>s") 'helm-occur)

+  (evil-define-key 'normal 'global (kbd "<leader>S") 'helm-projectile-rg)

+  (define-key helm-map (kbd "C-r") 'fwoar--paste-register-from-helm-current-buffer)

+  (define-key helm-map (kbd "<right>") 'helm-execute-persistent-action)

+  (define-key helm-map

+    (kbd "<left>")

+    'helm-find-files-up-one-level))

+

+(use-package helm-org

+  :after helm

+  :ensure t)

+

+(use-package org-projectile-helm

+  :after helm

+  :ensure t

+  :after org-projectile

+  :config

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

+

+(use-package helm-ag :after helm :ensure t)

+

+(use-package helm-ag-r :after helm :ensure t)

+

+(use-package helm-rg :after helm :ensure t)

+

+(use-package helm-css-scss :after helm :ensure t)

+

+(use-package helm-ls-git :after helm :ensure t)

+

+(use-package helm-projectile :after helm :ensure t

+             :config

+  (evil-define-key 'normal 'global (kbd "<leader>h") 'helm-projectile-find-file-dwim)

+  )

+

+(use-package project-explorer :after helm :ensure t)

@@ -131,14 +131,32 @@ Examples:

       (indent-sexp)))

   (sp-backward-whitespace))

+(comment

+)

+

+(use-package slime-company

+  :ensure t

+  :after slime

+  :config (setq slime-company-completion 'fuzzy))

+

+(defvar passwords ())

 (use-package slime

   :ensure t

-  :load-path  (lambda ()

-                (list

-                 (fwoar-git-repo "3dp/slime/"

-                                 "git@github.com:slime/slime.git"

-                                 "https://github.com/slime/slime.git")))

+  :after smartparens

+  :load-path (lambda ()

+               (list

+                (fwoar-git-repo "3dp/slime/"

+                                "git@github.com:slime/slime.git"

+                                "https://github.com/slime/slime.git")))

   :config

+

+  (defslimefun get-passwd (id prompt)

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

+      (cdr

+       (if val val

+         (car (push (cons id (read-passwd prompt))

+                    passwords))))))

+  (message "%s" load-path)

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

             (eq system-type 'darwin))

     (define-lisp-implementations

@@ -203,7 +221,8 @@ Examples:

            slime-selector-methods

            :key #'car)

-  (setq slime-contribs '(slime-fancy

+  (setq slime-contribs '(slime-media

+                         slime-fancy

                          slime-company

                          slime-macrostep

                          slime-trace-dialog

@@ -245,8 +264,3 @@ Examples:

                              (lambda (r)

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

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

-

-(use-package slime-company

-  :ensure t

-  :after slime

-  :config (setq slime-company-completion 'fuzzy))

@@ -1,5 +1,28 @@

+;;; utils -- Summary

+;;; Commentary:

+

 (require 'cl)

+;;; Code:

+

+(defun fwoar/doc-for-resource-type (resource-type)

+  (cl-format nil

+             "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/~{~a~^-~}"

+             (list* "aws" "resource"

+                    (cdr (s-split "::" (s-downcase resource-type))))))

+(defun fwoar/document-cf (min max)

+  "Jump to AWS Cloudformation docs for a resource type.

+

+MIN: the point in the buffer where the resource type starts

+MAX: the point in the buffer where the resource type ends

+

+This uses (interactive \"r\") to automagically populate the arguments

+from the selected region."

+  (interactive "r")

+  (browse-url

+   (fwoar/doc-for-resource-type

+    (buffer-substring min max))))

+

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

   (with-temp-buffer

     (save-excursion

@@ -121,14 +144,19 @@ started from a shell."

             (helm-projectile-rg))

         (error "`helm-rg' is not available.  Is MELPA in your `package-archives'?")))))

+(defmacro fwoar/defvaralias! (var val-var)

+  `(progn

+     (setq ,var ,val-var)

+     (defvaralias ',var ',val-var)))

+

 (defun setup-indentation ()

   (setq-default indent-tabs-mode nil

                 tab-width 2)

-  (defvaralias 'c-basic-offset 'tab-width)

-  (defvaralias 'sh-basic-offset 'tab-width)

-  (defvaralias 'js2-basic-offset 'tab-width)

-  (defvaralias 'sgml-basic-offset 'tab-width)

-  (defvaralias 'cperl-indent-level 'tab-width)

+  (fwoar/defvaralias! c-basic-offset tab-width)

+  (fwoar/defvaralias! sh-basic-offset tab-width)

+  (fwoar/defvaralias! js2-basic-offset tab-width)

+  (fwoar/defvaralias! sgml-basic-offset tab-width)

+  (fwoar/defvaralias! cperl-indent-level tab-width)

   nil)

 (defun start-server ()

@@ -152,11 +180,13 @@ started from a shell."

       (global-display-line-numbers-mode)

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

     (global-linum-mode))

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

   ;; NOTE: this must be here...

   (global-company-mode 1))

+(defvar fwoar.is-ordinary)

+

 (defun cold-boot ()

+  ""

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

   (add-hook 'after-init-hook 'post-init)

   (electric-indent-mode -1)

@@ -164,8 +194,9 @@ started from a shell."

    (electric-pair-mode -1))

   (add-hook 'before-save-hook 'delete-trailing-whitespace)

-  (when (file-exists-p "/usr/local/bin/gls")

-    (setq insert-directory-program "/usr/local/bin/gls"))

+  (comment

+   (when-let ((ls-executable (executable-find "gls")))

+     (setq insert-directory-program ls-executable)))

   (setq default-directory "~/emacs-home/")

   (make-directory default-directory t)

@@ -183,7 +214,7 @@ started from a shell."

                                      ("melpa" . 2)

                                      ("org" . 3)))

-  (package-initialize)

+  (package-initialize 'no-activate)

   (when (not (package-installed-p 'use-package))

     (package-refresh-contents)

     (package-install 'use-package))