updated config

bindings.el

@@ -160,6 +160,7 @@
        :desc "Test project"                 "T" #'projectile-test-project
        :desc "Pop up scratch buffer"        "x" #'doom/open-project-scratch-buffer
        :desc "Switch to scratch buffer"     "X" #'doom/switch-to-project-scratch-buffer
+       :desc "Justfile Commands"     "j" #'justl
        (:when (and (modulep! :tools taskrunner)
                    (or (modulep! :completion ivy)
                        (modulep! :completion helm)))
@@ -365,7 +366,10 @@
                    :desc "Find type definition"                  "t"   #'+lookup/type-definition
                    :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
                    :desc "Delete trailing newlines"              "W"   #'doom/delete-trailing-newlines
-                   :desc "List errors"                           "x"   #'+default/diagnostics)
+                   :desc "List errors"                           "x"   #'+default/diagnostics
+                   :desc "Spaces -> Tabs"  "<tab>"   #'tabify
+                   :desc "Tabs -> Spaces" "<S-tab>"  #'untabify)
+
 
 ;;; <leader> q --- quit/restart
       (:prefix-map ("q" . "quit/session")
@@ -380,8 +384,8 @@
        :desc "Save session to file"         "S" #'doom/save-session
        :desc "Restore session from file"    "L" #'doom/load-session
        :desc "Restart & restore Emacs"      "r" #'doom/restart-and-restore
-       :desc "Restart Emacs"                "R" #'doom/restart)
+       :desc "Restart Emacs"                "R" #'doom/restart))
-      )
+
 
 ;; some helpful general keys
 (map! "s-c" #'kill-ring-save
@@ -408,20 +412,10 @@
       "M-<left>" nil
       "M-<right>" nil)
 
-;; Smartparens bindings set to be called with localleader + l as prefix
 (map!
- :map lisp-mode-map
  :localleader
- :prefix ("l" . "Lisps")
+ :map lisp-mode-map
- "f" #'sp-forward-sexp
+ :desc "Load cl-patterns helpers" "p" #'cl-patterns-helpers-load)
- "b" #'sp-backward-sexp
- "u" #'sp-unwrap-sexp
- "k" #'sp-kill-sexp
- "s" #'sp-forward-slurp-sexp
- "r" #'sp-forward-barf-sexp
- "(" #'sp-wrap-round
- "[" #'sp-wrap-square
- "{" #'sp-wrap-curly)
 
 (map!
  :map smartparens-mode-map

config.el

@@ -25,7 +25,7 @@
 (set-keyboard-coding-system 'utf-8)
 (prefer-coding-system 'utf-8)
 
-(setq org-directory "~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Primary/org/")
+(setq org-directory "~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Primary")
 
 ;; Modeline
 ;; - add current workspace name
@@ -62,6 +62,11 @@
 (+global-word-wrap-mode +1) 		; default to soft word wrap
 (delete-selection-mode 1) 		; delete stuff!
 (setq delete-active-region t) 		; delete selected stuff!
+(setq shell-file-name (executable-find "bash"))
+
+(setq-default vterm-shell (executable-find "fish"))
+
+(setq-default explicit-shell-file-name (executable-find "fish"))
 
 ;; remove org agenda from the splash screen
 (assoc-delete-all "Open org-agenda" +doom-dashboard-menu-sections)
@@ -82,7 +87,7 @@
         window-resize-pixelwise t)))
 
 ;; tabs! i like them
-(setq-default indent-tabs-mode t)
+;; (setq-default indent-tabs-mode t)
 (setq-default tab-width 2)
 
 ;; import all my customized keybindings based on doom evil mode, but without evil.
@@ -102,6 +107,9 @@
 (after! smart-tabs-mode
   (smart-tabs-insinuate 'c 'javascript 'python))
 
+(after! meow
+  (meow-vterm-enable))
+
 ;; Add consult-line searches to isearch history (both regular and regex) -- can now use meow 'n' to continue search as well as isearch
 (advice-add #'consult-line :after
             (lambda (&rest _)
@@ -147,7 +155,7 @@
 	"s-M-<left>" 'centaur-tabs-backward))
 
 ;; use kitty for terminal-here
-(setq terminal-here-mac-terminal-command '("kitty" "@" "launch" "--type" "tab"))
+(setq terminal-here-mac-terminal-command '("kitty" "@" "launch" "--type=tab"))
 
 ;; set project paths and ignore buffers
 (setq projectile-project-search-path '(("~/Source" . 2)))
@@ -171,7 +179,7 @@
 ;; better completions for sly
 (after! sly
   (setq sly-lisp-implementations
-      '((sbcl ("sbcl" "--dynamic-space-size" "10000"))
+      '((sbcl ("sbcl" "--dynamic-space-size" "12000"))
 	(ciel ("sbcl" "--core" "/Users/emenel/quicklisp/local-projects/CIEL/ciel-core" "--eval" "(in-package :ciel-user)" "--dynamic-space-size" "2600"))))
   (setq sly-default-lisp 'sbcl)
   (setq sly-complete-symbol-function 'sly-flex-completions))
@@ -199,7 +207,7 @@
 (setq exec-path (append exec-path '("/Applications/SuperCollider.app/Contents/MacOS/")))
 
 ;; tidal cycles!
-(setq tidal-boot-script-path "~/.cabal/share/aarch64-osx-ghc-9.4.2/tidal-1.9.3/BootTidal.hs")
+;; (setq tidal-boot-script-path "~/.cabal/share/aarch64-osx-ghc-9.4.2/tidal-1.9.3/BootTidal.hs")
 
 ;; add platformio to ino files
 (add-to-list 'auto-mode-alist '("\\.ino\\'" . arduino-mode))
@@ -215,4 +223,27 @@
 (custom-set-faces!
   '(line-number :foreground "#424242"))
 
+;; mu4e
+(set-email-account! "matt@emenel.ca"
+  '((mu4e-sent-folder       . "/matt@emenel.ca/Sent")
+    (mu4e-drafts-folder     . "/matt@emenel.ca/Drafts")
+    (mu4e-trash-folder      . "/matt@emenel.ca/Trash")
+    (mu4e-refile-folder     . "/matt@emenel.ca/Archive")
+    (mu4e-spam-folder       . "/matt@emenel.ca/Spam")
+    (smtpmail-smtp-user     . "matt@emenel.ca")
+    (user-mail-address      . "matt@emenel.ca")    ;; only needed for mu < 1.4
+    (mu4e-compose-signature . "---"))
+  t)
+
+;; (after! mu4e
+;;   (add-to-list 'mu4e-bookmarks
+;;   '( :name  "Inbox"
+;;      :query "maildir:/INBOX"
+;;      :key   ?i)
+;;   '( :name  "Inbox Unread"
+;;      :query "maildir:/INBOX and flag:unread"
+;;      :key   ?o)))
+
+(use-package! kbd-mode)
+
 (server-start)

init.el

@@ -88,28 +88,28 @@
 
        :tools
        chezmoi
-       ;;ansible
+       ansible
        biblio            ; Writes a PhD for you (citation needed)
-       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       debugger          ; FIXME stepping through code, to help you add bugs
        direnv
-       ;;docker
+       docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
+       ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
        lsp               ; M-x vscode
        magit             ; a git porcelain for Emacs
-       ;;make              ; run make tasks from Emacs
+       make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        rgb               ; creating color strings
        ;;taskrunner        ; taskrunner for all your projects
-       ;;terraform         ; infrastructure as code
+       terraform         ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
        tree-sitter       ; syntax and parsing, sitting in a tree...
-       ;;upload            ; map local to remote projects via ssh/ftp
+       upload            ; map local to remote projects via ssh/ftp
 
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS
@@ -180,7 +180,7 @@
        (zig +lsp)               ; C, but simpler
 
        :email
-       ;; (mu4e +org +gmail)
+       (mu4e +org)
        ;; notmuch
        ;;(wanderlust +gmail)
 

obsidian-config.el

@@ -3,7 +3,7 @@
 ;; configure obsidian integration for note taking fun times
 (use-package! obsidian
   :config
-  (obsidian-specify-path "~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Primary")
+  (obsidian-specify-path "~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Primary/")
   (setq obsidian-inbox-directory "_Inbox")
   (global-obsidian-mode t)
   (map! :map obsidian-mode-map

packages.el

@@ -16,8 +16,22 @@
 (unpin! orderless)
 (unpin! cape)
 (unpin! corfu)
+(unpin! yasnippet-capf)
 ;; (unpin! geiser)
 
+(package! meow-vterm
+  :recipe (:type git
+           :host github
+           :repo "accelbread/meow-vterm"))
+
+(package! kbd-mode
+  :recipe (:type git
+           :host github
+           :repo "kmonad/kbd-mode"))
+
+(package! just-mode)
+(package! justl)
+
 (package! nerd-icons-completion)
 (package! nerd-icons-dired)
 (package! treemacs-nerd-icons)
@@ -41,6 +55,8 @@
 (package! scad-mode)
 (package! consult-yasnippet)
 (package! gcode-mode)
+(package! sly-asdf)
+(package! sly-quicklisp)
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 ;(package! some-package)