summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-11-29 23:30:11 +0100
committerAlan Pearce2019-11-30 12:03:07 +0100
commitf2b40ad155dbe800ee36e126568261238efed43c (patch)
tree68a8772ec480d1fc9f865c8a52227afe2639df7e
parentc53705040dbedca87e19b9286572663d71102a9c (diff)
downloadnixfiles-f2b40ad155dbe800ee36e126568261238efed43c.tar.lz
nixfiles-f2b40ad155dbe800ee36e126568261238efed43c.tar.zst
nixfiles-f2b40ad155dbe800ee36e126568261238efed43c.zip
Emacs: replace moody with doom-modeline
-rw-r--r--user/emacs/.emacs.d/init.el42
-rw-r--r--user/settings/emacs.nix2
2 files changed, 11 insertions, 33 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index 0f7ad424..7f1aaec0 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -67,12 +67,6 @@
       (setq-default line-spacing 0.2))
   (setq frame-background-mode 'light)
   (mapc 'frame-set-background-mode (frame-list)))
-  (let ((line (face-attribute 'mode-line :underline)))
-    (set-face-attribute 'mode-line          nil :overline   line)
-    (set-face-attribute 'mode-line-inactive nil :overline   line)
-    (set-face-attribute 'mode-line-inactive nil :underline  line)
-    (set-face-attribute 'mode-line          nil :box        nil)
-    (set-face-attribute 'mode-line-inactive nil :box        nil))
 
 ;;; Chrome
 (use-package minions
@@ -80,32 +74,15 @@
            (minions-mode-line-delimiters nil)
            (minions-mode t)))
 
-(setq-default mode-line-position nil
-              mode-line-mule-info nil
-              mode-line-client nil
-              mode-line-remote nil)
-
-(defvar eyebrowse-lighter-default
-  '(:eval (eyebrowse-mode-line-indicator)))
-(defvar moody-replace-eyebrowse-lighter
-  '(:eval (moody-tab (eyebrowse-mode-line-indicator) 1 'up)))
-(defun moody-replace-eyebrowse (&optional reverse)
-  (interactive "P")
-  (if (assoc 'eyebrowse-mode mode-line-misc-info)
-      (setcdr (assoc 'eyebrowse-mode mode-line-misc-info)
-              (list (if reverse
-                        eyebrowse-lighter-default
-                      moody-replace-eyebrowse-lighter)))
-    (push (list 'eyebrowse-mode moody-replace-eyebrowse-lighter)
-          (cdr (last mode-line-misc-info)))))
-
-(use-package moody
+(use-package doom-modeline
+  :hook (after-init . doom-modeline-mode)
   :config (progn
-            (setq x-underline-at-descent-line t)
-            (moody-replace-mode-line-buffer-identification)
-            (moody-replace-vc-mode)
-            (with-eval-after-load 'eyebrowse
-              (moody-replace-eyebrowse nil))))
+            (setq doom-modeline-buffer-file-name-style 'relative-from-project
+                  doom-modeline-buffer-icon nil
+                  doom-modeline-buffer-modification-icon nil
+                  doom-modeline-env-version nil)
+            (let ((foreground (face-attribute 'font-lock-comment-face :foreground)))
+              (set-face-attribute 'doom-modeline-buffer-modified nil :foreground foreground))))
 
 (when (eq system-type 'darwin)
   (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
@@ -470,7 +447,8 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :general (:states 'insert
                     "TAB" #'company-indent-or-complete-common))
 
-;; (use-package all-the-icons)
+(use-package all-the-icons
+  :config (setq all-the-icons-color-icons nil))
 
 (use-package company-lsp
   :config (progn
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index f2ea3917..dc5811c9 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -106,8 +106,8 @@ in
       magit
       markdown-mode
       minions
+      doom-modeline
       monotropic-theme
-      moody
       nginx-mode
       nix-mode
       nix-update