diff --git a/behaviour.el b/behaviour.el index ea81c3a..7f88d7d 100644 --- a/behaviour.el +++ b/behaviour.el @@ -79,6 +79,10 @@ (require 'rainbow-delimiters) (add-hook 'prog-mode-hook 'rainbow-delimiters-mode) +; Show hex colors as colors +(require 'rainbow-mode) +(add-hook 'prog-mode-hook 'rainbow-mode) + ;;; When pasting/writing over a selection, replace it. (delete-selection-mode 1) diff --git a/languages.el b/languages.el index 0caed8c..c9e8d0a 100644 --- a/languages.el +++ b/languages.el @@ -35,6 +35,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 'haskell-mode-hook 'haskell-mode-config) (set-tab-4)) @@ -43,7 +44,6 @@ (add-hook 'rust-mode-hook 'racer-mode) (add-hook 'rust-mode-hook 'flycheck-mode) - ;;; Elixir ;; Note: there is no flycheck support for Elixir yet (require 'alchemist) @@ -53,6 +53,7 @@ (remove-hook 'rust-mode-hook 'rust-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) (set-tab-2)) @@ -61,6 +62,21 @@ (add-hook 'elixir-mode-hook 'alchemist-mode) (add-hook 'elixir-mode-hook 'ruby-end-mode) +;;; Haskell +(defun haskell-mode-config () + "Call haskell mode config." + (remove-hook 'ruby-mode-hook 'ruby-mode-config) + (remove-hook 'rust-mode-hook 'rust-mode-config) + (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) + (remove-hook 'html-mode-hook 'web-mode-config) + (remove-hook 'elixir-mode-hook 'elixir-mode-config) + + (set-tab-4)) + +(add-hook 'haskell-mode-hook 'haskell-mode-config) +(add-hook 'haskell-mode-hook 'set-line-80) +(add-hook 'haskell-mode-hook 'flycheck-mode) + ;;; Elisp (defun elisp-mode-config () "Setup editor for Lisp." @@ -68,6 +84,7 @@ (remove-hook 'ruby-mode-hook 'ruby-mode-config) (remove-hook 'elixir-mode-hook 'elixir-mode-config) (remove-hook 'html-mode-hook 'web-mode-config) + (remove-hook 'haskell-mode-hook 'haskell-mode-config) (set-tab-2) diff --git a/packages.el b/packages.el index 11a93da..116fc78 100644 --- a/packages.el +++ b/packages.el @@ -34,6 +34,11 @@ (package-refresh-contents) (package-install 'smart-mode-line)) +;; Show hex colors in UI +(unless (package-installed-p 'rainbow-mode) + (package-refresh-contents) + (package-install 'rainbow-mode)) + ;; Indentation and line length (unless (package-installed-p 'indent-guide) (package-refresh-contents) @@ -133,6 +138,10 @@ (package-refresh-contents) (package-install 'helm-themes)) +(unless (package-installed-p 'base16-theme) + (package-refresh-contents) + (package-install 'base16-theme)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Languages and frameworks @@ -175,6 +184,11 @@ (package-refresh-contents) (package-install 'web-mode)) +; JSON prettifier +(unless (package-installed-p 'json-reformat) + (package-refresh-contents) + (package-install 'json-reformat)) + ; Markdown helper (unless (package-installed-p 'markdown-mode) (package-refresh-contents) diff --git a/themes.el b/themes.el index fbb78dd..52cebf7 100644 --- a/themes.el +++ b/themes.el @@ -1,9 +1,12 @@ +;;; themes.el -- Summary + +;;; Commentary: + ;; (setq airline-helm-colors t) ;; (setq airline-cursor-colors t) ;; (setq airline-eshell-colors t) -;; Neotree theme -(setq neo-theme 'arrow) +;;; Code: ;; Add mode line icons items ;; (mode-icons-mode) @@ -12,31 +15,40 @@ (require 'smart-mode-line) (setq sml/no-confirm-load-theme t) (sml/setup) -(sml/apply-theme 'dark) +(sml/apply-theme 'respectful) ;; Display time on mode line (setq display-time-format "%H:%M") (display-time-mode t) ;; (load-theme 'ujelly t t) -(load-theme 'avk-daylight t t) -(load-theme 'monokai t t) +;; (load-theme 'avk-daylight t t) +;; (load-theme 'monokai t t) ;; (load-theme 'flatui t t) -(load-theme 'atom-one-dark t t) +;; (load-theme 'atom-one-dark t t) (load-theme 'flatui t t) -(load-theme 'noctilux t t) -(load-theme 'whiteboard t t) +;; (load-theme 'noctilux t t) +;; (load-theme 'whiteboard t t) +;; (load-theme 'dichromacy t t) +(load-theme 'base16-harmonic-dark t t) (require 'helm-themes) (if (display-graphic-p) (progn - (enable-theme 'flatui)) + (enable-theme 'base16-harmonic-dark) + (set-face-attribute 'linum nil :font "Hasklig 14" + :slant 'normal + :background "#0b1c2c")) (progn (enable-theme 'flatui))) ;; (color-theme-approximate-on) -(set-face-attribute 'default nil :font "Hasklig 13") -(set-face-attribute 'mode-line nil :font "Hasklig 12") -(set-face-attribute 'linum nil :font "Hasklig 13") -;;; themes.el end here +;; Set font face +(set-face-attribute 'default nil :font "Hasklig 13") +(set-face-attribute 'mode-line nil :font "Hasklig 13") +(set-face-attribute 'helm-selection nil :font "Hasklig 13") +(set-face-attribute 'helm-header nil :font "Hasklig 15") + +(provide 'themes) +;;; themes.el ends here