diff --git a/behaviour.el b/behaviour.el index 47cc3cf..93d9cc4 100644 --- a/behaviour.el +++ b/behaviour.el @@ -87,15 +87,35 @@ (delete-selection-mode 1) ;;;;;;;;;;;;;;;;;;;;;; indentation functions ;;;;;;;;;;;;;;;;;;;;;; - +;;; NB! This does not work reliably, using the functions below (defun set-width (columns) - "Set line length to X COLUMNS. -Additional characters after X are highlighted." + "Set line length to X COLUMNS." (interactive "NNumber of columns to use: ") (setq column-enforce-column columns) (column-enforce-mode -1) (column-enforce-mode 1)) +(defun set-width-99 () + "Set line length to 99 columns." + (interactive) + (setq column-enforce-column 99) + (column-enforce-mode -1) + (column-enforce-mode 1)) + +(defun set-width-80 () + "Set line length to 80 columns." + (interactive) + (setq column-enforce-column 80) + (column-enforce-mode -1) + (column-enforce-mode 1)) + +(defun set-width-120 () + "Set line length to 120 columns." + (interactive) + (setq column-enforce-column 120) + (column-enforce-mode -1) + (column-enforce-mode 1)) + (defun set-indent (step) "Set indentation to X STEPs." (interactive "NNumber of columns for one step: ") @@ -140,7 +160,7 @@ Additional characters after X are highlighted." ;; Add magit for git (require 'evil-magit) -;; Remove unused buffers every 2 hours +;; Remove unused buffers periodically (require 'midnight) ;;kill buffers if they were last disabled more than this seconds ago diff --git a/functions.el b/functions.el index 2039ac3..23481ae 100644 --- a/functions.el +++ b/functions.el @@ -19,6 +19,7 @@ "Set font SIZE to X px." (interactive "NNew font size: ") (set-face-attribute 'default nil :font (format "Hasklig %d" size)) + (set-face-attribute 'mode-line nil :font (format "Hasklig %d" size)) (set-face-attribute 'helm-selection nil :font (format "Hasklig %d" size)) (set-face-attribute 'helm-header nil :font (format "Hasklig %d" diff --git a/languages.el b/languages.el index 3c3a817..6eabf4d 100644 --- a/languages.el +++ b/languages.el @@ -11,7 +11,7 @@ (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) (remove-hook 'html-mode-hook 'web-mode-config) - (aggressive-mode-indent)) + (set-indent 2)) ;; Do not align 'begin' and 'while' ;; (setq ruby-align-to-stmt-keywords '(if begin case elseif rescue)) @@ -26,7 +26,7 @@ (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) (add-hook 'ruby-mode-hook 'ruby-mode-config) -(add-hook 'ruby-mode-hook (set-width 80)) +(add-hook 'ruby-mode-hook 'set-width-80) ;;; Rust (defun rust-mode-config () @@ -37,12 +37,12 @@ (remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'haskell-mode-hook 'haskell-mode-config) - (set-indent 4) - (set-width 99)) + (set-indent 4)) (add-hook 'rust-mode-hook 'rust-mode-config) (add-hook 'rust-mode-hook 'racer-mode) (add-hook 'rust-mode-hook 'flycheck-mode) +(add-hook 'rust-mode-hook 'set-width-99) ;;; Elixir ;; Note: there is no flycheck support for Elixir yet @@ -58,9 +58,9 @@ (set-indent 2)) (add-hook 'elixir-mode-hook 'elixir-mode-config) -(add-hook 'elixir-mode-hook (set-width 80)) (add-hook 'elixir-mode-hook 'alchemist-mode) (add-hook 'elixir-mode-hook 'ruby-end-mode) +(add-hook 'elixir-mode-hook 'set-width-80) ;;; Haskell (defun haskell-mode-config () @@ -71,11 +71,11 @@ (remove-hook 'html-mode-hook 'web-mode-config) (remove-hook 'elixir-mode-hook 'elixir-mode-config) - (set-indent 4) - (set-width 80)) + (set-indent 4)) (add-hook 'haskell-mode-hook 'haskell-mode-config) (add-hook 'haskell-mode-hook 'flycheck-mode) +(add-hook 'haskell-mode-hook 'set-width-80) ;;; Elisp (defun elisp-mode-config () @@ -93,6 +93,7 @@ (add-hook 'emacs-lisp-mode-hook 'elisp-mode-config) (add-hook 'emacs-lisp-mode-hook 'flycheck-mode) +(add-hook 'emacs-lisp-mode-hook 'set-width-80) ;;;; Other things ;;;;; ;;; Javascript @@ -106,10 +107,11 @@ (remove-hook 'elixir-mode-hook 'elixir-mode-config) (flycheck-mode 1) - (set-width 120)) + (set-indent 2)) (add-hook 'html-mode-hook 'web-mode) (add-hook 'html-mode-hook 'web-mode-config) +(add-hook 'markdown-mode-hook 'set-width-120) (setq web-mode-markup-indent-offset 2) (setq web-mode-code-indent-offset 2) @@ -120,7 +122,8 @@ ;; Markdown mode (defun markdown-mode-config () "Setup markdown mode." - (set-width 80)) + (set-indent 2)) (add-hook 'markdown-mode-hook 'markdown-mode-config) +(add-hook 'markdown-mode-hook 'set-width-80) ;;; languages.el ends here