summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bookmarks7
-rw-r--r--custom.el3
2 files changed, 2 insertions, 8 deletions
diff --git a/bookmarks b/bookmarks
index 2524fc0..815ccd5 100644
--- a/bookmarks
+++ b/bookmarks
@@ -8,15 +8,8 @@
(rear-context-string . ": home\n\n* Tasks\n")
(position . 119))
("org-capture-last-stored"
-<<<<<<< HEAD
(filename . "~/org/refile.org")
(front-context-string . "** TODO Review E")
(rear-context-string . "1-27 Sun 15:05]\n")
(position . 639))
-=======
- (filename . "~/org/home.org")
- (front-context-string . "** TODO Get blue")
- (rear-context-string . ": home\n\n* Tasks\n")
- (position . 119))
->>>>>>> 81a4e8c58baff24a49e1b4392ec9ee6906f88047
)
diff --git a/custom.el b/custom.el
index d536704..19b5477 100644
--- a/custom.el
+++ b/custom.el
@@ -10,10 +10,11 @@
'(display-time-mode t)
'(package-selected-packages
'(embark-consult embark marginalia markdown-mode eglot helm popup async notmuch ivy calfw-org calfw unicode-fonts deft cider org-roam org yasnippet-snippets which-key vterm use-package rainbow-delimiters pdf-tools paredit magit ledger-mode gruvbox-theme flycheck expand-region evil elpy elfeed-score diminish counsel cmake-mode browse-kill-ring beacon auto-package-update amx ace-window ace-jump-mode))
+ '(show-paren-mode t)
'(tool-bar-mode nil))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(default ((t (:family "FreeMono" :foundry "GNU " :slant normal :weight normal :height 128 :width normal)))))
+ '(default ((t (:family "Iosevka Fixed" :foundry "UKWN" :slant normal :weight normal :height 132 :width normal)))))