diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/alacritty/alacritty.toml | 8 | ||||
| -rw-r--r-- | .config/emacs/init.el | 78 | ||||
| -rw-r--r-- | .config/isyncrc | 28 | ||||
| -rw-r--r-- | .config/nyxt/default-search.lisp | 2 | ||||
| -rw-r--r-- | .config/nyxt/keys.lisp | 7 | ||||
| -rw-r--r-- | .config/nyxt/style.lisp | 4 |
6 files changed, 74 insertions, 53 deletions
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index fb15bfc..a10958a 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,8 +1,10 @@ [window] -opacity = 0.8 +opacity = 0.9 [colors] -primary.background="#1d1f21" +primary.background="#191919" [font] -normal={family="Jetbrains Mono", style="Regular"} +normal={family="Fira Mono", style="Regular"} +bold = { family = "Fira Mono", style = "Bold" } +size=13
\ No newline at end of file diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 183ccc3..ddb2281 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -35,7 +35,7 @@ (setf user-full-name "Thanos Apollo" user-mail-address "[email protected]") -(setq copyright-names-regexp +(setf copyright-names-regexp (format "%s <%s>" user-full-name user-mail-address)) (defvar is-zeus (string= (system-name) "zeus")) @@ -46,14 +46,13 @@ ;; Font (custom-set-faces (if is-hermes '(default ((t (:inherit nil :height 130 :family "Fira Mono")))) - '(default ((t (:inherit nil :height 140 :family "Fira Mono"))))) - '(variable-pitch ((t (:inherit t :height 140 :family "Fira Mono")))) + '(default ((t (:inherit nil :height 150 :family "Fira Mono"))))) '(org-modern-symbol ((t (:inherit t :family "Iosevka Aile"))))) ;; Autoinsert (auto-insert-mode 1) -(setq auto-insert-alist '((python-mode . "python.template")) +(setf auto-insert-alist '((python-mode . "python.template")) auto-insert-directory (locate-user-emacs-file "insert")) ;; Completions @@ -303,7 +302,6 @@ (add-to-list 'default-frame-alist '(alpha-background . 85)) ;; Theming -(global-visual-line-mode) (defun thanos/terminal-theming () "Customize theming when laucning Emacs as TUI." @@ -343,7 +341,7 @@ (make-directory "~/Notes")) (use-package org-roam - :straight nil + :straight (org-roam :local-repo "~/Dev/emacs-lisp/org-roam") :defer t :init (define-prefix-command 'thanos/notes-map) @@ -364,25 +362,31 @@ (setf org-roam-capture-templates '(("d" "default" plain "%?" - :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+startup: overview\n") + :if-new + (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+startup: overview\n") :unnarrowed t) ("p" "MUS" plain "* Goals\n\n%?\n\n* Tasks\n\n** TODO Add initial tasks\n\n* Dates\n\n" - :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+filetags: MUS") + :if-new + (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+filetags: MUS") :unnarrowed t)) org-roam-dailies-capture-templates '(("d" "default" entry "* %?" :target (file+head "%<%Y-%m-%d>.org" - "#+title: %<%Y-%m-%d>\n#+filetags: :journal:\n")) + "#+title: %<%Y-%m-%d>\n#+filetags: :journal:dailies:\n")) ("j" "journal" plain - "\n* Daily Notes\n\n* Goals\n+ []\n\n* Extras %?" + "* %?" :target (file+head "%<%Y-%m-%d>.org" - "#+title: %<%Y-%m-%d>\n#+filetags: :journal:\n")))) + "#+title: %<%Y-%m-%d>\n#+filetags: :journal:dailies:\n +* Daily Notes\n\n* Goals\n+ []\n\n* Extras")))) (defun org-roam-ref-add-book () "Insert org-link from Library." (interactive) - (let ((book (format "file:%s" (read-file-name "Book: " (if is-zeus "/hdd/Library/" "~/Library/"))))) + (let ((book + (format + "file:%s" + (read-file-name "Book: " (if is-zeus "/hdd/Library/" "~/Library/"))))) book)) (defun org-roam-sync-notes () @@ -398,7 +402,8 @@ (vc-create-repo 'Git)) (shell-command "git pull") (shell-command (format "%s %s" git "add .")) - (shell-command (format "%s %s %s" git "commit -m" (shell-quote-argument "Update org-roam notes"))) + (shell-command (format "%s %s %s" git "commit -m" + (shell-quote-argument "Update org-roam notes"))) (vc-git-push nil)) (funcall 'org-roam-db-sync)) :bind (("C-c n" . thanos/notes-map) @@ -448,7 +453,7 @@ (underline-err red-intense) (underline-warning yellow-faint) (underline-note cyan-faint) - (string "#86B187") + ;; (string "#86B187") (border-mode-line-active unspecified) (border-mode-line-inactive unspecified) (bg-mode-line-active "#433F4f") ;; subtle lavender @@ -486,7 +491,7 @@ :init (define-prefix-command 'thanos/search) :bind (("C-x r d" . 'bookmark-delete) ("C-x r C-r" . 'bookmark-rename) - ("C-x r C-j" . 'consult-register) + ("C-x r j" . 'consult-register) ("C-x r SPC" . 'consult-register-store) ("C-x r b" . 'consult-bookmark) ("C-c m" . 'consult-imenu) @@ -494,12 +499,14 @@ ("C-x C-b" . 'switch-to-prev-buffer) ("M-y" . 'consult-yank-from-kill-ring) ("C-M-s" . 'consult-line) - ("M-s" . 'thanos/search) + ("C-c s" . 'thanos/search) :map thanos/search - ("M-f" . 'consult-find) + ("f" . 'consult-find) ("g" . 'consult-grep) ("i" . 'consult-info) ("l" . 'consult-locate) + ("b" . 'consult-buffer-other-window) + ("m" . 'consult-man) :map project-prefix-map ("b" . 'consult-project-buffer))) @@ -808,7 +815,8 @@ rss.xml" anna piracy) (if (eshell-git-prompt--collect-status) (with-face " ✎" 'eshell-git-prompt-modified-face) (with-face " ✔" 'eshell-git-prompt-exit-success-face)))) - (setq time (with-face (format-time-string "%I:%M:%S %p") 'eshell-git-prompt-multiline-secondary-face)) + (setq time (with-face (format-time-string "%I:%M:%S %p") + 'eshell-git-prompt-multiline-secondary-face)) (setq sign (if (= (user-uid) 0) (with-face "\n#" 'eshell-git-prompt-multiline-sign-face) @@ -1005,12 +1013,12 @@ By default, returns all jabber related buffers format." (code-review . "You are an expert programmer within Emacs reviewing code. Respond concisely") (writer . "You are an expert writer and FOSS enthusiast. Improve only the article sections provided as a hacker, do not add extra paragraphs."))) - (setq-default gptel-model "llama3.1:latest") + (setq-default gptel-model "llama3.2:latest") (setq gptel-backend (gptel-make-ollama "Ollama" :host (if is-zeus "localhost:11434" "zeus:11434") :stream t - :models '("llama3.1:latest" "dolphin-phi" "dolphin-llama3:latest"))) + :models '("llama3.2:latest" "dolphin-phi" "dolphin-llama3:latest"))) :bind (("C-c g" . 'gptel-send) :map gptel-mode-map ("C-c h" . 'gptel-menu))) @@ -1061,7 +1069,6 @@ By default, returns all jabber related buffers format." (get-buffer-process new-buffer) (lambda (process event) (when (memq (process-status process) '(exit signal)) - (sit-for 0.3) (delete-window (get-buffer-window (process-buffer process))) (kill-buffer (process-buffer process)))))))) @@ -1103,8 +1110,8 @@ By default, returns all jabber related buffers format." ;; (thanos/notmuch-update) ;; smtpmail settings -(setf smtpmail-smtp-user "[email protected]" - smtpmail-smtp-server "smtp.forwardemail.net" +(setf smtpmail-smtp-user (password-store-get-field "mailbox/thanosapollo" "user") + smtpmail-smtp-server "smtp.mailbox.org" smtpmail-smtp-service 465 smtpmail-stream-type 'ssl message-send-mail-function 'smtpmail-send-it @@ -1127,9 +1134,12 @@ By default, returns all jabber related buffers format." (emms-all) (setq emms-source-file-default-directory "/hdd/Music" emms-info-asynchronously t - emms-show-format "♪ %s") - (emms-default-players)) - (setf emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display" "--no-video")) + emms-show-format "♪ %s" + emms-info-functions) + (emms-info-exiftool) + (add-to-list 'emms-info-functions 'emms-info-native)) + (setf emms-player-mpv-parameters + '("--quiet" "--really-quiet" "--no-audio-display" "--no-video")) :bind (("C-z" . thanos/emms) :map thanos/emms ("n" . 'emms-next) @@ -1144,7 +1154,21 @@ By default, returns all jabber related buffers format." (("s" . 'emms-browser-search-by-names)))) (use-package debbugs - :ensure nil) + :ensure nil + :config + (require 'bug-reference) + (add-hook 'prog-mode-hook #'bug-reference-prog-mode) + (add-hook 'gnus-mode-hook #'bug-reference-mode) + (add-hook 'erc-mode-hook #'bug-reference-mode) + (add-hook 'gnus-summary-mode-hook #'bug-reference-mode) + (add-hook 'gnus-article-mode-hook #'bug-reference-mode) + + ;; Change the default when run as 'M-x debbugs-gnu'. + (setq debbugs-gnu-default-packages '("emacs")) + + ;; Show feature requests. + (setq debbugs-gnu-default-severities + '("serious" "important" "normal" "minor" "wishlist"))) ;;; Random commands ;;;; diff --git a/.config/isyncrc b/.config/isyncrc index 7ea285e..2f6434a 100644 --- a/.config/isyncrc +++ b/.config/isyncrc @@ -26,27 +26,27 @@ Sync All Create Both SyncState * -IMAPAccount forwardemail -Host imap.forwardemail.net -Port 2993 -User [email protected] -PassCmd "pass forwardemail/[email protected]" +IMAPAccount Mailbox +Host imap.mailbox.org +Port 993 +User [email protected] +PassCmd "pass mailbox/thanosapollo" TLSType IMAPS TLSVersions +1.2 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore forwardemail-remote -Account forwardemail +IMAPStore Mailbox-remote +Account Mailbox -MaildirStore forwardemail-local -Path ~/Mail/Forwardemail/public-org/ -Inbox ~/Mail/Forwardemail/public-org/Inbox -Trash ~/Mail/Forwardemail/public-org/Trash +MaildirStore Mailbox-local +Path ~/Mail/Mailbox/Main/ +Inbox ~/Mail/Mailbox/Main/Inbox +Trash ~/Mail/Mailbox/Main/Trash SubFolders Verbatim -Channel forwardemail -Far :forwardemail-remote: -Near :forwardemail-local: +Channel Mailbox +Far :Mailbox-remote: +Near :Mailbox-local: Patterns * Expunge None CopyArrivalDate yes diff --git a/.config/nyxt/default-search.lisp b/.config/nyxt/default-search.lisp index 001bb54..9d52608 100644 --- a/.config/nyxt/default-search.lisp +++ b/.config/nyxt/default-search.lisp @@ -2,7 +2,7 @@ (defvar *thanos/search-engines* (list '("aa" "https://annas-archive.org/search?q=~a" "https://annas-archive.org/") - '("duck" "https://html.duckduckgo.com/html/?q=~a" "https://html.duckduckgo.com/")) + '("ddg" "https://html.duckduckgo.com/html/?q=~a" "https://html.duckduckgo.com/")) "List of search engines.") (define-configuration context-buffer diff --git a/.config/nyxt/keys.lisp b/.config/nyxt/keys.lisp index 5ede9f5..fde38be 100644 --- a/.config/nyxt/keys.lisp +++ b/.config/nyxt/keys.lisp @@ -4,12 +4,6 @@ ((default-modes (pushnew 'nyxt/mode/emacs:emacs-mode %slot-value%)))) -;; (define-configuration input-buffer -;; ((override-map -;; (let ((map (make-keymap "override-map"))) -;; (define-key map "M-x" 'execute-command "C-space" 'nothing))))) - - (define-configuration :document-mode "Add basic keybindings." ((keyscheme-map @@ -22,4 +16,5 @@ "C-c v" 'visual-mode "C-f" :history-forwards-maybe-query "C-x C-f" 'follow-hint + "C-x f" 'visual-mode "C-s" :search-buffer))))) diff --git a/.config/nyxt/style.lisp b/.config/nyxt/style.lisp index 8a9eb7a..5a7cf59 100644 --- a/.config/nyxt/style.lisp +++ b/.config/nyxt/style.lisp @@ -111,8 +111,8 @@ :contrast-text-color badger-fg - :font-family "Jetbrains Mono" - :monospace-font-family "Jetbrains Mono")) + :font-family "Fira Mono" + :monospace-font-family "Fira Mono")) (define-configuration browser ((theme thanos/dark-theme |