From ede7ec857db4010c321e69acbbc7382fdffcf319 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 11 Sep 2018 22:51:35 -0700 Subject: [PATCH] Move cider configuration to separate file --- emacs/.emacs.d/init.el | 14 +-------- emacs/.emacs.d/init/oni-cider-init.el | 42 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 emacs/.emacs.d/init/oni-cider-init.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index fd21cbe..5a890c9 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -233,6 +233,7 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" ;; (propertize (concat " " (char-to-string #xf233)) ;; 'face '(:family "Font Awesome" :height 0.75)))) +(with-eval-after-load 'cider (load "oni-cider-init")) (with-eval-after-load 'align (load "oni-align")) (with-eval-after-load 'cc-mode (load "oni-cpp-init")) (with-eval-after-load 'circe (load "oni-circe-init")) @@ -302,19 +303,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" (add-hook 'clojure-mode-hook 'oni-clojure-add-font-lock) (add-hook 'clojure-mode-hook 'oni-clojure-add-indent) -(with-eval-after-load 'cider - (setq cider-repl-pop-to-buffer-on-connect t)) - -(setq cider-show-error-buffer t - cider-auto-select-error-buffer t) - -(setq cider-repl-history-file - (oni:data-location "cider-history")) - -(setq cider-repl-wrap-history t) - -(add-hook 'cider-repl-mode-hook 'paredit-mode) - (add-hook 'c-mode-hook 'electric-pair-local-mode) (add-hook 'c-mode-hook 'electric-indent-local-mode) diff --git a/emacs/.emacs.d/init/oni-cider-init.el b/emacs/.emacs.d/init/oni-cider-init.el new file mode 100644 index 0000000..dcaeb76 --- /dev/null +++ b/emacs/.emacs.d/init/oni-cider-init.el @@ -0,0 +1,42 @@ +;;; oni-cider-init.el --- Cider configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; My Cider configuration. + +;;; Code: + +(require 'cider) +(require 'oni-helpers) + +(setq cider-repl-pop-to-buffer-on-connect t) + +(setq cider-show-error-buffer t + cider-auto-select-error-buffer t) + +(setq cider-repl-history-file (oni:data-location "cider-history")) + +(setq cider-repl-wrap-history t) + +(add-hook 'cider-repl-mode-hook 'paredit-mode) + +(provide 'oni-cider-init) +;;; oni-cider-init.el ends here