Some improvements for WSL; other settings dialed in

config.el

@@ -27,14 +27,6 @@
       doom-unicode-font (font-spec :family "PragmataPro Liga" :size 12)
       doom-big-font (font-spec :family "PragmataPro Liga" :size 30))
 
-(if (eq system-type 'gnu/linux)
-    (progn
-      (add-to-list 'default-frame-alist '(top . 400))
-      (add-to-list 'default-frame-alist '(left . 750))
-      (add-to-list 'default-frame-alist '(height . 60))
-      (add-to-list 'default-frame-alist '(width . 235))
-      ))
-
 ;; 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:
@@ -44,7 +36,7 @@
 
 ;; 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 "~/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'.
@@ -52,8 +44,17 @@
 
 (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")
+(when (eq system-type 'gnu/linux)
+  (when (s-contains? "microsoft" operating-system-release t)
+    (progn
+      (setq org-directory "/mnt/c/Users/Levi/Nextcloud/Org")
+      (add-to-list 'default-frame-alist '(top . 400))
+      (add-to-list 'default-frame-alist '(left . 750))
+      (add-to-list 'default-frame-alist '(height . 60))
+      (add-to-list 'default-frame-alist '(width . 235))
+      (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:
@@ -82,38 +83,6 @@
 (load! "setup-elfeed.el")
 (use-package! setup-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))
@@ -122,8 +91,6 @@
   (darkroom-margin-increment 0.2)
   )
 
-
-
 (use-package! org
   :commands org-capture
   :mode ("\\.org\\'" . org-mode)
@@ -198,26 +165,27 @@
   )
 
 (use-package! org-roam
+  :after org
   :hook
   (org-mode . org-roam-mode)
   :config
   (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
+  :after org
   :bind
   ("C-c n d" . deft)
   :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
+  :after org
   :config
   (setq org-journal-date-prefix "#+TITLE: "
         org-journal-time-prefix "* "
@@ -245,24 +213,55 @@
 (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)
 
+(use-package! web-mode
+  :mode "\\.\\(app\\|page\\)\\'")
+
+(use-package! so-long
+  :config
+  (setq so-long-action 'so-long-minor-mode))
+
+(use-package! emacs-sfdx
+  :load-path "/home/leothelocust/Projects/emacs/emacs-sfdx" ;; use this load-path when testing locally
+  :commands (sfdx/transient-action sfdx/next-component-file)
+  :bind ("C-<iso-lefttab>" . #'sfdx/next-component-file))
+
+(use-package! vlocitemacs
+  :commands (vlo/transient-action))
 
 (map! :map global-map
       :prefix "C-x"
       "C-l" nil
-      (:prefix ("C-l" . "launch")
+      (:prefix ("C-l" . "launch app")
        "a" #'org-agenda
        "e" #'elfeed
-       "g" #'magit-status)
-
-      )
-
+       "g" #'magit-status
+       "s" #'sfdx/transient-action
+       "v" #'vlo/transient-action
+       ))
+(map! :map global-map
+      :prefix "C-c"
+      "a" nil
+      (:prefix ("a" . "launch app")
+       "a" #'org-agenda
+       "e" #'elfeed
+       "g" #'magit-status
+       "s" #'sfdx/transient-action
+       "v" #'vlo/transient-action
+       ))
+
+(map! :map comint-mode-map
+      "q" '(lambda()
+             (interactive)
+             (if (s-contains? "sfdx" (buffer-name))
+                 (progn
+                   (leo/kill-this-buffer-unless-scratch)
+                   (+workspace/close-window-or-workspace)
+                   ))))
 
 (map! :map global-map
       "M-t"     #'treemacs-select-window

packages.el

@@ -52,6 +52,7 @@
 
 ;; DISABLE
 (package! evil :disable t)
+(package! so-long :disable t)
 
 
 ;; ENABLE
@@ -69,3 +70,13 @@
   :recipe (:host github
            :repo "orangatame/apex-mode"
            :files ("*.el")))
+
+;; (package! emacs-sfdx
+;;   :recipe (:host github
+;;            :repo "leothelocust/emacs-sfdx"
+;;            :files ("*.el")))
+
+(package! vlocitemacs
+  :recipe (:host github
+           :repo "leothelocust/vlocitemacs"
+           :files ("*.el")))