emacs: more emacs

3 files changed, 85 insertions, 39 deletions

diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index bf64ede..40637ef 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -31,7 +31,7 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'modus-vivendi)
+(setq doom-theme 'doom-badger)
 ;; Specify both a dark and light theme, like so and Doom will choose which one
 ;; to load based on your system light/dark setting:
 ;;
@@ -47,8 +47,50 @@
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/notes/")
+;; commented for now
+(use-package! emms
+  :config
+  (require 'emms-setup)
+  (require 'emms-player-mpd)
+  (emms-all)
+  (emms-default-players)
+  (emms-mpris-enable)
+  (setq emms-source-file-default-directory "~/Music/")
+  (setq emms-player-list
+        '(emms-player-mpd)))
+(map!
+ :leader
+ :prefix "e"
+ :desc "Browser" "b" #'emms-browser
+ :desc "Emms" "e" #'emms
+ :desc "Play playlist" "a" #'emms-play-playlist)
+
+;; mood-line
+(use-package mood-line
+
+  ;; Enable mood-line
+  :config
+  (mood-line-mode)
+
+  ;; Use pretty Fira Code-compatible glyphs
+  :custom
+  (mood-line-glyph-alist mood-line-glyphs-fira-code))
 
-;zk4e setup
+(use-package! jabber
+  :config
+  (setq jabber-account-list
+        '(("roughlynamed@yax.im")))
+  (jabber-modeline-mode 1)
+  :hook (kill-emacs . jabber-disconnect))
+(map! :leader
+      :prefix "j"
+      :desc "Jabber connect"     "c" #'jabber-connect-all
+      :desc "Jabber disconnect"  "q" #'jabber-disconnect
+      :desc "Jabber roster"      "r" #'jabber-switch-to-roster-buffer
+      :desc "Jabber new chat"    "C" #'jabber-chat-with
+      :desc "Jabber groupchat"   "g" #'jabber-groupchat-join
+      :desc "Jabber set status"  "s" #'jabber-send-presence)
+;; zk4e setup
 (use-package! zk4e
   :commands (zk4e-list zk4e-edit zk4e-new zk4e-tag-list zk4e-index zk4e-select-notebook
                        zk4e-goto-error)
@@ -56,46 +98,50 @@
   (zk4e-notebook-directories '(("notes" . "~/notes/")))
   :config
   (zk4e-select-notebook "notes")
- (add-hook 'zk4e-edit-hook #'zk4e-maybe-name-buffer))
-
-; gnus mail setup
+  (add-hook 'zk4e-edit-hook #'zk4e-maybe-name-buffer))
 
-;; encryption function
-(defun my/gnus-prompt-encrypt ()
-  "Ask wether to encrypt a message before sending with PGP"
-  (when (y-or-n-p "Encrypt this message? ")
-    (mml-secure-message-encrypt-pgpmime)))
-(add-hook 'message-send-hook #'my/gnus-prompt-encrypt)
+;; Authentication
 (setq auth-sources '("~/.authinfo.gpg")
-      auth-source-cache-expiry nil
-      epg-pinentry-mode 'loopback)
-; actual gnus setup (broken for now)
-(setq gnus-select-method '(nnnil ""))
-
-(setq gnus-secondary-select-methods
-      '((nnimap "disroot"
-         (nnimap-address "disroot.org")
-         (nnimap-server-port 993)
-         (nnimap-stream ssl)
-         (nnimap-authinfo-file "~/.authinfo.gpg")
-         (nnimap-fetch-partial-articles "text/")
-         (nnir-search-engine imap))))
+      auth-source-cache-expiry nil)
+
+;; Gnus / IMAP
+(setq gnus-select-method
+      '(nnimap "disroot"
+        (nnimap-address "disroot.org")
+        (nnimap-server-port 993)
+        (nnimap-stream ssl)))
+
+;; SMTP
 (setq smtpmail-smtp-server "disroot.org"
       smtpmail-smtp-service 587
       smtpmail-stream-type 'starttls
-      message-send-mail-function #'smtpmail-send-it
-      user-mail-address "roughlynamed@disroot.org"
+      message-send-mail-function #'smtpmail-send-it)
+
+;; Identity
+(setq user-mail-address "roughlynamed@disroot.org"
       user-full-name "Magdalena Szweda")
+
+;; Sent mail
 (setq gnus-message-archive-method '(nnimap "disroot")
-      gnus-message-archive-group "Sent"
-      nnmail-expiry-target "Trash")
+      gnus-message-archive-group "Sent")
+
+;; Mail behavior
 (setq gnus-large-newsgroup nil
-      gnus-fetch-old-headers t)
-(setq mml-secure-openpgp-signers '("3258B28C124AB0891D6C9E929B72909EEF00CBD0")
+      gnus-fetch-old-headers t
+      nnmail-expiry-target "Trash")
+
+;; PGP
+(setq mml-secure-openpgp-signers
+      '("3258B28C124AB0891D6C9E929B72909EEF00CBD0")
       mml-secure-openpgp-sign-with-sender t)
+
 (add-hook 'message-setup-hook #'message-insert-signature)
 (add-hook 'message-send-hook #'mml-secure-message-sign-pgpmime)
-(setq message-signature "\n--\nMagdalena Szweda\nhttps://roughlynamed.net\nPGP: 3258 B28C 124A B089 1D6C  9E92 9B72 909E EF00 CBD0")
+
+(setq message-signature
+      "\n--\nMagdalena Szweda\nhttps://roughlynamed.net\nPGP: 3258 B28C 124A B089 1D6C  9E92 9B72 909E EF00 CBD0")
+
+
 (setq-default vterm-shell "/usr/bin/fish")
 (setq-default explicit-shell-file-name "/usr/bin/fish")
 
@@ -175,7 +221,7 @@
   "K" 'evil-search-previous)
 
 (with-eval-after-load 'evil
- (evil-define-key '(operator visual) 'global "r" evil-inner-text-objects-map))
+  (evil-define-key '(operator visual) 'global "r" evil-inner-text-objects-map))
 (define-prefix-command 'my-colemak-fold-map)
 (evil-define-key '(normal visual) 'global "j" 'my-colemak-fold-map)
 
diff --git a/doom/.config/doom/init.el b/doom/.config/doom/init.el
index 8104119..77a4aa8 100644
--- a/doom/.config/doom/init.el
+++ b/doom/.config/doom/init.el
@@ -31,14 +31,14 @@
        :ui
        ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
-       ;;dashboard         ; a nifty splash screen for Emacs
+       dashboard         ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        ;;(emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;indent-guides     ; highlighted indent columns
        ;;ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
-       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
@@ -100,9 +100,8 @@
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        lookup              ; navigate your code and its documentation
-       ;;llm               ; when I said you needed friends, I didn't mean...
        (lsp +eglot)      ; M-x vscode
-       magit             ; a git porcelain for Emacs
+       ;;magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
@@ -191,7 +190,7 @@
 
        :app
        ;;calendar
-       ;;emms
+       emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
        ;;(rss +org)        ; emacs as an RSS reader
diff --git a/doom/.config/doom/packages.el b/doom/.config/doom/packages.el
index 823138d..6d948aa 100644
--- a/doom/.config/doom/packages.el
+++ b/doom/.config/doom/packages.el
@@ -51,9 +51,10 @@
 ;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;; (unpin! t)
-
+(package! jabber)
+(package! mood-line)
 (package! tomlparse
   :recipe (:host github :repo "johannes-mueller/tomlparse.el"))
 (package! zk4e
   :recipe (:host codeberg :repo "mcookly/zk-emacs"
-                 :files ("zk4e.el" "zk4e-citar.el")))
+           :files ("zk4e.el" "zk4e-citar.el")))