Merge branch 'trunk' of git.stranger.systems:thatonelutenist/doom.d into trunk

config.org

@@ -34,13 +34,13 @@ The provided default ~config.el~
 
 ;; Figure out what the name and size of the font are going to be based on the system type and
 ;; hostname
-(let ((nm/font-name (cond ((eq system-type 'darwin) "Iosevka Nerd Font")
+(let ((nm/font-name (cond ((or IS-MAC IS-WINDOWS) "Iosevka Nerd Font")
                           (t "Iosevka")))
-      (nm/font-size (cond ((eq system-type 'darwin) 11)
+      (nm/font-size (cond (IS-MAC 11)
-                          ((string= (system-name) "wsl") 16)
+                          ((or IS-WINDOWS (string= (system-name)) "wsl") 16)
                           (t 13)))
-      (nm/variable-font-size (cond ((eq system-type 'darwin) 13)
+      (nm/variable-font-size (cond (IS-MAC 13)
-                                   ((string= (system-name) "wsl") 19)
+                                   ((or IS-WINDOWS (string= (system-name)) "wsl") 19)
                                    (t 15))))
   (setq doom-font (font-spec :family nm/font-name :size nm/font-size :weight 'semi-light)
           doom-unicode-font (font-spec :family nm/font-name :size nm/font-size :weight 'semi-light)
@@ -49,7 +49,7 @@ The provided default ~config.el~
 ;;
 ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
-;; refresh your font settings. )If Emacs still can't find your font, it likely
+;; refresh your font settings. If Emacs still can't find your font, it likely
 ;; wasn't installed correctly. Font issues are rarely Doom issues!
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
@@ -773,10 +773,8 @@ in
 **** [[https://github.com/suonlight/multi-vterm][multi-vterm]]
 Add ergonomic support for multiple vterm terminals
 #+begin_src emacs-lisp
-(use-package! multi-vterm
+(when (not IS-WINDOWS)
-  ;; :bind (("C-c o M" . multi-vterm)
+ (use-package! multi-vterm))
-  ;;        ("C-c o m" . multi-vterm-project))
-  )
 #+end_src
 * Programming
 ** General Editing
@@ -960,6 +958,11 @@ Use ~elfeed~ for RSS. Doom provides most of the configuration, but we'll make a
   (make-directory elfeed-db-directory t))
 #+end_src
 ** Email
+Do a lil sneaky to make this linux only
+#+begin_src emacs-lisp
+(when IS-LINUX
+#+end_src
+
 Use ~mu4e~ for email. Most of the bootstrap is provided by doom emacs.
 First, tell mu4e to use msmtp
 #+begin_src emacs-lisp
@@ -1047,6 +1050,10 @@ Now setup notifications
   (add-hook 'after-init-hook #'mu4e-alert-enable-mode-line-display))
 #+end_src
 
+#+begin_src emacs-lisp
+)
+#+end_src
+
 ** [[https://github.com/stsquad/emacs_chrome][Edit with Emacs]]
 #+begin_src emacs-lisp
 (use-package! edit-server

init.el

@@ -53,7 +53,7 @@
        vc                               ; version-control and Emacs, sitting in a tree
 
        :term
-       vterm                            ; the best terminal emulation in Emacs
+       (:if (not IS-WINDOWS) vterm)
 
        :checkers
        (syntax +childframe)             ; tasing you for every semicolon you forget
@@ -103,7 +103,7 @@
        plantuml
 
        :email
-       (mu4e +org)
+       (:if IS-LINUX (mu4e +org))
 
        :app
        (rss +org)                       ; emacs as an RSS reader

packages.el

@@ -58,7 +58,6 @@
 (package! smart-hungry-delete)
 (package! solarized-theme)
 (package! deadgrep)
-(package! multi-vterm)
 (package! grip-mode)
 (package! org-protocol-capture-html)
 (package! org-superstar)
@@ -77,4 +76,9 @@
 (package! keychain-environment)
 (package! hotfuzz)
 (package! alert)
-(package! mu4e-alert)
+
+(when IS-LINUX 
+ (package! mu4e-alert))
+
+(when (not IS-WINDOWS)
+  (package! multi-vterm))