From e41192395c236de2eaaea1db3a04807edf7d90b2 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 2 May 2019 09:55:54 +0300 Subject: [PATCH] Add clang and clojure configuration --- 20clang.el | 16 ++++++++++++++++ 20clojure.el | 9 +++++++++ init.el | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 20clang.el create mode 100644 20clojure.el diff --git a/20clang.el b/20clang.el new file mode 100644 index 0000000..9c0a972 --- /dev/null +++ b/20clang.el @@ -0,0 +1,16 @@ +(defun activate-clang-mode () + "Goodies for editing c files" + (set-indent 4) + (column-enforce-n 80) + + (add-to-list (make-local-variable 'company-backends) + '(company-etags company-yasnippet)) + + (setq-local + ctags-refresh-command + (format + "ctags -e -R --languages=C -f %sTAGS %s." + (projectile-project-root) (projectile-project-root) + ))) + +(add-hook 'c-mode-hook 'activate-clang-mode) diff --git a/20clojure.el b/20clojure.el new file mode 100644 index 0000000..d4a46a5 --- /dev/null +++ b/20clojure.el @@ -0,0 +1,9 @@ +(add-hook 'clojure-mode-hook 'cider-mode) + +(defun activate-clojure-mode () + "Goodies for clojure files." + (set-indent 2) ;; Default indentation of 2 characters + (column-enforce-n 80) + ) + +(add-hook 'clojure-mode-hook 'activate-clojure-mode) diff --git a/init.el b/init.el index e844ad6..1fd61c9 100644 --- a/init.el +++ b/init.el @@ -79,6 +79,10 @@ tern company-tern + ;; Clojure + clojure-mode + cider + ;; Infrastructure files dockerfile-mode terraform-mode @@ -118,6 +122,8 @@ (load "~/.emacs.d/20erlang.el") (load "~/.emacs.d/20sh.el") (load "~/.emacs.d/20rust.el") +(load "~/.emacs.d/20clang.el") +(load "~/.emacs.d/20clojure.el") (custom-set-variables ;; custom-set-variables was added by Custom. @@ -126,7 +132,7 @@ ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (erlang rspec-mode crystal-mode dap-mode lsp-ui company-lsp lsp-mode nginx-mode gitignore-mode js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode dash-at-point base16-theme exec-path-from-shell)))) + (cider clojure-mode erlang rspec-mode crystal-mode dap-mode lsp-ui company-lsp lsp-mode nginx-mode gitignore-mode js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck hydra solarized-theme company-ansible alchemist column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end dash-at-point base16-theme exec-path-from-shell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.