From cc783258986b53667ccbc3f3d2473eec6e385e3b Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@inbank.ee>
Date: Mon, 31 Jul 2017 14:37:52 +0300
Subject: [PATCH] Add Java mode

TODO:
  * Research Python configuration
---
 languages.el | 35 +++++++++++++++++++++++++++++++++++
 themes.el    |  4 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/languages.el b/languages.el
index 84922e2..82bcd49 100644
--- a/languages.el
+++ b/languages.el
@@ -10,6 +10,7 @@
   (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 'java-mode-hook 'java-mode-config)
 
   (set-indent 2))
 
@@ -39,6 +40,7 @@
   (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))
 
@@ -47,6 +49,21 @@
 (add-hook 'rust-mode-hook 'flycheck-mode)
 (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
 ;; Note: there is no flycheck support for Elixir yet
 (require 'alchemist)
@@ -57,6 +74,7 @@
   (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 2))
 
@@ -88,6 +106,7 @@
   (remove-hook 'elixir-mode-hook 'elixir-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 2)
 
@@ -97,6 +116,21 @@
 (add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
 (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 ;;;;;
 ;;; Javascript
 (setq js-indent-level 2)
@@ -107,6 +141,7 @@
   (remove-hook 'rust-mode-hook 'rust-mode-config)
   (remove-hook 'ruby-mode-hook 'ruby-mode-config)
   (remove-hook 'elixir-mode-hook 'elixir-mode-config)
+  (remove-hook 'java-mode-hook 'java-mode-config)
 
   (flycheck-mode 1)
   (set-indent 2))
diff --git a/themes.el b/themes.el
index c4fe7c3..1b9a5c4 100644
--- a/themes.el
+++ b/themes.el
@@ -7,7 +7,7 @@
 (require 'smart-mode-line)
 (setq sml/no-confirm-load-theme t)
 (sml/setup)
-(sml/apply-theme 'respectful)
+(sml/apply-theme 'smart-mode-line-light)
 
 ;; Display time on mode line
 (setq display-time-format "%H:%M")
@@ -41,7 +41,7 @@
 (require 'helm-themes)
 (if (display-graphic-p)
     (progn
-      (enable-theme 'base16-summerfruit-light)
+      (enable-theme 'base16-unikitty-light)
       (base16-summerfruit-light-custom))
   (progn
     (color-theme-approximate-on)