diff --git a/bindings.el b/bindings.el index a2c8ef2..7ce8529 100644 --- a/bindings.el +++ b/bindings.el @@ -203,13 +203,14 @@ ;;; t --- toggle (:prefix-map ("t" . "toggle") + :desc "Artist mode" "a" #'artist-mode + :desc "Follow mode" "x" #'follow-mode :desc "Big mode" "b" #'doom-big-font-mode :desc "Fill Column Indicator" "c" #'global-display-fill-column-indicator-mode :desc "Flymake" "f" #'flymake-mode (:when (modulep! :checkers syntax) :desc "Flycheck" "f" #'flycheck-mode) :desc "Frame fullscreen" "F" #'toggle-frame-fullscreen - ;; :desc "Evil goggles" "g" #'evil-goggles-mode (:when (modulep! :ui indent-guides) :desc "Indent guides" "i" #'highlight-indent-guides-mode) :desc "Indent style" "I" #'doom/toggle-indent-style @@ -445,27 +446,46 @@ "c" #'platformio-clean "m" #'platformio-device-monitor) -(map! - :map sclang-mode-map - :localleader - "b" 'sclang-server-boot - "." 'sclang-server-free-all - "k" 'sclang-kill - "r" 'sclang-server-reboot - "e" 'sclang-eval-region-or-line - "h" 'sclang-find-help - "H" 'sclang-open-help-gui - "s" 'sclang-start) +(defun sclang-show-scope () + (interactive) + (sclang-eval-expression "s.scope")) + +(defun sclang-show-levels () + (interactive) + (sclang-eval-expression "s.levels")) + +(defun sclang-show-gui () + (interactive) + (sclang-eval-expression "s.makeGui")) (map! :map sclang-mode-map "M-C-x" 'sclang-eval-region-or-line - "M-C-z" 'sclang-server-free-all) + "M-C-z" 'sclang-server-free-all + :localleader + "b" #'sclang-server-boot + "." #'sclang-main-stop + "l" #'sclang-show-levels + "R" #'sclang-recompile + "s" #'sclang-show-scope + "g" #'sclang-show-gui + "k" #'sclang-kill + "r" #'sclang-server-reboot + "e" #'sclang-eval-region-or-line + "h" #'sclang-find-help + "H" #'sclang-open-help-gui + "s" #'sclang-start) (map! :map web-mode-map "s-<" #'web-mode-element-wrap) +(map! + :map chezmoi-mode-map + :localleader + "f" #'chezmoi-find + "w" #'chezmoi-write) + (setq ns-alternate-modifier 'meta) (setq ns-right-alternate-modifier 'none) diff --git a/config.el b/config.el index 192e9f8..3ddb10d 100644 --- a/config.el +++ b/config.el @@ -205,7 +205,8 @@ (add-to-list 'auto-mode-alist '("\\.ino\\'" . arduino-mode)) (add-to-list 'auto-mode-alist '("\\.ino\\'" . platformio-mode)) -;; (defvar company-backends '()) +(after! gcode-mode + (add-hook! 'gcode-mode-hook 'eldoc-mode)) (load! "obsidian-config.el") diff --git a/init.el b/init.el index ebc6ca3..ab89181 100644 --- a/init.el +++ b/init.el @@ -87,6 +87,7 @@ ;;grammar ; tasing grammar mistake every you make :tools + chezmoi ;;ansible biblio ; Writes a PhD for you (citation needed) ;;debugger ; FIXME stepping through code, to help you add bugs diff --git a/modules/editor/meow/config.el b/modules/editor/meow/config.el index 4637279..09064c7 100644 --- a/modules/editor/meow/config.el +++ b/modules/editor/meow/config.el @@ -80,6 +80,7 @@ "\\" #'bookmark-jump "'" #'repeat "=" #'meow--eval-sexp + ":" #'meow--eval-sexp "[" #'sp-backward-sexp "]" #'sp-forward-sexp "{" #'sp-backward-up-sexp @@ -88,9 +89,9 @@ (defun meow--eval-sexp () (interactive) - (if (derived-mode-p 'lisp-mode) - (sly-eval-defun) - (eros-eval-defun nil))) + (cond ((derived-mode-p 'lisp-mode) (sly-eval-defun)) + ((derived-mode-p 'sclang-mode) (sclang-eval-region-or-line)) + (t (eros-eval-defun nil)))) (defun meow--post-isearch-function () (unless isearch-mode-end-hook-quit diff --git a/packages.el b/packages.el index 5ad918c..dbcb04d 100644 --- a/packages.el +++ b/packages.el @@ -7,7 +7,7 @@ ;; (unpin! compat) (unpin! doom-themes) -;; (unpin! lsp-mode) +(unpin! lsp-mode) (unpin! sly) (unpin! racket-mode) (unpin! consult) @@ -37,11 +37,10 @@ :recipe (:type git :host github :repo "serialdev/ijanet-mode")) - (package! platformio-mode) (package! scad-mode) - (package! consult-yasnippet) +(package! gcode-mode) ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: ;(package! some-package)