Update to emacs27, add some packages

master
trémeur 3 years ago
parent 351f65eae9
commit aafb27db5f

3
.gitignore vendored

@ -8,3 +8,6 @@ bookmarks
nohup.out nohup.out
\#* \#*
network-security.data network-security.data
nov-places
request/*
transient/*

@ -87,10 +87,14 @@
(when (iswin) (when (iswin)
(setq default-directory "~/")) (setq default-directory "~/"))
(when (islin)
(use-package lastfm))
;; Be quiet ;; Be quiet
(setq ad-redefinition-action 'accept) (setq ad-redefinition-action 'accept)
(setq python-indent-guess-indent-offset-verbose nil) (setq python-indent-guess-indent-offset-verbose nil)
(setq byte-compile-warnings '(cl-functions))
;; Minor modes ;; Minor modes
@ -178,6 +182,22 @@
;; Major modes ;; Major modes
(when (islin)
(use-package calibredb
:defer t
:config
(setq calibredb-root-dir "~/Documents/drive/calibre/ebooks")
(setq calibredb-db-dir (expand-file-name "metadata.db" calibredb-root-dir))
(setq calibredb-library-alist '(("~/Documents/drive/calibre/ebooks")
("~/Documents/drive/calibre/ffff"))))
(use-package nov
:init
(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)))
(defun my-nov-font-setup ()
(face-remap-add-relative 'variable-pitch :family "Liberation Serif"
:height 2.0))
(add-hook 'nov-mode-hook 'my-nov-font-setup))
(use-package deft (use-package deft
;; for searching journal files ;; for searching journal files
:config :config
@ -224,7 +244,7 @@
(add-hook 'pdf-view-mode-hook (lambda () (cua-mode 0))) (add-hook 'pdf-view-mode-hook (lambda () (cua-mode 0)))
(setq pdf-view-resize-factor 1.1))) (setq pdf-view-resize-factor 1.1)))
(when (iswin) (use-package doc-view ; not tested (when (iswin) (use-package doc-view
:config :config
(setq doc-view-ghostscript-program "gswin32c"))) (setq doc-view-ghostscript-program "gswin32c")))
@ -259,6 +279,11 @@
(load-file "~/.emacs.d/agenda-common.el") (load-file "~/.emacs.d/agenda-common.el")
;; for agenda things used in both emacs and batch ;; for agenda things used in both emacs and batch
(when (islin)
(use-package org-modern
:hook
(org-mode . org-modern-mode)))
(use-package calfw (use-package calfw
;; grid calendar that i forget to use ;; grid calendar that i forget to use
:bind ("C-c f" . cfw:open-org-calendar) :bind ("C-c f" . cfw:open-org-calendar)
@ -276,12 +301,13 @@
:config :config
(setq org-directory "~/Documents/drive/org")) (setq org-directory "~/Documents/drive/org"))
(unless (islin)
(use-package org-bullets (use-package org-bullets
;; makes bullets look nice ;; makes bullets look nice
:custom :custom
(org-bullets-bullet-list '("")) (org-bullets-bullet-list '(""))
(org-ellipsis "") (org-ellipsis "")
:hook (org-mode . org-bullets-mode)) :hook (org-mode . org-bullets-mode)))
(setq org-todo-keywords (setq org-todo-keywords
'((sequence "TODO" "|" "DONE" "CANCELLED"))) '((sequence "TODO" "|" "DONE" "CANCELLED")))
@ -350,7 +376,7 @@
(when (islin) (when (islin)
(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e") (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
(load-file "~/.emacs.d/mail.el") (load-file "~/.emacs.d/mail.el")
(require 'mu4e) (require 'mu4e) ;; this uses cl … hopefully will be updated in a later emacs version?
(setq send-mail-function 'smtpmail-send-it) (setq send-mail-function 'smtpmail-send-it)
;; (load-file "~/.emacs.d/custom/dwpost.el") ;; (load-file "~/.emacs.d/custom/dwpost.el")
) )
@ -374,17 +400,17 @@
:config :config
(global-hl-line-mode 1)) (global-hl-line-mode 1))
(when (islin) (use-package tao-theme)
(use-package xresources-theme) (load-theme 'tao-yang t)
;; theme based on ~/.Xresources
) ;; (when (islin) ;; not working in emacs27?
;; (use-package xresources-theme)
;; ;; theme based on ~/.Xresources
;; )
(set-cursor-color "#61805c") (set-cursor-color "#61805c")
(set-face-attribute 'region nil :background "#fcf6a7") (set-face-attribute 'region nil :background "#fcf6a7")
(set-face-background 'hl-line "#c9ffbf") (set-face-background 'hl-line "#ddffd6")
(unless (islin)
(load-theme 'dichromacy))
;; Fonts ;; Fonts
@ -431,3 +457,19 @@
")) "))
(org-reload) (org-reload)
(custom-set-variables
;; custom-set-variables 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.
'(custom-safe-themes
'("801a567c87755fe65d0484cb2bded31a4c5bb24fd1fe0ed11e6c02254017acb2" "dbade2e946597b9cda3e61978b5fcc14fa3afa2d3c4391d477bdaeff8f5638c5" default)))
(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.
'(fixed-pitch ((t (:family "Noto Mono" :height 90))))
'(italic ((t (:slant italic))))
'(markdown-header-face ((t (:inherit (default font-lock-function-name-face) :weight bold))))
'(variable-pitch ((t (:family "Noto Sans" :height 90)))))

Loading…
Cancel
Save