aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/conf/init.el25
-rw-r--r--gui/conf/metakr.org16
-rw-r--r--gui/emacs.nix4
3 files changed, 24 insertions, 21 deletions
diff --git a/gui/conf/init.el b/gui/conf/init.el
index c83e965..115596e 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -25,6 +25,8 @@
(defun startup (frame)
(select-frame frame)
(set-frame-font "Iosevka 11" nil t)
+ (set-fontset-font "fontset-default" 'unicode "Iosevka")
+ (set-face-font 'default "Iosevka 11")
(menu-bar-mode -1)
(toggle-scroll-bar -1)
(tool-bar-mode -1))
@@ -66,7 +68,7 @@
(set-face-attribute 'default nil :family "Iosevka")
(set-face-attribute 'fixed-pitch nil :family "Iosevka")
-(set-face-attribute 'variable-pitch nil :family "Source Sans Pro" :height 1.1)
+(set-face-attribute 'variable-pitch nil :family "Iosevka Aile Light")
(global-set-key (kbd "<M-tab>") 'next-buffer)
(global-set-key (kbd "<M-iso-lefttab>") 'previous-buffer)
@@ -194,6 +196,7 @@
(org-latex-preview-ltxpng-directory "~/.emacs.d/ltxpng/")
(org-image-actual-width nil)
(org-fontify-done-headline nil)
+ (org-ellipsis "…")
:init
(require 'org-protocol)
(require 'ox-bibtex)
@@ -263,15 +266,15 @@
(custom-theme-set-faces
'user
- '(org-level-1 ((t (:family "Source Serif Pro"))))
- '(org-level-2 ((t (:family "Source Serif Pro"))))
- '(org-level-3 ((t (:family "Source Serif Pro"))))
- '(org-level-4 ((t (:family "Source Serif Pro"))))
- '(org-document-title ((t (:family "Source Serif Pro"))))
- '(font-latex-sectioning-5-face ((t (:family "Source Serif Pro" :height 1.1))))
+ '(org-level-1 ((t (:family "Iosevka Aile Light"))))
+ '(org-level-2 ((t (:family "Iosevka Aile Light"))))
+ '(org-level-3 ((t (:family "Iosevka Aile Light"))))
+ '(org-level-4 ((t (:family "Iosevka Aile Light"))))
+ '(org-document-title ((t (:family "Iosevka Etoile"))))
+ '(font-latex-sectioning-5-face ((t (:family "Iosevka Etoile" :height 1.1))))
;; calfw
- '(cfw:face-title ((t (:inherit variable-pitch :family "Source Serif Pro" :foreground "#AADB0F" :height 2.0))))
+ '(cfw:face-title ((t (:inherit variable-pitch :family "Isoevka Etoile" :foreground "#AADB0F" :height 2.0))))
'(cfw:face-header ((t (:inherit fixed-pitch))))
'(cfw:face-sunday ((t (:inherit fixed-pitch))))
'(cfw:face-saturday ((t (:inherit fixed-pitch))))
@@ -293,7 +296,7 @@
(use-package org-bullets
:ensure t
:config
- (setq org-bullets-bullet-list '("●" "●" "⤷" "⤷"))
+ (setq org-bullets-bullet-list '("◉" "◉" "⤷" "⤷"))
(add-hook 'org-mode-hook #'org-bullets-mode))
(use-package org-re-reveal
@@ -459,10 +462,6 @@
:config
(evil-leader/set-key "pg" 'magit))
-(use-package forge
- :ensure t
- :after magit)
-
(use-package projectile
:ensure t
:config
diff --git a/gui/conf/metakr.org b/gui/conf/metakr.org
index 5d0606c..5bdcbcb 100644
--- a/gui/conf/metakr.org
+++ b/gui/conf/metakr.org
@@ -33,7 +33,7 @@ For quick iteration all colors are stored in a table.
| link-underline | #AADB0F |
| header | #AADB0F |
| button | #aaaaaa |
-| glyph | #f7ffd1 |
+| glyph | #F7FFD1 |
| cursor | #AADB0F |
| paren-match-fg | #161616 |
| paren-match-bg | #AADB0F |
@@ -46,7 +46,7 @@ For quick iteration all colors are stored in a table.
| secondary-bg | #080808 |
| trailing-bg | #8C3346 |
| lazy-hlt-fg | #000000 |
-| lazy-hlt-bg | #ffffff |
+| lazy-hlt-bg | #FFFFFF |
| evil-rep-fg | #F2F2F2 |
| evil-rep-bg | #161616 |
| header-line-bg | #080808 |
@@ -69,14 +69,15 @@ For quick iteration all colors are stored in a table.
| org-quote-bg | #080808 |
| org-date | #c6b6ad |
| org-title | #AADB0F |
+| org-ellipsis | #AADB0F |
| org-title-underline | #F2F2F2 |
| org-checkbox | #999999 |
| org-scheduled | #dddddd |
-| org-scheduled-today | #ffffff |
+| org-scheduled-today | #FFFFFF |
| org-done | #909636 |
| org-todo | #D80F32 |
| org-tag | #E4E093 |
-| org-block-line | #080808 |
+| org-block-line | #161616 |
| org-block-bg | #080808 |
| org-agenda-structure-fg | #aaaaaa |
| org-agenda-structure-bg | #080808 |
@@ -242,8 +243,8 @@ For quick iteration all colors are stored in a table.
;; Org
(org-level-1 :inherit default :foreground @header :weight regular :height 1.4)
(org-level-2 :inherit default :foreground @header :weight regular :height 1.3)
- (org-level-3 :inherit default :foreground @header :weight regular :height 1.1)
- (org-level-4 :inherit default :foreground @header :weight regular :height 1.0)
+ (org-level-3 :inherit default :foreground @header :weight regular :height 1.2)
+ (org-level-4 :inherit default :foreground @header :weight regular :height 1.1)
(org-meta-line
:inherit fixed-pitch
:foreground @org-meta)
@@ -283,6 +284,8 @@ For quick iteration all colors are stored in a table.
(org-hide
:inherit fixed-pitch
:foreground @bg)
+ (org-ellipsis
+ :foreground @org-ellipsis)
(org-indent
:inherit org-hide)
(org-date
@@ -303,6 +306,7 @@ For quick iteration all colors are stored in a table.
:foreground @org-done)
(org-todo
:inherit fixed-pitch
+ :weight bold
:foreground @org-todo)
(org-tag
:inherit fixed-pitch
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 140f5d7..f010ec7 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -81,9 +81,9 @@
};
in with pkgs; [
- source-sans-pro
- source-serif-pro
emacs-all-the-icons-fonts
+ (iosevka-bin.override { variant = "aile"; })
+ (iosevka-bin.override { variant = "etoile"; })
mu
org-protocol-shortcut
];