feat(line-numbers): Swap linum for built-in display-line-numbers

Also create a new siren-display-line-numbers module and function that's
responsible for turning on the display of line numbers. Future changes
to how line numbers are displayed can now be done in a single place.
This commit is contained in:
2020-01-26 20:44:13 +00:00
parent 290ba13b1c
commit 392d769816
8 changed files with 45 additions and 16 deletions

View File

@@ -23,11 +23,11 @@
;; Editor
(require 'siren-browse-kill-ring)
(require 'siren-display-indentation)
(require 'siren-display-line-numbers)
(require 'siren-fci)
(require 'siren-helm-command)
(require 'siren-highlight-symbol)
(require 'siren-ido)
(require 'siren-linum)
(require 'siren-minions)
(require 'siren-rainbow)
(require 'siren-smex)

View File

@@ -0,0 +1,37 @@
;;; siren-display-line-numbers.el --- jimeh's Emacs Siren: display-line-numbers configuration.
;;; Commentary:
;; Basic configuration for display-line-numbers.
;;; Code:
(use-package display-line-numbers
:ensure nil ;; loaded from emacs built-ins
:hook
(prog-mode . display-line-numbers-mode))
(defun siren-display-line-numbers (&optional arg)
"Activate or deactivate line numbers.
Optional ARG is passed directly to mode toggle function."
(display-line-numbers-mode (or arg t)))
;; Fix issue were the left fringe's is cut off by one pixel on the left side.
;; from: https://github.com/dgutov/diff-hl/issues/94#issuecomment-334168416
(use-package frame
:ensure nil ;; loaded from emacs built-ins
:defer t
:config
(progn
(setq window-divider-default-places 'right-only) ;Default 'right-only
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27830#20
;; Workaround on emacs 26+ to prevent fringe truncation. You need to use
;; either scroll bars or window dividers to prevent that.
;; I dislike the default face of `window-divider', so I customize that in my
;; `smyx-theme`.
(setq window-divider-default-right-width 1) ;Default 6
(window-divider-mode 1)))
(provide 'siren-display-line-numbers)
;;; siren-display-line-numbers.el ends here

View File

@@ -6,9 +6,9 @@
;;; Code:
(require 'siren-display-line-numbers)
(require 'siren-fci)
(require 'siren-flyspell)
(require 'siren-linum)
(require 'siren-move-dup)
(require 'siren-prettier-js)
(require 'siren-smartparens)
@@ -36,11 +36,11 @@
(setq markdown-asymmetric-header t
whitespace-action nil)
(siren-display-line-numbers)
(auto-fill-mode)
(prettier-js-mode)
(fci-mode)
(flyspell-mode)
(linum-mode t)
(smartparens-mode +1)
(subword-mode))

View File

@@ -6,8 +6,6 @@
;;; Code:
(require 'siren-linum)
(use-package dired+
:ensure nil ;; loaded from vendor
:demand
@@ -20,7 +18,6 @@
:init
(defun siren-dired-mode-setup ()
(linum-mode t)
(toggle-diredp-find-file-reuse-dir 1))
:config

View File

@@ -7,9 +7,9 @@
;;; Code:
(require 'siren-display-indentation)
(require 'siren-display-line-numbers)
(require 'siren-fci)
(require 'siren-flyspell)
(require 'siren-linum)
(require 'siren-smartparens)
(use-package org-mode
@@ -39,10 +39,10 @@
(org-set-emph-re 'org-emphasis-regexp-components
org-emphasis-regexp-components)
(linum-mode t)
(siren-display-indentation)
(siren-display-line-numbers)
(flyspell-mode)
(fci-mode)
(siren-display-indentation)
(smartparens-mode +1)
(visual-line-mode +1)
(whitespace-mode +1)))

View File

@@ -6,6 +6,7 @@
;;; Code:
(require 'siren-display-line-numbers)
(require 'siren-fci)
(require 'siren-flyspell)
@@ -43,10 +44,10 @@
(setq tab-width 2
fill-column 72)
(siren-display-line-numbers)
(subword-mode)
(fci-mode t)
(flyspell-mode)
(linum-mode t)
(auto-fill-mode))
:config

View File

@@ -44,8 +44,5 @@
(set-face-attribute 'vertical-border nil
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
(use-package hlinum
:hook (linum-mode . hlinum-activate))
(provide 'siren-theme-doom-one)
;;; siren-theme-doom-one.el ends here

View File

@@ -44,8 +44,5 @@
(set-face-attribute 'vertical-border nil
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
(use-package hlinum
:hook (linum-mode . hlinum-activate))
(provide 'siren-theme-doom-vibrant)
;;; siren-theme-doom-vibrant.el ends here