Add set-line-120 function and racer package
Fix align-to-colon function
This commit is contained in:
parent
6abb0536b7
commit
c2d105ae65
5 changed files with 43 additions and 10 deletions
|
|
@ -81,17 +81,26 @@
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;; indentation functions ;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;; indentation functions ;;;;;;;;;;;;;;;;;;;;;;
|
||||||
(defun set-line-99 ()
|
(defun set-line-99 ()
|
||||||
|
"Set line length to 99 columns."
|
||||||
(interactive)
|
(interactive)
|
||||||
(setq column-enforce-column 99)
|
(setq column-enforce-column 99)
|
||||||
(column-enforce-mode -1)
|
(column-enforce-mode -1)
|
||||||
(column-enforce-mode 1))
|
(column-enforce-mode 1))
|
||||||
|
|
||||||
(defun set-line-80 ()
|
(defun set-line-80 ()
|
||||||
|
"Set line length to 80 columns."
|
||||||
(interactive)
|
(interactive)
|
||||||
(setq column-enforce-column 80)
|
(setq column-enforce-column 80)
|
||||||
(column-enforce-mode -1)
|
(column-enforce-mode -1)
|
||||||
(column-enforce-mode 1))
|
(column-enforce-mode 1))
|
||||||
|
|
||||||
|
(defun set-line-120 ()
|
||||||
|
"Set line length to 120 columns."
|
||||||
|
(interactive)
|
||||||
|
(setq column-enforce-column 120)
|
||||||
|
(column-enforce-mode -1)
|
||||||
|
(column-enforce-mode 1))
|
||||||
|
|
||||||
(defun set-tab-4 ()
|
(defun set-tab-4 ()
|
||||||
"Set tab length to 4 spaces."
|
"Set tab length to 4 spaces."
|
||||||
(interactive)
|
(interactive)
|
||||||
|
|
|
||||||
2
emacs
2
emacs
|
|
@ -25,7 +25,7 @@
|
||||||
'(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b")))
|
'(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b")))
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
(quote
|
(quote
|
||||||
(column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag)))
|
(flycheck-rust racer column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag)))
|
||||||
'(safe-local-variable-values (quote ((encoding . utf-8))))
|
'(safe-local-variable-values (quote ((encoding . utf-8))))
|
||||||
'(sml/active-background-color "#34495e")
|
'(sml/active-background-color "#34495e")
|
||||||
'(sml/active-foreground-color "#ecf0f1")
|
'(sml/active-foreground-color "#ecf0f1")
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
(defun align-to-colon (begin end)
|
(defun align-to-colon (begin end)
|
||||||
"Align region from BEGIN to END according to colon signs."
|
"Align region from BEGIN to END according to colon signs."
|
||||||
|
(interactive "r")
|
||||||
(align-regexp begin end
|
(align-regexp begin end
|
||||||
(rx ":" (group (zero-or-mode (syntax-white))))))
|
(rx ":" (group (zero-or-more (syntax whitespace))) ) 1 1))
|
||||||
;;; functions.el ends here
|
;;; functions.el ends here
|
||||||
|
|
|
||||||
29
languages.el
29
languages.el
|
|
@ -9,6 +9,7 @@
|
||||||
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
(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)
|
||||||
|
|
||||||
(aggressive-mode-indent))
|
(aggressive-mode-indent))
|
||||||
|
|
||||||
|
|
@ -33,13 +34,15 @@
|
||||||
(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 'emacs-lisp-mode-hook 'elisp-mode-config)
|
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
|
||||||
|
(remove-hook 'html-mode-hook 'web-mode-config)
|
||||||
|
|
||||||
(set-tab-4)
|
(set-tab-4))
|
||||||
|
|
||||||
(flycheck-mode 1))
|
|
||||||
|
|
||||||
(add-hook 'rust-mode-hook 'rust-mode-config)
|
(add-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
(add-hook 'rust-mode-hook 'set-line-99)
|
(add-hook 'rust-mode-hook 'set-line-99)
|
||||||
|
(add-hook 'rust-mode-hook 'racer-mode)
|
||||||
|
(add-hook 'rust-mode-hook 'flycheck-mode)
|
||||||
|
|
||||||
|
|
||||||
;;; Elixir
|
;;; Elixir
|
||||||
;; Note: there is no flycheck support for Elixir yet
|
;; Note: there is no flycheck support for Elixir yet
|
||||||
|
|
@ -49,7 +52,7 @@
|
||||||
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
|
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
|
||||||
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
|
(remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
|
||||||
(alchemist-mode 1)
|
(remove-hook 'html-mode-hook 'web-mode-config)
|
||||||
|
|
||||||
(set-tab-2)
|
(set-tab-2)
|
||||||
|
|
||||||
|
|
@ -57,7 +60,7 @@
|
||||||
|
|
||||||
(add-hook 'elixir-mode-hook 'elixir-mode-config)
|
(add-hook 'elixir-mode-hook 'elixir-mode-config)
|
||||||
(add-hook 'elixir-mode-hook 'set-line-80)
|
(add-hook 'elixir-mode-hook 'set-line-80)
|
||||||
|
(add-hook 'elixir-mode-hook 'alchemist-mode)
|
||||||
|
|
||||||
;;; Elisp
|
;;; Elisp
|
||||||
(defun elisp-mode-config ()
|
(defun elisp-mode-config ()
|
||||||
|
|
@ -65,6 +68,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 'html-mode-hook 'web-mode-config)
|
||||||
|
|
||||||
(set-tab-2)
|
(set-tab-2)
|
||||||
|
|
||||||
|
|
@ -72,12 +76,27 @@
|
||||||
|
|
||||||
(add-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
|
(add-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
|
||||||
(add-hook 'emacs-lisp-mode-hook 'set-line-80)
|
(add-hook 'emacs-lisp-mode-hook 'set-line-80)
|
||||||
|
(add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
|
||||||
|
|
||||||
;;;; Other things ;;;;;
|
;;;; Other things ;;;;;
|
||||||
;;; Javascript
|
;;; Javascript
|
||||||
(setq js-indent-level 2)
|
(setq js-indent-level 2)
|
||||||
|
|
||||||
;;; Web-mode
|
;;; Web-mode
|
||||||
|
(defun web-mode-config ()
|
||||||
|
"Setup web mode."
|
||||||
|
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
|
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
|
||||||
|
(remove-hook 'elixir-mode-hook 'elixir-mode-config)
|
||||||
|
|
||||||
|
(flycheck-mode 1))
|
||||||
|
|
||||||
|
(add-hook 'html-mode-hook 'web-mode)
|
||||||
|
(add-hook 'html-mode-hook 'web-mode-config)
|
||||||
|
(add-hook 'html-mode-hook 'set-line-120)
|
||||||
|
|
||||||
(setq web-mode-markup-indent-offset 2)
|
(setq web-mode-markup-indent-offset 2)
|
||||||
(setq web-mode-code-indent-offset 2)
|
(setq web-mode-code-indent-offset 2)
|
||||||
|
|
||||||
|
|
||||||
;;; languages.el ends here
|
;;; languages.el ends here
|
||||||
|
|
|
||||||
|
|
@ -194,4 +194,8 @@
|
||||||
(unless (package-installed-p 'rust-mode)
|
(unless (package-installed-p 'rust-mode)
|
||||||
(package-refresh-contents)
|
(package-refresh-contents)
|
||||||
(package-install 'rust-mode))
|
(package-install 'rust-mode))
|
||||||
;;; elpa.el ends here
|
|
||||||
|
(unless (package-installed-p 'racer)
|
||||||
|
(package-refresh-contents)
|
||||||
|
(package-install 'racer))
|
||||||
|
;;; packages.el ends here
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue