Merge branch 'master' of ssh://alanpearce.eu/dotfiles
1 file changed, 12 insertions(+), 11 deletions(-)
changed files
M emacs/.emacs.d/init.org â emacs/.emacs.d/init.org
@@ -259,10 +259,13 @@ (t . 1))) #+END_SRC Make symbols prettier. Turns out, in many cases, this is already -configured, just not enabled. +configured, just not enabled. If using the mac-port version of Emacs, +it has it's own, more extensive version. #+BEGIN_SRC emacs-lisp -(global-prettify-symbols-mode +1) +(if (eq window-system 'mac) + (mac-auto-operator-composition-mode +1) + (global-prettify-symbols-mode +1)) #+END_SRC ** Page Breaks@@ -286,7 +289,8 @@ #+END_SRC ** Modeline #+BEGIN_SRC emacs-lisp -(column-number-mode t) +(column-number-mode -1) +(line-number-mode -1) (size-indication-mode t) (setq frame-title-format '("%f" (dired-directory dired-directory)))@@ -893,6 +897,7 @@ ** editorconfig #+BEGIN_SRC emacs-lisp (use-package editorconfig + :diminish "EC" :config (editorconfig-mode 1)) #+END_SRC@@ -1139,13 +1144,6 @@ (use-package company-web :after company) #+END_SRC -#+BEGIN_SRC emacs-lisp -(use-package company-nixos-options - :defer 30 - :config (progn - (add-to-list 'company-backends 'company-nixos-options))) -#+END_SRC - * Dates & Times ** Calendar@@ -2227,6 +2225,7 @@ ~M-x indium-connect-to-nodejs RET 127.0.0.1 RET PORT RET~ #+BEGIN_SRC emacs-lisp (use-package indium + :diminish (indium-interaction-mode . "In") :config (progn (add-hook 'js2-mode-hook #'indium-interaction-mode))) #+END_SRC@@ -2247,7 +2246,7 @@ completions, besides other IDE-like things. #+BEGIN_SRC emacs-lisp (use-package tern - :commands ap/enable-tern + :diminish tern-mode :if (executable-find "tern") :defer 5 :config (progn@@ -2394,6 +2393,7 @@ #+END_SRC #+BEGIN_SRC emacs-lisp (use-package flyspell + :diminish "īš" :config (progn (defun flyspell-detect-ispell-args (&optional run-together) "If RUN-TOGETHER is true, spell check the CamelCase words.@@ -2619,6 +2619,7 @@ somehow I prefer it. #+BEGIN_SRC emacs-lisp (use-package avy + :defer 5 :bind (("M-g g" . avy-goto-line) ("M-g M-g" . avy-goto-line) ("C-|" . avy-goto-line)