Font consistency

1 files changed, 228 insertions, 0 deletions

diff --git a/doom/config.el b/doom/config.el
new file mode 100644
index 0000000..1413521
--- /dev/null
+++ b/doom/config.el
@@ -0,0 +1,228 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets. It is optional.
+;; (setq user-full-name "John Doe"
+;;       user-mail-address "john@doe.com")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom:
+;;
+;; - `doom-font' -- the primary font to use
+;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
+;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;; - `doom-symbol-font' -- for symbols
+;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
+;;
+;; See 'C-h v doom-font' for documentation and more examples of what they
+;; accept. For example:
+;;
+;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
+;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
+;;
+;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
+;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
+;; refresh your font settings. If Emacs still can't find your font, it likely
+;; wasn't installed correctly. Font issues are rarely Doom issues!
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'doom-one)
+
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers-type 'relative)
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/org/")
+
+;; Keep terminal and editor typography aligned and ensure Nerd Font glyphs render.
+(setq doom-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15)
+      doom-variable-pitch-font (font-spec :family "JetBrainsMono Nerd Font" :size 15)
+      doom-symbol-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15))
+
+(defun my/setup-icon-font-fallback (&optional frame)
+  "Ensure Nerd Font glyphs are available in FRAME."
+  (with-selected-frame (or frame (selected-frame))
+    (when (display-graphic-p)
+      (set-fontset-font t 'unicode "JetBrainsMono Nerd Font Mono" nil 'append))))
+
+(add-hook 'after-make-frame-functions #'my/setup-icon-font-fallback)
+(my/setup-icon-font-fallback)
+
+
+;; Whenever you reconfigure a package, make sure to wrap your config in an
+;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
+;;
+;;   (after! PACKAGE
+;;     (setq x y))
+;;
+;; The exceptions to this rule:
+;;
+;;   - Setting file/directory variables (like `org-directory')
+;;   - Setting variables which explicitly tell you to set them before their
+;;     package is loaded (see 'C-h v VARIABLE' to look up their documentation).
+;;   - Setting doom variables (which start with 'doom-' or '+').
+;;
+;; Here are some additional functions/macros that will help you configure Doom.
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
+;; etc).
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.
+
+(after! evil
+  (require 'evil-collection))
+
+(after! solaire-mode
+  (solaire-global-mode -1))
+
+(defvar my/gui-transparency 85
+  "Alpha background value for GUI frames (0-100).")
+
+(defun my/make-all-faces-transparent (&optional frame)
+  "Make face backgrounds transparent in both terminal and GUI Emacs."
+  (or frame (setq frame (selected-frame)))
+  (if (display-graphic-p frame)
+      ;; GUI: prefer alpha-background; keep alpha as macOS-compatible fallback.
+      (progn
+        (set-frame-parameter frame 'alpha-background my/gui-transparency)
+        (set-frame-parameter frame 'alpha
+                             (cons my/gui-transparency my/gui-transparency)))
+    ;; TTY: use terminal background (lets terminal emulator transparency show through).
+    (progn
+      (set-face-background 'default "unspecified-bg" frame)
+      (mapc (lambda (face)
+              (when (facep face)
+                (let ((bg (face-background face nil nil)))
+                  (when (and bg (not (equal bg "unspecified-bg")))
+                    (set-face-background face "unspecified-bg" frame)))))
+            (face-list)))))
+
+(add-hook 'doom-load-theme-hook #'my/make-all-faces-transparent)
+(add-hook 'after-make-frame-functions #'my/make-all-faces-transparent)
+(add-hook 'window-setup-hook #'my/make-all-faces-transparent)
+(add-hook 'server-after-make-frame-hook #'my/make-all-faces-transparent)
+
+(add-to-list 'default-frame-alist `(alpha-background . ,my/gui-transparency))
+(add-to-list 'default-frame-alist `(alpha . (,my/gui-transparency . ,my/gui-transparency)))
+
+(my/make-all-faces-transparent)
+
+(after! diff-hl
+  (defun my/setup-diff-hl-faces ()
+    (set-face-attribute 'diff-hl-insert nil :foreground "green"  :background 'unspecified)
+    (set-face-attribute 'diff-hl-delete nil :foreground "red"    :background 'unspecified)
+    (set-face-attribute 'diff-hl-change nil :foreground "yellow" :background 'unspecified))
+  (my/setup-diff-hl-faces)
+  (add-hook 'doom-load-theme-hook #'my/setup-diff-hl-faces 20)
+
+  (defun my/diff-hl-hunk-text (ov)
+    "Return the diff hunk text for overlay OV."
+    (save-excursion
+      (goto-char (overlay-start ov))
+      (let* ((line (line-number-at-pos))
+             (file (buffer-file-name))
+             (diff (when file
+                     (shell-command-to-string
+                      (format "git diff -U0 -- %s" (shell-quote-argument file))))))
+        (when (and diff (string-match
+                         (format "@@ [^ ]+ \\+\\([0-9]+\\)[, ].*@@\\([^@]*\\)" )
+                         diff))
+          (let ((result nil))
+            (with-temp-buffer
+              (insert diff)
+              (goto-char (point-min))
+              (while (re-search-forward "^@@ -\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\+\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? @@.*$" nil t)
+                (let* ((new-start (string-to-number (match-string 3)))
+                       (new-count (if (match-string 4) (string-to-number (match-string 4)) 1))
+                       (hunk-start (match-beginning 0))
+                       (hunk-end (or (save-excursion
+                                       (when (re-search-forward "^@@ " nil t)
+                                         (match-beginning 0)))
+                                     (point-max))))
+                  (when (and (>= line new-start)
+                             (< line (+ new-start (max new-count 1))))
+                    (setq result (buffer-substring-no-properties hunk-start hunk-end))))))
+            result)))))
+
+  (defun my/diff-hl-add-tooltips (&rest _)
+    "Add help-echo tooltips to diff-hl overlays."
+    (dolist (ov (overlays-in (point-min) (point-max)))
+      (when (overlay-get ov 'diff-hl)
+        (overlay-put ov 'help-echo
+                     (lambda (_win ov _pos)
+                       (my/diff-hl-hunk-text ov))))))
+
+  (advice-add 'diff-hl-update :after #'my/diff-hl-add-tooltips))
+
+(after! (diff-hl magit)
+  (add-hook 'magit-pre-refresh-hook  #'diff-hl-magit-pre-refresh)
+  (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))
+
+(defun my/diff-hl-margin-setup (frame)
+  (with-selected-frame frame
+    (if (display-graphic-p)
+        (diff-hl-margin-mode -1)
+      (diff-hl-margin-mode +1))))
+(add-hook 'after-make-frame-functions #'my/diff-hl-margin-setup)
+(when (daemonp)
+  (add-hook 'server-after-make-frame-hook
+            (lambda () (my/diff-hl-margin-setup (selected-frame)))))
+
+(defun my/yank-to-clipboard ()
+  "Yank to system clipboard via Evil's + register."
+  (interactive)
+  (let ((evil-this-register ?+))
+    (call-interactively #'evil-yank)))
+
+(defun my/yank-line-to-clipboard ()
+  "Yank current line to system clipboard via Evil's + register."
+  (interactive)
+  (let ((evil-this-register ?+))
+    (call-interactively #'evil-yank-line)))
+
+(map! :leader
+      :desc "Yank to system clipboard"      "y" #'my/yank-to-clipboard
+      :desc "Yank line to system clipboard" "Y" #'my/yank-line-to-clipboard)
+
+(defun my/setup-selection-face ()
+  (unless (display-graphic-p)
+    (set-face-attribute 'region nil
+                        :background "brightblack"
+                        :foreground "white"
+                        :extend t)))
+(add-hook 'doom-load-theme-hook #'my/setup-selection-face 10)
+
+(after! evil-goggles
+  (set-face-attribute 'evil-goggles-default-face nil
+                      :background "brightblack"
+                      :foreground "white"))
+
+(setq scroll-margin 8)
+
+(after! which-key
+  (setq which-key-idle-delay 0.5))
+
+(add-function :after after-focus-change-function
+              (lambda ()
+                (unless (frame-focus-state)
+                  (save-some-buffers t))))