From d3f7290c99db8a77cb73e3acd66e7cdd2f5c7fc1 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Wed, 5 Jan 2022 18:38:17 +0100
Subject: [PATCH] config/doom: config magit & md export

---
 .config/doom/config.el   | 22 +++++++++++++++++++---
 .config/doom/packages.el |  4 +---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.config/doom/config.el b/.config/doom/config.el
index 76776b8..674271d 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -97,7 +97,13 @@ Version 2019-11-04 2021-02-16"
       "Se"      '+snippets/edit
       "Sm"      'smerge-mode
       :map text-mode-map
-      :desc "Markdown to Zulip" "mam" ":%s/^## \\(.*\\)/**\\1**/
:%s/^##+ \\(.*\\)/*\\1*/
:%s/<\\([^ ]+\\)>/\\1/"
+      :desc "Markdown to Zulip" "mam" "ggd2/# 
+:%s/\\n\\n<a id=.*<\\/a>\\n\\n//
+:%s/\\n *\\n /\\n /
+:%s/^## \\(.*\\)/**\\1**/
+:%s/^##+ \\(.*\\)/*\\1*/
+:%s/<\\(http[^ ]+\\)>/\\1/
+:%s/    /  /g
"
       :map smerge-mode-map
       :leader
       "Ss"      'smerge-next
@@ -236,7 +242,6 @@ Version 2019-11-04 2021-02-16"
         )
 
   ;; Behavior
-  ; (set-file-template! 'org-mode :ignore t)
   (setq org-read-date-prefer-future nil)
   (setq org-attach-id-dir (expand-file-name "3-resources/attach" user-data-dir)
         org-attach-method 'mv
@@ -680,6 +685,17 @@ Version 2019-11-04 2021-02-16"
         :desc "Yadm status" "gT" (lambda () (interactive) (magit-status "/yadm::")))
   )
 
+(use-package! magit
+  :defer t
+  :init
+    (setq magit-clone-set-remote.pushDefault 't
+          magit-clone-default-directory (expand-file-name "4-incubator/dev" user-data-dir))
+    (setq magit-clone-name-alist
+      '(("\\`\\(?:github:\\|gh:\\)?\\([^:]+\\)\\'" "github.com" "user.name")
+        ("\\`\\(?:gitlab:\\|gl:\\)\\([^:]+\\)\\'" "gitlab.com" "user.name")
+        ("\\`\\(?:gitea:\\|x:\\)\\([^:]+\\)\\'" "git.jfischer.org" "user.name")))
+  )
+
 (use-package! direnv ; nix-shell stuffs
   :defer t
   :config
@@ -702,7 +718,7 @@ Version 2019-11-04 2021-02-16"
     ;; Socket is not supported
     (setq emms-player-mpd-server-name "localhost")
     (setq emms-player-mpd-server-port "6600")
-    (setq emms-player-mpd-music-directory "/data/music")
+    (setq emms-player-mpd-music-directory (expand-file-name "music" user-data-dir))
   )
 
 ;(with-eval-after-load "ispell"
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index e827178..36c3892 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -51,11 +51,9 @@
 
 (package! emms)
 
-(unpin! org-journal)
+(unpin! evil-collection)
 (package! ox-context
   :recipe (:host github :repo "Jason-S-Ross/ox-context"))
-
-(unpin! org-roam)
 (package! websocket)
 (package! org-roam-ui :recipe (:host github :repo "org-roam/org-roam-ui" :files ("*.el" "out")))