@@ -31,12 +31,17 @@

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

   (progn ;; completion

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

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

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

+

+  (progn ;; error jumping

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

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

   (progn ;; workaround until this fixed: https://github.com/emacs-evil/evil/issues/1129

     ;;                          or this: https://github.com/emacs-evil/evil/pull/1130

@@ -169,5 +174,10 @@

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

- 

+

+(defun setup-special-mode ()

+  (company-mode -1))

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

+(add-hook 'special-mode-hook

+          'setup-special-mode)

@@ -263,11 +263,12 @@ Also bind `class' to ((class color) (min-colors 89))."

    `(cider-test-error-face ((t (:background ,zenburn-red-5))))

    `(cider-test-failure-face ((t (:background ,zenburn-red-6))))

    `(cider-test-success-face ((t (:background ,zenburn-green-2))))

-   `(cider-enlightened-local-face ((t (:foreground ,zenburn-yellow-1))))

+   `(cider-enlightened-face ((t (:inherit cider-result-overlay-face :foreground ,zenburn-yellow-1))))

+   `(cider-enlightened-local-face ((t (:inherit cider-result-overlay-face :foreground ,zenburn-yellow-1))))

    `(cider-fringe-good-face ((t (:foreground ,zenburn-green-5))))

    `(cider-debug-code-overlay-face ((t (:background ,zenburn-bg+1))))

    `(cider-deprecated-face ((t (:background ,zenburn-bg-1))))

-   `(cider-result-overlay-face ((t (:background ,zenburn-bg-1))))

+   `(cider-result-overlay-face ((t (:box (:line-width -1 :color ,zenburn-fg-2) :background ,zenburn-bg-1))))

    ;; javascript

    `(js2-function-param ((t (:inherit font-lock-variable-name-face))))

@@ -90,11 +90,15 @@ REVERSE - Jump to previous position in skeleton"

   "(defvar " str @ _ ")"  \n

   '(evil-insert 1))

+(defvar fwoar::*package-prefix* "fwoar"

+  "A prefix applied to lisp packages")

+

 (define-skeleton skel-defpackage

   "Insert a defpackage template"

   (skeleton-read "Package Name: "

                  (if v1

-                     (concat "fwoar."

+                     (format "%s.%s"

+                             fwoar::*package-prefix*

                              (file-name-sans-extension

                               (file-name-nondirectory

                                (buffer-file-name))))))

@@ -29,7 +29,6 @@

   `(lambda ,(op--collect-args body)

      ,@body))

-

 (defun blank-line-p ()

   (= (current-indentation)

      (- (line-end-position) (line-beginning-position))))

@@ -48,11 +47,13 @@

 (defun create-system-files ()

   (interactive)

   (save-excursion

+    (mark-defun)

     (mapcar (lambda (it) (save-buffer (find-file (format "%s.lisp" (cadr it)))))

             (getf (cddar (read-from-string

                           (buffer-substring (point)

                                             (mark))))

-                  :components))))

+                  :components)))

+  (pop-mark))

 (defmacro comment (&rest _))

@@ -99,25 +100,27 @@ started from a shell."

                       ,@(cdr pck)))

                  packages)))

+(defun helm-projectile-rg ()

+  "Projectile version of `helm-rg'."

+  (interactive)

+  (if (require 'helm-rg nil t)

+      (if (projectile-project-p)

+          (let ((helm-rg-prepend-file-name-line-at-top-of-matches nil)

+                (helm-rg-include-file-on-every-match-line t))

+            (helm-rg (helm-projectile-rg--region-selection)

+                     nil

+                     (list (projectile-project-root))))

+        (error "You're not in a project"))

+    (when (yes-or-no-p "`helm-rg' is not installed. Install? ")

+      (condition-case nil

+          (progn

+            (package-install 'helm-rg)

+            (helm-projectile-rg))

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

+

 (defun post-init ()

   ;;;;; INDENTATION SETUP  {{{

-  (defun helm-projectile-rg ()

-    "Projectile version of `helm-rg'."

-    (interactive)

-    (if (require 'helm-rg nil t)

-        (if (projectile-project-p)

-            (let ((helm-rg-prepend-file-name-line-at-top-of-matches nil)

-                  (helm-rg-include-file-on-every-match-line t))

-              (helm-rg (helm-projectile-rg--region-selection)

-                       nil

-                       (list (projectile-project-root))))

-          (error "You're not in a project"))

-      (when (yes-or-no-p "`helm-rg' is not installed. Install? ")

-        (condition-case nil

-            (progn

-              (package-install 'helm-rg)

-              (helm-projectile-rg))

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

+

   (centaur-tabs-mode 1)

   (progn

@@ -139,6 +142,7 @@ started from a shell."

                        "notes")))

     (unless (server-running-p)

       (server-start)))

+

   (projectile-mode)

   (evil-mode)

   ;; (paredit-mode)

@@ -182,7 +186,7 @@ started from a shell."

     (package-install 'use-package))

   (setq browse-url-browser-function

-        'eww-browse-url)

+        'browse-url-default-browser)

   (require 'use-package))