@@ -310,109 +310,16 @@ With a prefix ARG invalidates the cache first."

   (print f)

   f)

-(cl-defmethod fwoar--find-system (&context (major-mode clojure-mode))

-  (let ((systems (directory-files

-                  (locate-dominating-file default-directory

-                                          (lambda (n)

-                                            (or (directory-files n nil "project.clj")

-                                                (directory-files n nil "build.boot")

-                                                (directory-files n nil "deps.edn")

-                                                (directory-files n nil "shadow-cljs.edn"))))

-                  t "^\\(project.clj\\|build.boot\\|deps.edn\\|shadow-cljs.edn\\)$")))

-    (find-file (if (not (null (cdr systems)))

-                   (helm-comp-read "system:" systems)

-                 (car systems)))))

-

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

-  (:method ()

-           (slime-selector))

-

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

-           (cider-selector))

-  (:method (&context (projectile-project-type (eql :clojure)))

-           (cider-selector))

-  (:method (&context (major-mode cider-repl-mode))

-           (cider-selector)))

+  (:method () (slime-selector)))

+(cl-defgeneric fwoar--find-system ())

 (defun fwoar-pl-selector ()

   (interactive)

   (fwoar--pl-selector))

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

-

-(use-package cider

-  :ensure t

-  :config

-  (require 'cider-selector)

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

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

-

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

-    (fwoar--find-system))

-

-  (add-hook 'cider-mode-hook

-            (lambda ()

-              (flycheck-mode)

-              (rainbow-delimiters-mode 1)

-              (evil-smartparens-mode 1)

-              (smartparens-strict-mode 1)

-              (aggressive-indent-mode 1)

-              (helm-cider-mode 1)

-              (cider-company-enable-fuzzy-completion)))

-

-  (add-hook 'cider-repl-mode-hook

-            (lambda ()

-              (rainbow-delimiters-mode 1)

-              (evil-smartparens-mode 1)

-              (smartparens-strict-mode 1)

-              (aggressive-indent-mode 0)

-              (helm-cider-mode 1)

-              (cider-company-enable-fuzzy-completion)))

-

-  (modify-syntax-entry ?_ "w" clojure-mode-syntax-table)

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

-  (modify-syntax-entry ?~ "w" clojure-mode-syntax-table)

-  (modify-syntax-entry ?. "w" clojure-mode-syntax-table)

-

-  (define-key cider-repl-mode-map (kbd "C-c M-o") 'cider-repl-clear-buffer)

-  (define-key cider-repl-mode-map (kbd "C-c C-o") 'cider-repl-clear-output)

-  (setq cider-save-file-on-load t

-        cider-repl-history-file "~/.emacs.d/cider-history.clj")

-

-  (defun cider-eval-expression-at-point-in-repl ()

-    (interactive)

-    (let ((form (cider-defun-at-point)))

-      ;; Strip excess whitespace

-      (while (string-match "\\`\s+\\|\n+\\'" form)

-        (setq form (replace-match "" t t form)))

-      (with-current-buffer (cider-current-repl nil t)

-        (let ((fw/window (get-buffer-window)))

-          (with-selected-window fw/window

-            (end-of-buffer)

-            (insert form)

-            (cider-repl-return)

-            (end-of-buffer))))))

-

-  (define-key cider-mode-map

-    (kbd "C-c C-j") 'cider-eval-expression-at-point-in-repl)

-

-  ;; https://github.com/clojure-emacs/cider/issues/2435

-  (defun cider--gather-session-params (session)

-    "Gather all params for a SESSION."

-    (let (params)

-      (dolist (repl (cdr session))

-        (when (buffer-name repl)

-          (setq params (cider--gather-connect-params params repl))))

-      (when-let* ((server (cider--session-server session)))

-        (setq params (cider--gather-connect-params params server)))

-      params))

-

-  )

-

-(use-package flycheck-clj-kondo

-  :ensure t)

-

-

+(load-package-configuration 'cider)

 (use-package imenu

   :config

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

 (use-package helm-rg :ensure t)

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

-

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

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

@@ -496,18 +401,26 @@ With a prefix ARG invalidates the cache first."

   ;;(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 ssh-remote http-remote)

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

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

-      (ecase fwoar-git-mode

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

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

-    dir-name))

+(use-package browse-at-remote

+  :after magit

+  :ensure t

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

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

+

+(eval-and-compile

+  (defvar *fwoar-git-repos*

+    (file-name-as-directory

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

+                       "~"))))

+

+(eval-and-compile

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

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

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

+        (ecase fwoar-git-mode

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

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

+      dir-name)))

 (defvar *dotfiles-repo*

   (fwoar-git-repo "dotfiles"

new file mode 100644

@@ -0,0 +1,96 @@

+(defun fwoar/cider-hook-base ()

+  (flycheck-mode)

+  (rainbow-delimiters-mode 1)

+  (evil-smartparens-mode 1)

+  (smartparens-strict-mode 1)

+  (helm-cider-mode 1)

+  (cider-company-enable-fuzzy-completion))

+(defun fwoar/cider-hook ()

+  (fwoar/cider-hook-base)

+  (aggressive-indent-mode 1))

+(defun fwoar/cider-repl-hook ()

+  (fwoar/cider-hook-base)

+  (aggressive-indent-mode 0))

+

+(defun fwoar/cider-eval-expression-at-point-in-repl ()

+  (interactive)

+  (let ((form (cider-defun-at-point)))

+    ;; Strip excess whitespace

+    (while (string-match "\\`\s+\\|\n+\\'" form)

+      (setq form (replace-match "" t t form)))

+    (with-current-buffer (cider-current-repl nil t)

+      (let ((fw/window (get-buffer-window)))

+        (with-selected-window fw/window

+          (end-of-buffer)

+          (insert form)

+          (cider-repl-return)

+          (end-of-buffer))))))

+

+(use-package cider

+  :ensure t

+  :config

+  (require 'cider-selector)

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

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

+

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

+    (fwoar--find-system))

+

+  (add-hook 'cider-mode-hook 'fwoar/cider-hook)

+  (add-hook 'cider-repl-mode-hook 'fwoar/cider-repl-hook)

+

+  (modify-syntax-entry ?: "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?_ "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?- "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?~ "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?. "w" clojure-mode-syntax-table)

+

+  (define-key cider-repl-mode-map (kbd "C-c M-o") 'cider-repl-clear-buffer)

+  (define-key cider-repl-mode-map (kbd "C-c C-o") 'cider-repl-clear-output)

+  (setq cider-save-file-on-load t

+        cider-repl-history-file "~/.emacs.d/cider-history.clj")

+

+  (define-key cider-mode-map

+    (kbd "C-c C-j") 'fwoar/cider-eval-expression-at-point-in-repl))

+

+(use-package clj-refactor

+  :after cider

+  :ensure t

+  :config

+  (evil-define-key 'normal clojure-mode-map (kbd "SPC r") 'hydra-cljr-toplevel-form-menu/body))

+

+

+(use-package helm-cider

+  :after cider helm

+  :ensure t)

+

+(use-package flycheck-clj-kondo

+  :after flycheck

+  :ensure t)

+

+

+(defun find-clojure-project-file ()

+  (let ((systems (directory-files

+                  (locate-dominating-file default-directory

+                                          (lambda (n)

+                                            (or (directory-files n nil "project.clj")

+                                                (directory-files n nil "build.boot")

+                                                (directory-files n nil "deps.edn")

+                                                (directory-files n nil "shadow-cljs.edn"))))

+                  t "^\\(project.clj\\|build.boot\\|deps.edn\\|shadow-cljs.edn\\)$")))

+    (find-file (if (not (null (cdr systems)))

+                   (helm-comp-read "system:" systems)

+                 (car systems)))))

+

+(cl-defmethod fwoar--find-system (&context (major-mode (derived-mode clojure-mode)))

+  (find-clojure-project-file))

+

+(cl-defmethod fwoar--find-system (&context (major-mode (derived-mode cider-repl-mode)))

+  (find-clojure-project-file))

+

+(defmethod fwoar--pl-selector (&context (major-mode clojure-mode))

+  (cider-selector))

+(defmethod fwoar--pl-selector (&context (projectile-project-type (eql :clojure)))

+  (cider-selector))

+(defmethod fwoar--pl-selector (&context (major-mode cider-repl-mode))

+  (cider-selector))

new file mode 100644

@@ -0,0 +1,59 @@

+(defun fwoar/cider-hook-base ()

+  (flycheck-mode)

+  (rainbow-delimiters-mode 1)

+  (evil-smartparens-mode 1)

+  (smartparens-strict-mode 1)

+  (helm-cider-mode 1)

+  (cider-company-enable-fuzzy-completion))

+(defun fwoar/cider-hook ()

+  (fwoar/cider-hook-base)

+  (aggressive-indent-mode 1))

+(defun fwoar/cider-repl-hook ()

+  (fwoar/cider-hook-base)

+  (aggressive-indent-mode 0))

+

+(defun fwoar/cider-eval-expression-at-point-in-repl ()

+  (interactive)

+  (let ((form (cider-defun-at-point)))

+    ;; Strip excess whitespace

+    (while (string-match "\\`\s+\\|\n+\\'" form)

+      (setq form (replace-match "" t t form)))

+    (with-current-buffer (cider-current-repl nil t)

+      (let ((fw/window (get-buffer-window)))

+        (with-selected-window fw/window

+          (end-of-buffer)

+          (insert form)

+          (cider-repl-return)

+          (end-of-buffer))))))

+

+(use-package cider

+  :ensure t

+  :config

+  (require 'cider-selector)

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

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

+

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

+    (fwoar--find-system))

+

+  (add-hook 'cider-mode-hook 'fwoar/cider-hook)

+  (add-hook 'cider-repl-mode-hook 'fwoar/cider-repl-hook)

+

+  (modify-syntax-entry ?: "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?_ "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?- "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?~ "w" clojure-mode-syntax-table)

+  (modify-syntax-entry ?. "w" clojure-mode-syntax-table)

+

+  (define-key cider-repl-mode-map (kbd "C-c M-o") 'cider-repl-clear-buffer)

+  (define-key cider-repl-mode-map (kbd "C-c C-o") 'cider-repl-clear-output)

+  (setq cider-save-file-on-load t

+        cider-repl-history-file "~/.emacs.d/cider-history.clj")

+

+  (define-key cider-mode-map

+    (kbd "C-c C-j") 'fwoar/cider-eval-expression-at-point-in-repl))

+

+(use-package flycheck-clj-kondo

+  :ensure t)

+

+