summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.org35
1 files changed, 32 insertions, 3 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 628c90e..79aa7c5 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -215,11 +215,12 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
     (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))))
      ((eq window-system 'x)
       (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 14))
       (ap/set-fonts "Fixed" 14 "Lucida" 14 nil))))
@@ -2014,6 +2015,7 @@ an AST internally, so it can work with it almost like a lisp.
             (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
@@ -2181,6 +2183,33 @@ I derived a mode for twig, in order to use its =mode-hook=.
 (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
 
 #+BEGIN_SRC emacs-lisp