Browse Source

Merge branch 'master' of git.greyserv.net:marrub/scripts

# Conflicts:
#	emacs/init.el
master
Alison Watson 1 year ago
parent
commit
9b621b391e
3 changed files with 12 additions and 2 deletions
  1. +4
    -0
      .gitignore
  2. +7
    -1
      emacs/early-init.el
  3. +1
    -1
      emacs/init.el

+ 4
- 0
.gitignore View File

@@ -1 +1,5 @@
computers/*/fish/priv
emacs/auto-save-list
emacs/backup
emacs/custom.el
emacs/elpa

+ 7
- 1
emacs/early-init.el View File

@@ -14,7 +14,8 @@

;; important ergonomics
(setq fill-column 80
sentence-end-double-space nil)
sentence-end-double-space nil
ring-bell-function #'ignore)

(defalias #'yes-or-no-p #'y-or-n-p)

@@ -40,4 +41,9 @@

(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP")

(setq agw-mode-line-family
(if (string-equal system-type "windows-nt")
"Noto Mono"
"Iosevka"))

;; EOF

+ 1
- 1
emacs/init.el View File

@@ -86,8 +86,8 @@
header-line
header-line-highlight))
(set-face-attribute face nil
:family "Iosevka"
:height 120
:family agw-mode-line-family
:weight 'normal
:width 'normal))
(set-face-attribute 'mode-line nil


Loading…
Cancel
Save