Add Java mode

TODO:
  * Research Python configuration
This commit is contained in:
Maciej Szlosarczyk 2017-07-31 14:37:52 +03:00
parent 3399e6649a
commit cc78325898
No known key found for this signature in database
GPG key ID: 0D4EEACF63D4262E
2 changed files with 37 additions and 2 deletions

View file

@ -10,6 +10,7 @@
(remove-hook 'elixir-mode-hook 'elixir-mode-config) (remove-hook 'elixir-mode-hook 'elixir-mode-config)
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(set-indent 2)) (set-indent 2))
@ -39,6 +40,7 @@
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'haskell-mode-hook 'haskell-mode-config) (remove-hook 'haskell-mode-hook 'haskell-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(set-indent 4)) (set-indent 4))
@ -47,6 +49,21 @@
(add-hook 'rust-mode-hook 'flycheck-mode) (add-hook 'rust-mode-hook 'flycheck-mode)
(add-hook 'rust-mode-hook 'set-width-99) (add-hook 'rust-mode-hook 'set-width-99)
;;; SQL
(defun sql-mode-hook ()
"Editor setup for SQL."
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
(remove-hook 'elixir-mode-hook 'elixir-mode-config)
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'haskell-mode-hook 'haskell-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(set-indent 4))
(add-hook 'sql-mode-hook 'flycheck-mode)
(add-hook 'sql-mode-hook 'set-width-120)
;;; Elixir ;;; Elixir
;; Note: there is no flycheck support for Elixir yet ;; Note: there is no flycheck support for Elixir yet
(require 'alchemist) (require 'alchemist)
@ -57,6 +74,7 @@
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'haskell-mode-hook 'haskell-mode-config) (remove-hook 'haskell-mode-hook 'haskell-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(set-indent 2)) (set-indent 2))
@ -88,6 +106,7 @@
(remove-hook 'elixir-mode-hook 'elixir-mode-config) (remove-hook 'elixir-mode-hook 'elixir-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'haskell-mode-hook 'haskell-mode-config) (remove-hook 'haskell-mode-hook 'haskell-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(set-indent 2) (set-indent 2)
@ -97,6 +116,21 @@
(add-hook 'emacs-lisp-mode-hook 'flycheck-mode) (add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
(add-hook 'emacs-lisp-mode-hook 'set-width-80) (add-hook 'emacs-lisp-mode-hook 'set-width-80)
;;; Java
(defun java-mode-config ()
"Setup editor for java."
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
(remove-hook 'elixir-mode-hook 'elixir-mode-config)
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
(remove-hook 'html-mode-hook 'web-mode-config)
(remove-hook 'haskell-mode-hook 'haskell-mode-config)
(remove-hook 'rust-mode-hook 'rust-mode-config)
(set-indent 2))
(add-hook 'rust-mode-hook 'java-mode-config)
(add-hook 'java-mode-hook 'flycheck-mode)
(add-hook 'java-mode-hook 'set-width-120)
;;;; Other things ;;;;; ;;;; Other things ;;;;;
;;; Javascript ;;; Javascript
(setq js-indent-level 2) (setq js-indent-level 2)
@ -107,6 +141,7 @@
(remove-hook 'rust-mode-hook 'rust-mode-config) (remove-hook 'rust-mode-hook 'rust-mode-config)
(remove-hook 'ruby-mode-hook 'ruby-mode-config) (remove-hook 'ruby-mode-hook 'ruby-mode-config)
(remove-hook 'elixir-mode-hook 'elixir-mode-config) (remove-hook 'elixir-mode-hook 'elixir-mode-config)
(remove-hook 'java-mode-hook 'java-mode-config)
(flycheck-mode 1) (flycheck-mode 1)
(set-indent 2)) (set-indent 2))

View file

@ -7,7 +7,7 @@
(require 'smart-mode-line) (require 'smart-mode-line)
(setq sml/no-confirm-load-theme t) (setq sml/no-confirm-load-theme t)
(sml/setup) (sml/setup)
(sml/apply-theme 'respectful) (sml/apply-theme 'smart-mode-line-light)
;; Display time on mode line ;; Display time on mode line
(setq display-time-format "%H:%M") (setq display-time-format "%H:%M")
@ -41,7 +41,7 @@
(require 'helm-themes) (require 'helm-themes)
(if (display-graphic-p) (if (display-graphic-p)
(progn (progn
(enable-theme 'base16-summerfruit-light) (enable-theme 'base16-unikitty-light)
(base16-summerfruit-light-custom)) (base16-summerfruit-light-custom))
(progn (progn
(color-theme-approximate-on) (color-theme-approximate-on)