Bläddra i källkod

Run emacs as daemon on Arch. Handle daemon powerline case.

Josh Bicking 7 år sedan
förälder
incheckning
8b232ddb3f
2 ändrade filer med 14 tillägg och 3 borttagningar
  1. 6 3
      emacs.d/packages/packages.el
  2. 8 0
      zshrc.local.arch

+ 6 - 3
emacs.d/packages/packages.el

@@ -151,13 +151,13 @@
 
   (undohist-initialize))
 
-(if (display-graphic-p)
+(if (or (display-graphic-p) (daemonp))
     ;; pretty powerline in X
     (require 'init-powerline))
 
 ;; basic powerline in terminal
 (use-package powerline
-  :if (not (display-graphic-p))
+  :if (not (or (display-graphic-p) (daemonp)))
   :ensure t
   :config
   (powerline-evil-vim-color-theme))
@@ -362,7 +362,10 @@
   ;; 2 spaces for an indent
   (defun my-web-mode-hook ()
     "Hooks for Web mode."
-    (setq web-mode-markup-indent-offset 2))
+    (setq web-mode-markup-indent-offset 2
+          web-mode-enable-auto-closing t
+          web-mode-enable-auto-pairing t)
+    )
   (add-hook 'web-mode-hook  'my-web-mode-hook)
 
   ;; Auto-enable web-mode when opening relevent files

+ 8 - 0
zshrc.local.arch

@@ -20,8 +20,16 @@ alias update='sudo pacman -Syu'
 
 # Android dev
 export ANDROID_HOME=/opt/android-sdk
+
 # go
 export GOPATH=/home/josh/go
 
 # Use ccache when compiling
 export PATH="/usr/lib/ccache/bin/:$PATH"
+
+# # Emacs as a daemon
+export ALTERNATE_EDITOR=""
+export EDITOR="emacsclient -t"                  # $EDITOR should open in terminal
+export VISUAL="emacsclient -c -a emacs"         # $VISUAL opens in GUI with non-daemon as alternate
+
+alias emacs='emacsclient -c -a emacs'