Emacs: Ignore emacs --daemon, it has a lot of problems.

This commit is contained in:
tastytea 2020-05-17 19:33:54 +02:00
parent 1d5565f46f
commit da3eb9202a
2 changed files with 25 additions and 28 deletions

View File

@ -1,6 +1,6 @@
;;; appearance.el --- Configure appearance. -*- lexical-binding: t; -*- ;;; appearance.el --- Configure appearance. -*- lexical-binding: t; -*-
;; Time-stamp: <2020-05-17T18:15:55+0200> ;; Time-stamp: <2020-05-17T19:21:27+0200>
;;; Commentary: ;;; Commentary:
@ -62,10 +62,9 @@
(load-theme 'doom-outrun-electric t) (load-theme 'doom-outrun-electric t)
(doom-themes-visual-bell-config) ; Flash modeline on error. (doom-themes-visual-bell-config) ; Flash modeline on error.
(doom-themes-treemacs-config) (doom-themes-treemacs-config)
(defun my/theme-modifications-scroll-bar ()
;; Set colors for scroll bar. (set-face-background 'scroll-bar (face-background 'default))
(set-face-background 'scroll-bar (face-background 'default)) (set-face-foreground 'scroll-bar (face-foreground 'shadow)))
(set-face-foreground 'scroll-bar (face-foreground 'shadow)))
;; Write a minimal theme to file, to load it in early-init.el. ;; Write a minimal theme to file, to load it in early-init.el.
(unless (string= (face-background 'default) "unspecified-bg") (unless (string= (face-background 'default) "unspecified-bg")
@ -80,7 +79,6 @@
(with-temp-file (expand-file-name "early-theme.el" (with-temp-file (expand-file-name "early-theme.el"
user-emacs-directory) user-emacs-directory)
(insert minimal-theme))))) (insert minimal-theme)))))
:hook (server-after-make-frame . my/theme-modifications-scroll-bar))
) ; unless slow-computer. ) ; unless slow-computer.
;; Neat modeline. ;; Neat modeline.

View File

@ -1,6 +1,6 @@
;;; common.el --- Common settings for text files. -*- lexical-binding: t; -*- ;;; common.el --- Common settings for text files. -*- lexical-binding: t; -*-
;; Time-stamp: <2020-05-17T18:17:00+0200> ;; Time-stamp: <2020-05-17T19:23:12+0200>
;;; Commentary: ;;; Commentary:
@ -40,34 +40,33 @@
;; Ruler with fill-column marker. ;; Ruler with fill-column marker.
(use-package ruler-mode (use-package ruler-mode
:config (progn :config (progn
(defun my/theme-modifications-ruler () (set-face-background 'ruler-mode-default
(set-face-background 'ruler-mode-default (face-foreground 'line-number))
(face-foreground 'line-number)) (set-face-foreground 'ruler-mode-default
(set-face-foreground 'ruler-mode-default (face-background 'default))
(face-background 'default)) (set-face-foreground 'ruler-mode-column-number
(set-face-foreground 'ruler-mode-column-number (face-background 'default))
(face-background 'default)) (if (and (window-system)
(if (and (window-system) (>= emacs-major-version 27))
(>= emacs-major-version 27))
(set-face-foreground 'ruler-mode-fill-column
(face-foreground 'fill-column-indicator
nil t))
(set-face-foreground 'ruler-mode-fill-column (set-face-foreground 'ruler-mode-fill-column
(face-foreground 'shadow))) (face-foreground
(set-face-foreground 'ruler-mode-comment-column 'fill-column-indicator nil t))
(face-foreground 'ruler-mode-fill-column)) (set-face-foreground 'ruler-mode-fill-column
(set-face-foreground 'ruler-mode-goal-column (face-foreground 'shadow)))
(face-foreground 'ruler-mode-fill-column)) (set-face-foreground 'ruler-mode-comment-column
(set-face-foreground 'ruler-mode-current-column (face-foreground 'ruler-mode-fill-column))
(face-foreground 'line-number-current-line))) (set-face-foreground 'ruler-mode-goal-column
(face-foreground 'ruler-mode-fill-column))
(set-face-foreground 'ruler-mode-current-column
(face-foreground 'line-number-current-line))
(defun my/ruler-on () (defun my/ruler-on ()
"Turn `ruler-mode' on." "Turn `ruler-mode' on."
(ruler-mode 1))) (ruler-mode 1)))
:custom-face (ruler-mode-default ((t (:inherit·default :custom-face (ruler-mode-default ((t (:inherit·default
:box·nil)))) :box·nil))))
:hook ((find-file . my/ruler-on) :hook ((find-file . my/ruler-on)
(text-mode . my/ruler-on) ; For the scratch buffer. (text-mode . my/ruler-on))) ; For the scratch buffer.
(server-after-make-frame . my/theme-modifications-ruler)))
;; Show a fill-column indicator vertically across the buffer. ;; Show a fill-column indicator vertically across the buffer.
(when (>= emacs-major-version 27) (when (>= emacs-major-version 27)