Merge remote-tracking branch 'origin/master'
1 file changed, 32 insertions(+), 12 deletions(-)
changed files
M emacs/.emacs.d/init.org → emacs/.emacs.d/init.org
@@ -215,11 +215,12 @@ (interactive) (cond ((eq window-system 'w32) (ap/set-fonts "Liberation Mono" 11 "Segoe UI" 11 t)) - ((eq window-system 'ns) + ((or (eq window-system 'mac) + (eq window-system 'ns)) (let ((displays (string-to-number (shell-command-to-string "system_profiler SPDisplaysDataType | grep \"Online: Yes\" | wc -l")))) (if (eq displays 1) - (ap/set-fonts "Lekton" 20 "Lucida Grande" 16 t) - (ap/set-fonts "Monaco" 14 "Lucida Grande" 14 nil 0.1)))) + (ap/set-fonts "Monaco" 16 "Lucida Grande" 16 t 0.2) + (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1)))) ((and (eq window-system 'x) (not (getenv "windows"))) (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 14))@@ -1706,15 +1707,6 @@ (org-journal-read-or-display-entry (yesterday-time))))) #+END_SRC -* Music -Emacs actually supports playing music via mpd. - -#+BEGIN_SRC emacs-lisp -(use-package mpc - :defer t - :config (progn - (setq mpc-browser-tags '(Genre Albumartist|Composer|Performer Album|Playlist)))) -#+END_SRC * Programming ** flycheck@@ -2015,6 +2007,7 @@ (js2-next-error -1)) (bind-key "M-g M-n" #'js2-next-error js2-mode-map) (bind-key "M-g M-p" #'ap/js2-prev-error js2-mode-map) (setq js2-basic-offset 2 + js-switch-indent-offset 2 js2-include-node-externs t js2-highlight-level 1))) #+END_SRC@@ -2180,6 +2173,33 @@ #+BEGIN_SRC emacs-lisp (define-derived-mode twig-mode web-mode "Twig") (add-to-list 'auto-mode-alist '("\\.html\\.twig\\'" . twig-mode)) +#+END_SRC + +** Live coding + +Sometimes I might want to show off my emacs usage. + +#+BEGIN_SRC emacs-lisp +(defun live-coding () + (interactive) + (ap/set-fonts "SF Mono" 18 nil nil t 0.1) + (global-command-log-mode 1)) + +(defun live-coding-stop () + (interactive) + (ap/set-fonts-according-to-system) + (global-command-log-mode -1)) +#+END_SRC + +*** command-log-mode + +#+BEGIN_SRC emacs-lisp +(use-package command-log-mode + :defines command-log-mode-key-binding-open-log + :init (progn + (setq command-log-mode-key-binding-open-log nil + command-log-mode-auto-show t + command-log-mode-is-global t))) #+END_SRC * Spelling