4 files changed, 57 insertions, 26 deletions

diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index d3d6223..f51c6b4 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -1,9 +1,3 @@
-auto-save-list/
-eln-cache/
-elpa/
-eshell/
-transient/
-ido.last
-projectile-bookmarks.eld
-projects
-session.*
\ No newline at end of file
+*
+!init.el
+!jd/
\ No newline at end of file
diff --git a/.emacs.d/jd/jd-apps.el b/.emacs.d/jd/jd-apps.el
index 5064ff9..2163435 100755
--- a/.emacs.d/jd/jd-apps.el
+++ b/.emacs.d/jd/jd-apps.el
@@ -46,15 +46,15 @@
                 ;; (evil-define-key 'normal dired-mode-map (kbd "q") 'kill-current-buffer)
                 )
 
-;; (jd/use-package emms "emacs-emms"
-;;   :config
-;;   (require 'emms-setup)
-;;   (emms-all)
-;;   (emms-standard)
-;;   (emms-default-players)
-;;   (emms-mode-line-disable)
-;;   (setq emms-browser-covers 'emms-browser-cache-thumbnail-async)
-;;   (emms-add-directory-tree "~/Documents/Music/"))
+(jd/use-package emms "emacs-emms"
+  :config
+  (require 'emms-setup)
+  (emms-all)
+  (emms-standard)
+  (emms-default-players)
+  (emms-mode-line-disable)
+  (setq emms-browser-covers 'emms-browser-cache-thumbnail-async)
+  (emms-add-directory-tree "~/Documents/Music/"))
 
 (jd/use-package pdf-tools "emacs-pdf-tools")
 
@@ -82,6 +82,22 @@
                 (setq mastodon-active-user "jdlugosz963"
                       mastodon-instance-url "https://fosstodon.org/"))
 
+(jd/use-package password-store "emacs-password-store"
+                :bind
+                ("C-c P p" . password-store-copy)
+                ("C-c P i" . password-store-insert)
+                ("C-c P g" . password-store-generate))
+
+(jd/use-package bluetooth "emacs-bluetooth"
+                :bind
+                ("C-c B" . bluetooth-list-devices))
+
+(jd/use-package shell nil
+                :bind
+                ("C-c C-<return>" . shell))
+
+(jd/use-package nov-el "emacs-nov-el")
+
 (provide 'jd-apps)
 
 ;;; jd-apps.el ends here
diff --git a/.emacs.d/jd/jd-dev.el b/.emacs.d/jd/jd-dev.el
index bd8d4ee..1e602d6 100755
--- a/.emacs.d/jd/jd-dev.el
+++ b/.emacs.d/jd/jd-dev.el
@@ -68,7 +68,7 @@
                 :hook ((after-init . global-flycheck-mode)))
 
 (jd/use-package web-mode "emacs-web-mode"
-                :hook ((web-mode . jd/activate-tide-mode))
+                ;; :hook ((web-mode . jd/activate-tide-mode))
                 :mode
                 ("\\.ejs\\'" "\\.hbs\\'" "\\.html\\'" "\\.php\\'" "\\.[jt]sx?\\'")
                 :config
@@ -109,9 +109,9 @@
                 :config
                 (global-company-mode))
 
-(jd/use-package company-box "emacs-company-box"
-                :diminish t
-                :hook (company-mode . company-box-mode))
+;; (jd/use-package company-box "emacs-company-box"
+;;              :diminish t
+;;              :hook (company-mode . company-box-mode))
 
 (jd/use-package projectile "emacs-projectile"
                 :diminish projectile-mode
diff --git a/.emacs.d/jd/jd-org.el b/.emacs.d/jd/jd-org.el
index fe273c3..f511846 100755
--- a/.emacs.d/jd/jd-org.el
+++ b/.emacs.d/jd/jd-org.el
@@ -168,22 +168,43 @@
                 (setq org-roam-capture-templates
                       '(("a" "workstuff" plain (file (concat org-roam-directory "/work"))
                          :target (file+head "work/%<%Y%m%d%H%M%S>-${slug}.org"
-                                            "#+title: ${title}\n") :unnarrowed t)
+                                            "#+title: ${title}\n")
+                         :unnarrowed t)
                         ("b" "research" plain (file "~/Documents/roam/study/templates/research.org")
                          :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org"
-                                            "#+title: ${title}\n") :unnarrowed t)
-                        ("s" "School" plain nil
+                                            "#+title: ${title}\n")
+                         :unnarrowed t)
+                        ("s" "School")
+                        ("ss" "School General" plain nil
                          :target (file+head
                                   "school/%<%Y%m%d%H%M%S>-${slug}.org"
                                   "#+title: ${title}\n")
                          :unnarrowed t)
+                        ("sp" "Polish Lesson" plain nil
+                         :target (file+head
+                                  "school/polish/%<%Y%m%d%H%M%S>-${slug}.org"
+                                  "#+title: ${title}\n")
+                         :unnarrowed t)
+                        ("sw" "Wos Lesson" plain nil
+                         :target (file+head
+                                  "school/wos/%<%Y%m%d%H%M%S>-${slug}.org"
+                                  "#+title: ${title}\n")
+                         :unnarrowed t)
+                        ("g" "Guitar" plain nil
+                         :target (file+head
+                                  "guitar/%<%Y%m%d%H%M%S>-${slug}.org"
+                                  "#+title: ${title}\n")
+                         :unnarrowed t)
                         ("d" "default" plain nil
                          :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org"
-                                            "#+title: ${title}\n") :unnarrowed t)
+                                            "#+title: ${title}\n")
+                         :unnarrowed t)
                         ))
 
                 (org-roam-db-autosync-mode))
 
+(jd/use-package ox-pandoc "emacs-ox-pandoc")
+
 (provide 'jd-org)
 
 ;;; jd-org.el ends here