From 6a386b88f8a7c710f7c598534799a2e0a5ecb607 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Wed, 28 Sep 2016 15:23:33 +0330 Subject: [PATCH] clojure plugin improved to a stable state --- fg42-config.el | 2 +- lib/extensions/clojure/core.el | 11 +++++------ lib/extensions/clojure/init.el | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/fg42-config.el b/fg42-config.el index 7a4f306..23c827d 100644 --- a/fg42-config.el +++ b/fg42-config.el @@ -1,5 +1,5 @@ (add-to-list 'load-path (concat (getenv "FG42_HOME") "/lib")) -;(toggle-debug-on-error) +(toggle-debug-on-error) (require 'fg42) ;; Load the default theme diff --git a/lib/extensions/clojure/core.el b/lib/extensions/clojure/core.el index 6957d35..0ac2c05 100644 --- a/lib/extensions/clojure/core.el +++ b/lib/extensions/clojure/core.el @@ -126,7 +126,7 @@ (setq cljr-expectations-test-declaration "[expectations :refer :all]") ;; insert keybinding setup here - (cljr-add-keybindings-with-prefix "C-c RET") + (cljr-add-keybindings-with-prefix "C-c v") (setq cljr-favor-prefix-notation nil) (setq cljr-favor-private-functions nil) @@ -150,7 +150,6 @@ (define-key clojure-mode-map (kbd "C-<") 'cljr-unwind) (define-key clj-refactor-map (cljr--key-pairs-with-modifier "C-s-" "xf") 'my-toggle-expect-focused) - (define-key clj-refactor-map (cljr--key-pairs-with-modifier "C-s-" "xr") 'my-remove-all-focused) @@ -170,9 +169,7 @@ (defun clojure-mode-init () (interactive) - (require 'clojure-mode-extra-font-locking) (require 'cider) - (require 'yesql-ghosts) (require 'hl-sexp) (require 'paredit) @@ -224,7 +221,7 @@ (setq cider-pprint-fn 'pprint) - (setq cider-repl-history-file tmp-directory) + (setq cider-repl-history-file (concat tmp-directory "/cider-repl-history")) ;; nice pretty printing (setq cider-repl-use-pretty-printing t) @@ -258,7 +255,7 @@ (setq cider-repl-popup-stacktraces t) ;; Specify history file - (setq cider-history-file "~/.tmp/nrepl-history") + (setq cider-history-file (concat (getenv "HOME") "/.tmp/nrepl-history")) ;; auto-select the error buffer when it's displayed (setq cider-auto-select-error-buffer t) @@ -303,6 +300,8 @@ (define-key clojure-mode-map (kbd "M-") 'paredit-backward-slurp-sexp) (define-key clojure-mode-map (kbd "C-") 'right-word) (define-key clojure-mode-map (kbd "C-") 'left-word) + (global-set-key (kbd "C-") 'right-word) + (global-set-key (kbd "C-") 'left-word) (message "Clojure mode hook ran and initialized clojure-editor ability.")) diff --git a/lib/extensions/clojure/init.el b/lib/extensions/clojure/init.el index b76a332..0719aaa 100644 --- a/lib/extensions/clojure/init.el +++ b/lib/extensions/clojure/init.el @@ -6,7 +6,7 @@ (ability clojure-editor ('flycheck) (add-hook 'clojure-mode-hook 'clojure-mode-init) - (setq tmp-directory "~/.tmp")) + (setq tmp-directory (concat (getenv "HOME") "/.tmp"))) (ability clojure-completion ('code-completion) ;; company mode for completion @@ -15,20 +15,20 @@ (ability clojure-refactore () - (add-hook 'clojure-mode-hook 'cljr-init)) + (add-hook 'clojure-mode-hook 'cljr-init))) - (ability clojure-check ('flycheck) - (require 'flycheck-clojure) - (eval-after-load 'flycheck '(add-to-list 'flycheck-checkers 'clojure-cider-eastwood)) - (eval-after-load 'flycheck '(flycheck-clojure-setup)) - (add-hook 'after-init-hook #'global-flycheck-mode) - ;; Set up linting of clojure code with eastwood + ;; (ability clojure-check ('flycheck) + ;; (require 'flycheck-clojure) + ;; (eval-after-load 'flycheck '(add-to-list 'flycheck-checkers 'clojure-cider-eastwood)) + ;; (eval-after-load 'flycheck '(flycheck-clojure-setup)) + ;; (add-hook 'after-init-hook #'global-flycheck-mode) + ;; ;; Set up linting of clojure code with eastwood - ;; Make sure to add [acyclic/squiggly-clojure "0.1.2-SNAPSHOT"] - ;; to your :user :dependencies in .lein/profiles.clj + ;; ;; Make sure to add [acyclic/squiggly-clojure "0.1.2-SNAPSHOT"] + ;; ;; to your :user :dependencies in .lein/profiles.clj - (add-hook 'cider-mode-hook - '(lambda () - (message "Make sure to add [acyclic/squiggly-clojure \"0.1.2-SNAPSHOT\"] to your :user :dependencies in .lein/profiles.clj"))))) + ;; (add-hook 'cider-mode-hook + ;; '(lambda () + ;; (message "Make sure to add [acyclic/squiggly-clojure \"0.1.2-SNAPSHOT\"] to your :user :dependencies in .lein/profiles.clj"))))) (provide 'extensions/clojure/init)