Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos
This commit is contained in:
commit
a8a85d3835
|
|
@ -8,20 +8,20 @@
|
|||
sent_tag = sent
|
||||
|
||||
[FolderNameFilter]
|
||||
folder_explicit_list = Proton/Archive Proton/Sent Proton/Trash iCloud/Archive 'iCloud/Deleted Messages' 'iCloud/Sent Messages' Outlook/Archive Outlook/Trash Outlook/Sent
|
||||
folder_transforms = Archive:archive Drafts:draft Sent:sent 'Sent Messages':sent Trash:deleted 'Deleted Messages':deleted
|
||||
folder_explicit_list = Proton/Archive Proton/Trash iCloud/Archive 'iCloud/Deleted Messages' Outlook/Archive Outlook/Trash
|
||||
folder_transforms = Archive:archive Trash:deleted 'Deleted Messages':deleted
|
||||
folder_lowercases = true
|
||||
maildir_separator = /
|
||||
|
||||
[Filter.1]
|
||||
query = NOT folder:Proton/Inbox AND NOT folder:iCloud/Inbox AND NOT folder:Outlook/Inbox
|
||||
tags = -new;-inbox
|
||||
message = Removing new/inbox tags from emails already in other folders
|
||||
message = Removing new/inbox/unread tags from archived mail
|
||||
query = tag:archive
|
||||
tags = -new;-inbox;-unread
|
||||
|
||||
[Filter.2]
|
||||
message = Untagged inbox from archive
|
||||
query = tag:archive AND tag:inbox
|
||||
tags = -inbox
|
||||
message = Removing new/inbox/unread tags from deleted mail
|
||||
query = tag:deleted
|
||||
tags = -new;-inbox;-unread
|
||||
|
||||
[Filter.3]
|
||||
message = Tag ReqCo emails
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
gfortran
|
||||
rustup
|
||||
texlive.combined.scheme-medium
|
||||
python3
|
||||
(python3.withPackages
|
||||
(ps: with ps; [ python-lsp-server python-lsp-ruff pylsp-mypy ]))
|
||||
|
||||
# Linters
|
||||
nodePackages.stylelint
|
||||
|
|
@ -55,7 +56,7 @@
|
|||
marksman
|
||||
luajitPackages.lua-lsp
|
||||
texlab
|
||||
nodePackages.pyright
|
||||
# nodePackages.pyright
|
||||
nodePackages.yaml-language-server
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.javascript-typescript-langserver
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
;; define a key to define the word at point.
|
||||
(keymap-set global-map "M-#" #'dictionary-lookup-definition)
|
||||
|
||||
;; define key to open recent files
|
||||
(keymap-set global-map "C-c r" #'recentf)
|
||||
|
||||
;; turn on spell checking, if available.
|
||||
(with-eval-after-load 'ispell
|
||||
(when (executable-find ispell-program-name)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
notmuch-search-oldest-first nil
|
||||
notmuch-show-logo nil
|
||||
notmuch-hello-thousands-separator ","
|
||||
notmuch-archive-tags '("-inbox" "+archive")
|
||||
notmuch-archive-tags '("+archive" "-inbox")
|
||||
notmuch-message-headers-visible nil
|
||||
notmuch-multipart/alternative-discouraged '("text/plain" "multipart/related")
|
||||
notmuch-show-all-multipart/alternative-parts nil
|
||||
|
|
@ -22,7 +22,18 @@
|
|||
(".*@icloud.com" . "iCloud/Sent")
|
||||
(".*@ukaea.uk" . "Outlook/Sent")
|
||||
(".*@jet.uk" . "Outlook/Sent"))
|
||||
notmuch-indicator-args '((:terms "tag:unread and tag:inbox" :label " "))
|
||||
notmuch-saved-searches '((:name "inbox" :query "tag:inbox" :key "i")
|
||||
(:name "unread" :query "tag:unread AND tag:inbox" :key "u")
|
||||
(:name "flagged" :query "tag:flagged" :key "f")
|
||||
(:name "sent" :query "tag:sent" :key "t")
|
||||
(:name "drafts" :query "tag:draft" :key "d")
|
||||
(:name "all mail" :query "*" :key "a"))
|
||||
notmuch-tagging-keys '(("a" notmuch-archive-tags "Archive")
|
||||
("u" notmuch-show-mark-read-tags "Mark read")
|
||||
("f" ("+flagged") "Flag")
|
||||
("s" ("+spam" "-inbox") "Mark as spam")
|
||||
("d" ("+deleted" "-inbox" "-unread") "Delete"))
|
||||
notmuch-indicator-args '((:terms "tag:unread AND tag:inbox" :label " "))
|
||||
notmuch-indicator-force-refresh-commands '(notmuch-refresh-this-buffer
|
||||
notmuch-refresh-all-buffers
|
||||
notmuch-poll-and-refresh-this-buffer))
|
||||
|
|
@ -35,9 +46,8 @@
|
|||
"email"
|
||||
("m" notmuch)
|
||||
("c" notmuch-mua-new-mail)
|
||||
("i" (notmuch-unthreaded "is:inbox"))
|
||||
("u" (notmuch-unthreaded "is:unread AND is:inbox"))
|
||||
("C-i" (notmuch-tree "is:inbox"))
|
||||
("C-u" (notmuch-tree "is:unread AND is:inbox")))))
|
||||
("s" notmuch-search)
|
||||
("i" (notmuch-search "is:inbox"))
|
||||
("u" (notmuch-search "is:unread AND is:inbox")))))
|
||||
|
||||
(provide 'custom-email-config)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
(setq elfeed-db-directory "~/.elfeed/db/"
|
||||
elfeed-enclosure-default-dir "~/.elfeed/enclosures/"
|
||||
rmh-elfeed-org-files (list (expand-file-name "feeds.org" elfeed-db-directory) "elfeed.org"))
|
||||
(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))))
|
||||
|
||||
(when (require 'elfeed nil :noerror)
|
||||
(add-hook 'elfeed-search-mode-hook #'elfeed-update)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
(let)
|
||||
(setq org-directory "~/Org"
|
||||
org-journal-dir (expand-file-name "journal" org-directory)
|
||||
org-journal-file-type 'daily
|
||||
|
|
@ -11,36 +10,41 @@
|
|||
(search . " %i"))
|
||||
org-refile-use-outline-path t
|
||||
org-refile-allow-creating-parent-nodes t
|
||||
org-refile-use-outline-path 'file
|
||||
org-refile-targets '((nil :maxlevel . 3)
|
||||
(org-agenda-files :maxlevel . 3))
|
||||
;; Without this, completers like ivy/helm are only given the first level of
|
||||
;; each outline candidates. i.e. all the candidates under the "Tasks" heading
|
||||
;; are just "Tasks/". This is unhelpful. We want the full path to each refile
|
||||
;; target! e.g. FILE/Tasks/heading/subheading
|
||||
org-refile-use-outline-path 'file
|
||||
org-outline-path-complete-in-steps nil
|
||||
org-default-notes-file (expand-file-name "notes.org" org-directory))
|
||||
|
||||
(let ((project-template "#+title: ${title}\n#+category: ${title}\n* Goals\n\n* [%] Tasks\n\n* Notes\n\n* References\n"))
|
||||
(setq org-capture-templates
|
||||
'(("n" "Note" entry
|
||||
(file+headline "notes.org" "Inbox")
|
||||
"* %u %?\n%i\n%a"
|
||||
:prepend t
|
||||
:empty-lines 1)
|
||||
("t" "Task" entry
|
||||
(file+headline "todo.org" "Inbox")
|
||||
"* TODO %?\n%i\n%a"
|
||||
:prepend t
|
||||
:emptry-lines 1)
|
||||
)))
|
||||
(setq org-capture-templates
|
||||
'(("n" "Note" entry
|
||||
(file+headline "notes.org" "Inbox")
|
||||
"* %?"
|
||||
:prepend t
|
||||
:empty-lines 1)
|
||||
("N" "Note (with context)" entry
|
||||
(file+headline "notes.org" "Inbox")
|
||||
"* %?\n%a\n%i"
|
||||
:prepend t
|
||||
:empty-lines 1)
|
||||
("t" "Task" entry
|
||||
(file+headline "todo.org" "Inbox")
|
||||
"* TODO %?"
|
||||
:prepend t
|
||||
:emptry-lines 1)
|
||||
("T" "Task (with context)" entry
|
||||
(file+headline "todo.org" "Inbox")
|
||||
"* TODO %?\n%a\n%i"
|
||||
:prepend t
|
||||
:emptry-lines 1)
|
||||
))
|
||||
|
||||
(when (require 'hydra nil :noerror)
|
||||
(defhydra org (global-map "C-c o")
|
||||
"Org-Mode"
|
||||
("a" org-agenda)
|
||||
("c" org-capture)
|
||||
("j c" calendar)
|
||||
("n" org-capture)
|
||||
("c" org-goto-calendar)
|
||||
("j j" org-journal-new-entry)
|
||||
("j n" org-journal-new-date-entry)
|
||||
("j s" org-journal-new-scheduled-entry)))
|
||||
|
|
|
|||
|
|
@ -213,41 +213,41 @@ in ''
|
|||
bind = SUPER, W, moveworkspacetomonitor, 4 current
|
||||
bind = SUPER, W, workspace, 4
|
||||
bind = SUPER SHIFT, W, movetoworkspace, 4
|
||||
windowrule = workspace 4 silent,(firefox)
|
||||
windowrule = workspace 4, (firefox)
|
||||
|
||||
# 5: [f]iles
|
||||
bind = SUPER, F, moveworkspacetomonitor, 5 current
|
||||
bind = SUPER, F, workspace, 5
|
||||
bind = SUPER SHIFT, F, movetoworkspace, 5
|
||||
windowrule = workspace 5 silent,^(libreoffice).*
|
||||
windowrulev2 = workspace 5 silent,title:(Open),class:(soffice)
|
||||
windowrule = workspace 5, ^(libreoffice).*
|
||||
windowrulev2 = workspace 5, title:(Open),class:(soffice)
|
||||
|
||||
# 6: [s]potify (or mu[s]ic)
|
||||
bind = SUPER, S, moveworkspacetomonitor, 6 current
|
||||
bind = SUPER, S, workspace, 6
|
||||
bind = SUPER SHIFT, S, movetoworkspace, 6
|
||||
windowrule = workspace 6 silent,(dev.alextren.Spot)
|
||||
windowrule = workspace 6, (dev.alextren.Spot)
|
||||
|
||||
# 7: [c]hat
|
||||
bind = SUPER, C, moveworkspacetomonitor, 7 current
|
||||
bind = SUPER, C, workspace, 7
|
||||
bind = SUPER SHIFT, C, movetoworkspace, 7
|
||||
windowrule = workspace 7 silent,(Signal)
|
||||
windowrule = workspace 7 silent,(fractal)
|
||||
windowrule = workspace 7 silent,(teams-for-linux)
|
||||
windowrule = workspace 7, (Signal)
|
||||
windowrule = workspace 7, (fractal)
|
||||
windowrule = workspace 7, (teams-for-linux)
|
||||
|
||||
# 8: [r]emote
|
||||
bind = SUPER, R, moveworkspacetomonitor, 8 current
|
||||
bind = SUPER, R, workspace, 8
|
||||
bind = SUPER SHIFT, R, movetoworkspace, 8
|
||||
windowrule = workspace 8 silent,(org.remmina.Remmina)
|
||||
windowrule = workspace 8 silent,(Nxplayer.bin)
|
||||
windowrule = workspace 8, (org.remmina.Remmina)
|
||||
windowrule = workspace 8, (Nxplayer.bin)
|
||||
|
||||
# 9: [g]aming
|
||||
bind = SUPER, G, moveworkspacetomonitor, 9 current
|
||||
bind = SUPER, G, workspace, 9
|
||||
bind = SUPER SHIFT, G, movetoworkspace, 9
|
||||
windowrule = workspace 9 silent,(steam)
|
||||
windowrule = workspace 9, (steam)
|
||||
|
||||
# Special workspaces
|
||||
bind = SUPER, comma, workspace, m-1
|
||||
|
|
|
|||
Loading…
Reference in a new issue