Merge branch 'master' of git.greyserv.net:marrub/scripts
# Conflicts: # emacs/init.elmaster
commit
9b621b391e
|
@ -1 +1,5 @@
|
||||||
computers/*/fish/priv
|
computers/*/fish/priv
|
||||||
|
emacs/auto-save-list
|
||||||
|
emacs/backup
|
||||||
|
emacs/custom.el
|
||||||
|
emacs/elpa
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
|
|
||||||
;; important ergonomics
|
;; important ergonomics
|
||||||
(setq fill-column 80
|
(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)
|
(defalias #'yes-or-no-p #'y-or-n-p)
|
||||||
|
|
||||||
|
@ -40,4 +41,9 @@
|
||||||
|
|
||||||
(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP")
|
(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
|
;; EOF
|
||||||
|
|
|
@ -86,8 +86,8 @@
|
||||||
header-line
|
header-line
|
||||||
header-line-highlight))
|
header-line-highlight))
|
||||||
(set-face-attribute face nil
|
(set-face-attribute face nil
|
||||||
:family "Iosevka"
|
|
||||||
:height 120
|
:height 120
|
||||||
|
:family agw-mode-line-family
|
||||||
:weight 'normal
|
:weight 'normal
|
||||||
:width 'normal))
|
:width 'normal))
|
||||||
(set-face-attribute 'mode-line nil
|
(set-face-attribute 'mode-line nil
|
||||||
|
|
Loading…
Reference in New Issue