Merge branch 'master' of github.com:yulqen/emacs

3 files changed, 17 insertions, 10 deletions

diff --git a/bookmarks b/bookmarks
index 159b604..2524fc0 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,4 +1,4 @@
-;;;; Emacs Bookmark Format Version 1 ;;;; -*- coding: utf-8 -*-
+;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8; mode: lisp-data -*-
 ;;; This format is meant to be slightly human-readable;
 ;;; nevertheless, you probably don't want to edit it.
 ;;; -*- End Of Bookmark File Format Version Stamp -*-
@@ -8,8 +8,15 @@
  (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 2fa369f..d536704 100644
--- a/custom.el
+++ b/custom.el
@@ -6,7 +6,7 @@
  '(company-show-quick-access t nil nil "Customized with use-package company")
  '(custom-safe-themes
    '("3d2e532b010eeb2f5e09c79f0b3a277bfc268ca91a59cdda7ffd056b868a03bc" default))
- '(display-line-numbers-type 'relative t)
+ '(display-line-numbers-type 'relative)
  '(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))
@@ -16,4 +16,4 @@
  ;; 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 "Liberation Mono" :foundry "1ASC" :slant normal :weight normal :height 113 :width normal)))))
+ '(default ((t (:family "FreeMono" :foundry "GNU " :slant normal :weight normal :height 128 :width normal)))))
diff --git a/init.el b/init.el
index 591423a..d12dc46 100644
--- a/init.el
+++ b/init.el
@@ -179,13 +179,13 @@ Restart works only on graphic display."
 (setq visible-bell t)
 
 ;; font
-(cond
- ((string-equal (system-name) "archdesk")
-  (when (member "Hack" (font-family-list))
-    (add-to-list 'default-frame-alist '(font . "Hack-14"))))
- ((string-equal (system-name) "pop_os")
-  (when (member "Hack" (font-family-list))
-    (add-to-list 'default-frame-alist '(font . "Hack-10")))))
+;; (cond
+;;  ((string-equal (system-name) "archdesk")
+;;   (when (member "Hack" (font-family-list))
+;;     (add-to-list 'default-frame-alist '(font . "Hack-14"))))
+;;  ((string-equal (system-name) "pop_os")
+;;   (when (member "Hack" (font-family-list))
+;;     (add-to-list 'default-frame-alist '(font . "Hack-10")))))
 
 ;; theme
 (use-package gruber-darker-theme