Continuing to dial it in

config.el

@@ -44,12 +44,16 @@
 
 ;; 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 "/mnt/c/Users/Levi/Nextcloud/Org/")
+(setq org-directory "/mnt/c/Users/Levi/Nextcloud/Org")
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type t)
 
+(setq projectile-project-search-path "~/Projects")
+
+(setq browse-url-chrome-program "/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe")
+(setq browse-url-chromium-program "/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe")
 
 
 ;; Here are some additional functions/macros that could help you configure Doom:
@@ -78,12 +82,45 @@
 (load! "setup-elfeed.el")
 (use-package! setup-elfeed)
 
-(map! :map global-map
-      :prefix "C-x"
-      "C-l" nil
-      (:prefix ("C-l" . "launch")
-       "a" #'org-agenda
-       "e" #'elfeed))
+(use-package! prodigy
+  :config
+  (prodigy-define-tag
+    :name 'sass
+    :ready-message "Sass is watching for changes\\. Press Ctrl\\-C to stop\\.")
+  (prodigy-define-tag
+    :name 'mc-server
+    :ready-message "minecraft is up\\-to\\-date")
+  (prodigy-define-tag
+    :name 'mc-reload
+    :ready-message "Reload complete\\.")
+  (prodigy-define-service
+    :name "Sass Compiler"
+    :command "make"
+    :args '("sass")
+    :cwd "~/Projects/chrome/chrome-ext-better-network-panel"
+    :tags '(sass))
+  (prodigy-define-service
+    :name "MC Server"
+    :command "make"
+    :args '("start")
+    :cwd "~/minecraft"
+    :tags '(mc-server))
+  (prodigy-define-service
+    :name "MC Reload"
+    :command "make"
+    :args '("rcon" "COMMAND='reload confirm'")
+    :cwd "~/minecraft"
+    :tags '(mc-reload))
+  )
+
+
+(use-package! darkroom
+  :custom
+  (darkroom-margins (cons 40 0))
+  (darkroom-text-scale-increase 0)
+  (darkroom-fringes-outside-margins nil)
+  (darkroom-margin-increment 0.2)
+  )
 
 
 
@@ -103,22 +140,21 @@
   (defvar org-html-text-markup-alist)
   (defvar org-capture-templates)
   :init
-  (setq org-agenda-files '("/mnt/c/Users/Levi/Nextcloud/Org/todo.org"
-                           "/mnt/c/Users/Levi/Nextcloud/Org/projects.org"
-                           "/mnt/c/Users/Levi/Nextcloud/Org/Recipies.org"
-                           "/mnt/c/Users/Levi/Nextcloud/Org/help.org"
-                           "/mnt/c/Users/Levi/Nextcloud/Org/personal.org"
-                           "/mnt/c/Users/Levi/Nextcloud/Org/archive.org"
-                           ))
+  (setq org-agenda-files (list (concat org-directory "/todo.org")
+                               (concat org-directory "/projects.org")
+                               (concat org-directory "/Recipies.org")
+                               (concat org-directory "/help.org")
+                               (concat org-directory "/personal.org")
+                               (concat org-directory "/archive.org")
+                               ))
   (setq org-agenda-include-diary t)
   (add-to-list 'safe-local-variable-values '(eval leo/deft-insert-boilerplate))
   (setq org-refile-targets '((nil :maxlevel . 3)
                              (org-agenda-files :maxlevel . 3))
-        org-directory "/mnt/c/Users/Levi/Nextcloud/Org"
         org-default-notes-file (concat org-directory "/todo.org"))
   :config
   (setq org-capture-templates
-        '(("t" "new task" entry (file+headline "/mnt/c/Users/Levi/Nextcloud/Org/todo.org" "Tasks")
+        '(("t" "new task" entry (file+headline (concat org-directory "/todo.org") "Tasks")
            "* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n")
           ("n" "new note" entry (file+headline org-default-notes-file "Notes")
            "* %?\n%i\n")
@@ -158,24 +194,43 @@
     (font-lock-add-keywords nil checkbox-fontlock-keywords-alist))
 
   (add-hook 'org-mode-hook 'add-checkbox-symbol-keywords)
+  (add-hook 'org-mode-hook '(lambda () (visual-line-mode 0)))
   )
 
 (use-package! org-roam
   :hook
   (org-mode . org-roam-mode)
   :config
-  (org-roam-db-build-cache)
-  (setq org-roam-directory "/mnt/c/Users/Levi/Nextcloud/Org/Roam/")
-  (setq org-roam-link-title-format "r::%s"))
+  (setq org-roam-directory (concat org-directory "/Roam/"))
+  ;; (setq org-roam-directory "/home/leothelocust/Projects/personal/html-to-org/converted/")
+  (setq org-roam-link-title-format "r::%s")
+  (org-roam-db-build-cache))
 
 (use-package! deft
   :bind
   ("C-c n d" . deft)
-  :custom
-  (deft-recursive t)
-  (deft-use-filter-string-for-filename t)
-  (deft-default-extension "org")
-  (deft-directory "/mnt/c/Users/Levi/Nextcloud/Org/Roam/"))
+  :config
+  (setq deft-recursive t
+        deft-use-filter-string-for-filename t
+        deft-default-extension "org"
+        ;; deft-directory "/home/leothelocust/Projects/personal/html-to-org/converted/"
+        deft-directory (concat org-directory "/Roam/")
+        deft-recursive-ignore-dir-regexp "\\(?:\\.\\|\\.\\.\\|setup\\)$"))
+
+(use-package! org-journal
+  :config
+  (setq org-journal-date-prefix "#+TITLE: "
+        org-journal-time-prefix "* "
+        org-journal-date-format "%a, %Y-%m-%d"
+        org-journal-file-format "%Y-%m-%d.org"
+        ))
+
+(use-package! org-pandoc-import
+  :after org
+  :commands (org-pandoc-import-html-as-org org-pandoc-import-html-to-org)
+  :config
+  (org-pandoc-import-backend html)
+  )
 
 (use-package! lsp-java
   :config
@@ -187,9 +242,28 @@
   ;; (add-hook 'java-mode-hook #'lsp-java-boot-lens-mode)
   (add-hook 'java-mode-hook #'lsp-ui-mode))
 
+(use-package! apex-mode
+  :mode "\\.cls\\'"
+  :bind ("M-q" . #'leo/kill-this-buffer-unless-scratch)
+  :config
+  (lsp-)
+  )
+
 (add-hook 'css-mode-hook #'lsp-deferred)
 (add-hook 'js-mode-hook #'lsp-deferred)
 
+
+(map! :map global-map
+      :prefix "C-x"
+      "C-l" nil
+      (:prefix ("C-l" . "launch")
+       "a" #'org-agenda
+       "e" #'elfeed
+       "g" #'magit-status)
+
+      )
+
+
 (map! :map global-map
       "M-t"     #'treemacs-select-window
       "M-q"     #'leo/kill-this-buffer-unless-scratch
@@ -205,7 +279,7 @@
       "M-c"     #'capitalize-dwim
       "M-l"     #'downcase-dwim
 
-      "C-c b"   #'ivy-switch-buffer
+      "C-c b"   #'counsel-switch-buffer
       "C-s"     #'swiper
 
       "C-}"     #'mc/mark-next-like-this
@@ -214,4 +288,6 @@
       "C-("     #'mc/unmark-previous-like-this
       "C-@"     #'er/expand-region
       "C-#"     #'er/contract-region
+
+      "C-c C-r" #'counsel-recoll
       )

custom.el

@@ -3,12 +3,11 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages (quote (org-bullets)))
+ '(package-selected-packages '(salesforce-utils org-bullets))
  '(safe-local-variable-values
-   (quote
-    ((eval leo/deft-insert-boilerplate)
+   '((eval leo/deft-insert-boilerplate)
      (visual-line-mode . 1)
-     (whitespace-line-column . 120)))))
+     (whitespace-line-column . 120))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

functions.el

@@ -97,7 +97,7 @@
       (kill-region (point-min) (point-max))
       (goto-char (point-min))
       (insert (format "#+TITLE:      %s\n" title))
-      (insert "#+SETUPFILE:  setup.org\n")
+      (insert "#+SETUPFILE:  setup/setup.org\n")
       (insert "\n")
       (insert "* Metadata:\n")
       (insert "** Tags: ")
@@ -111,7 +111,7 @@
       (search-forward "STARTUP")
       (beginning-of-line)
       (kill-line)
-      (insert "#+SETUPFILE:  setup.org")
+      (insert "#+SETUPFILE:  setup/setup.org")
       (message "Updated Global Properties"))
     ))
 

init.el

@@ -73,9 +73,9 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; the elisp shell that works everywhere
+       eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
-       term              ; basic terminal emulator for Emacs
+       ;;term              ; basic terminal emulator for Emacs
        ;;vterm             ; the best terminal emulation in Emacs
 
        :checkers
@@ -98,7 +98,7 @@
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
-       ;;prodigy           ; FIXME managing external services & code builders
+       prodigy           ; FIXME managing external services & code builders
        ;;rgb               ; creating color strings
        taskrunner        ; taskrunner for all your projects
        ;;terraform         ; infrastructure as code
@@ -146,7 +146,11 @@
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +dragndrop +pretty +roam)               ; organize your plain life in plain text
+       (org
+        +dragndrop
+        +pretty
+        +roam
+        +journal)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
@@ -174,7 +178,7 @@
        ;;(wanderlust +gmail)
 
        :app
-       ;;calendar
+       calendar
        ;;irc               ; how neckbeards socialize
        ;;(rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought

packages.el

@@ -57,3 +57,15 @@
 ;; ENABLE
 (package! lsp-treemacs)
 (package! elfeed)
+(package! darkroom)
+
+;; $DOOMDIR/packages.el
+(package! org-pandoc-import
+  :recipe (:host github
+           :repo "tecosaur/org-pandoc-import"
+           :files ("*.el" "filters" "preprocessors")))
+
+(package! apex-mode
+  :recipe (:host github
+           :repo "orangatame/apex-mode"
+           :files ("*.el")))