pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Switch emacs package definitions to use use-package"

Browse source 
This reverts commit 32436bb052.

Broke lots of config, TODO revisit another time
This commit is contained in:
Evie Litherland-Smith 2023-10-31 07:59:37 +00:00
parent 32436bb052
commit 0ee059a354
8 changed files with 92 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
home/emacs/modules/custom-email-config.el
View file

@ -5,12 +5,17 @@
message-send-mail-function #'message-send-mail-with-sendmail
message-kill-buffer-on-exit t)
(use-package mu4e
:defer t
:bind (("C-c m m" . mu4e)
("C-c m u" . mu4e-update-index)
("C-c m c" . mu4e-compose-new))
:config
(when (require 'mu4e nil :noerror)
(keymap-set global-map "C-c m m" #'mu4e)
(keymap-set global-map "C-c m u" #'mu4e-update-index)
(keymap-set global-map "C-c m c" #'mu4e-compose-new)
(when (require 'mu4e-alert nil :noerror)
(setq mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter)
(mu4e-alert-set-default-style 'libnotify)
(mu4e-alert-enable-notifications)
(mu4e-alert-enable-mode-line-display))
(setq mu4e-maildir "~/Mail"
mu4e-attachment-dir "~/Downloads"
mu4e-get-mail-command "mbsync -a"
@ -24,11 +29,11 @@
message-sendmail-extra-arguments '("--read-envelope-from")
message-send-mail-function #'message-send-mail-with-sendmail
mu4e-headers-thread-single-orphan-prefix '("─>" . "─▶")
mu4e-headers-thread-orphan-prefix '("┬>" . "┬▶ ")
mu4e-headers-thread-connection-prefix '("│ " . "│ ")
mu4e-headers-thread-first-child-prefix '("├>" . "├▶")
mu4e-headers-thread-child-prefix '("├>" . "├▶")
mu4e-headers-thread-last-child-prefix '("└>" . "╰▶")
mu4e-headers-thread-orphan-prefix '("┬>" . "┬▶ ")
mu4e-headers-thread-connection-prefix '("│ " . "│ ")
mu4e-headers-thread-first-child-prefix '("├>" . "├▶")
mu4e-headers-thread-child-prefix '("├>" . "├▶")
mu4e-headers-thread-last-child-prefix '("└>" . "╰▶")
mu4e-modeline-all-read '("R:" . "󰑇 ")
mu4e-modeline-all-clear '("C:" . "󰚭 ")
mu4e-modeline-new-items '("N:" . "󰎔 ")
@ -48,42 +53,27 @@
mu4e-contexts (list
(make-mu4e-context
:name "Proton"
:match-func
(lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir))))
:vars
'((user-mail-address . "e.litherlandsmith@proton.me")
(mu4e-sent-folder . "/Proton/Sent")
(mu4e-drafts-folder . "/Proton/Drafts")
(mu4e-trash-folder . "/Proton/Trash")
(mu4e-refile-folder . "/Proton/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir))))
:vars '((user-mail-address . "e.litherlandsmith@proton.me")
(mu4e-sent-folder . "/Proton/Sent")
(mu4e-drafts-folder . "/Proton/Drafts")
(mu4e-trash-folder . "/Proton/Trash")
(mu4e-refile-folder . "/Proton/Archive")))
(make-mu4e-context
:name "iCloud"
:match-func
(lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir))))
:vars
'((user-mail-address . "e.litherlandsmith@icloud.com")
(mu4e-sent-folder . "/iCloud/Sent")
(mu4e-drafts-folder . "/iCloud/Drafts")
(mu4e-trash-folder . "/iCloud/Trash")
(mu4e-refile-folder . "/iCloud/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir))))
:vars '((user-mail-address . "e.litherlandsmith@icloud.com")
(mu4e-sent-folder . "/iCloud/Sent")
(mu4e-drafts-folder . "/iCloud/Drafts")
(mu4e-trash-folder . "/iCloud/Trash")
(mu4e-refile-folder . "/iCloud/Archive")))
(make-mu4e-context
:name "Outlook"
:match-func
(lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir))))
:vars
'((user-mail-address . "evie.litherland-smith@ukaea.uk")
(mu4e-sent-folder . "/Outlook/Sent")
(mu4e-drafts-folder . "/Outlook/Drafts")
(mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive"))))))
(use-package mu4e-alert
:requires mu4e
:after mu4e
:config
(setq mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter)
(mu4e-alert-set-default-style 'libnotify)
(mu4e-alert-enable-notifications)
(mu4e-alert-enable-mode-line-display))
:match-func (lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir))))
:vars '((user-mail-address . "evie.litherland-smith@ukaea.uk")
(mu4e-sent-folder . "/Outlook/Sent")
(mu4e-drafts-folder . "/Outlook/Drafts")
(mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive"))))))
(provide 'custom-email-config)

18
home/emacs/modules/custom-feed-config.el
View file

@ -1,20 +1,10 @@
(use-package elfeed
:defer t
:config
(when (require 'elfeed nil :noerror)
(let ((elfeed-base-directory "~/.elfeed"))
(setq elfeed-db-directory (expand-file-name "db" elfeed-base-directory)
elfeed-enclosure-default-dir (expand-file-name "enclosures" elfeed-base-directory)
rmh-elfeed-org-files (list (expand-file-name "feeds.org" elfeed-base-directory))))
(add-hook 'elfeed-search-mode-hook #'elfeed-update))
(use-package elfeed-org
:requires elfeed
:after elfeed
:config (elfeed-org))
(use-package elfeed-tube
:requires elfeed
:after elfeed
:config (elfeed-tube-setup))
(add-hook 'elfeed-search-mode-hook #'elfeed-update)
(when (require 'elfeed-org nil :noerror) (elfeed-org))
(when (require 'elfeed-tube nil :noerror) (elfeed-tube-setup)))
(provide 'custom-feed-config)

24
home/emacs/modules/custom-ide-config.el
View file

@ -1,32 +1,24 @@
(use-package rainbow-delimiters
:ensure t
:config
(when (require 'rainbow-delimiters nil :noerror)
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
(use-package treesit-auto
:config
(when (require 'treesit-aut nil :noerror)
(global-treesit-auto-mode +1))
(use-package apheleia
:ensure t
:config
(when (require 'apheleia nil :noerror)
(setq apheleia-remote-algorithm 'local)
(keymap-set global-map "C-c c f" #'apheleia-format-buffer)
(apheleia-global-mode +1))
(use-package direnv
:ensure t
:config
(when (require 'eglot nil :noerror)
(eglot-ensure))
(when (require 'direnv nil :noerror)
(setq direnv-always-show-summary nil)
(direnv-mode +1))
(use-package yasnippet
:ensure t
:config
(when (require 'yasnippet nil :noerror)
(require 'yasnippet-snippets nil :noerror)
(yas-reload-all)
(add-hook 'prog-mode-hook #'yas-minor-mode))
(eglot-ensure)
(provide 'custom-ide-config)

4
home/emacs/modules/custom-media-config.el
View file

@ -1,6 +1,4 @@
(use-package emms
:defer t
:config
(when (require 'emms-setup nil :noerror)
(setq emms-player-list '(emms-player-mpv)
emms-info-functions '(emms-info-native)
emms-source-file-default-directory "~/Music"

5
home/emacs/modules/custom-org-config.el
View file

@ -50,10 +50,7 @@
:emptry-lines 1)
))
(use-package khalel
:requires org
:after org
:config
(when (require 'khalel nil :noerror)
(setq khalel-import-org-file (expand-file-name "calendar.org" org-directory)
khalel-import-org-file-read-only nil
khalel-import-org-file-confirm-overwrite nil

5
home/emacs/modules/custom-project-config.el
View file

@ -6,10 +6,7 @@
(project-find-dir "Find directory")
(project-eshell "Eshell")))
(use-package magit
:ensure t
:defer t
:config
(when (require 'magit nil :noerror)
(setq magit-clone-default-directory "~/Projects/"))
(provide 'custom-project-config)

4
home/emacs/modules/custom-social-config.el
View file

@ -1,6 +1,4 @@
(use-package mastodon
:defer t
:config
(when (require 'mastodon nil :noerror)
(setq mastodon-instance-url "https://tech.lgbt"
mastodon-active-user "Tux922"))

76
home/emacs/modules/custom-ui-config.el
View file

@ -21,64 +21,72 @@
(set-frame-parameter nil 'alpha-background 80)
(add-hook 'server-after-make-frame-hook (lambda () (set-frame-parameter nil 'alpha-background 80)))
(use-package doom-themes
:ensure t
:config
(when (require 'doom-themes nil :noerror)
(load-theme 'doom-tokyo-night t))
;; Nerd-Icons modes
(use-package nerd-icons-dired
:requires nerd-icons
:ensure t
:config
(when (require 'nerd-icons-dired nil :noerror)
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
(use-package nerd-icons-ibuffer
:requires nerd-icons
:ensure t
:config
(when (require 'nerd-icons-ibuffer nil :noerror)
(add-hook 'ibuffer-mode-hook #'nerd-icons-ibuffer-mode))
(use-package nerd-icons-completion
:requires (nerd-icons marginalia)
:ensure t
:config
(add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))
(when (require 'nerd-icons-completion nil :noerror)
(nerd-icons-completion-mode)
(when (require 'marginalia nil :noerror)
(add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup)))
;; Doom-Modeline
(use-package doom-modeline
:ensure t
:config
(when (require 'doom-modeline nil :noerror)
(setq doom-modeline-icon t
doom-modeline-mu4e t)
(display-battery-mode)
(doom-modeline-mode +1))
;; Dashboard
(when (require 'dashboard nil :noerror)
(setq initial-buffer-choice 'dashboard-open
dashboard-icon-type 'nerd-icons
dashboard-set-heading-icons t
dashboard-set-file-icons t
dashboard-set-navigator t
dashboard-set-init-info t
dashboard-startup-banner 'ascii
dashboard-projects-backend 'project-el
dashboard-projects-switch-function 'project-switch-project
dashboard-projects-show-base t
dashboard-recentf-show-base 'align
dashboard-items '((projects . 5) (agenda . 5) (recents . 5))
dashboard-banner-ascii (concat " .000000. \n"
" .0. .0. \n"
" .00. .00. \n"
" .000cl. .lc000. \n"
".0 0.\n"
"0. .o0000o. .0\n"
" 00 .0' '0. 00 \n"
" 00 .0 0. 00 \n"
" HHHHH HHHHHHHHHHHH HHHHH \n"
"HHHH HHH HHHHHHHHHHHHHH HHHH\n"
" HHHHHH HHHHHHHHH HHHHHHHH \n"
" HHH HHHH HHHHHHHHH HHHH \n"
" HHH HHHHHH \n"
" HHHHH HH \n")))
;; Extra minor-modes
(use-package which-key
:ensure t
:config
(when (require 'which-key nil :noerror)
(which-key-mode +1))
(use-package page-break
:ensure t
:config
(when (require 'page-break nil :noerror)
(global-page-break-lines-mode +1))
;; Weather in modeline
(use-package display-wttr
:ensure t
:config
(setq display-wttr-format 1)
(display-wttr-mode +1))
(setq display-wttr-format 1)
(when (require 'display-wttr nil :noerror) (display-wttr-mode +1))
;;;; Help Buffers
;; Make `describe-*' screens more helpful
(use-package helpful
:ensure t
:config
(when (require 'helpful nil :noerror)
(keymap-set helpful-mode-map "<remap> <revert-buffer>" #'helpful-update)
(keymap-global-set "<remap> <describe-command>" #'helpful-command)
(keymap-global-set "<remap> <describe-function>" #'helpful-callable)