diff --git a/bindings.el b/bindings.el index cef5e01..b4526a4 100644 --- a/bindings.el +++ b/bindings.el @@ -452,3 +452,9 @@ ;; dired (map! :map dired-mode-map "\\" #'dired-up-directory) + + +;; open-scad +(map! :map scad-mode-map + :localleader + :desc "Open Preview" "o" 'scad-open) diff --git a/config.el b/config.el index 28865bf..bd9b106 100644 --- a/config.el +++ b/config.el @@ -30,6 +30,9 @@ (setq scroll-preserve-screen-position t) (setq global-hl-line-modes nil) +;; don't automatically create a new workspace when opening a new project +(setq +workspaces-on-switch-project-behavior nil) + (if (daemonp) (add-hook! after-make-frame-functions (lambda (frame) @@ -61,11 +64,6 @@ ;; Version control optimization (setq vc-handled-backends '(Git)) - -(use-package! direnv - :config - (direnv-mode)) - ;; Modeline ;; - add current workspace name ; - add major mode icon @@ -113,10 +111,6 @@ (setq dap-ui-variable-length 200) -;; smart tabs set modes -(after! smart-tabs-mode - (smart-tabs-insinuate 'c 'javascript 'python)) - ;; 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 _) @@ -136,13 +130,15 @@ (setq! citar-notes-paths '("~/Documents/Obsidian/Primary/Sources")) (setq! citar-file-note-extensions '("md"))) -(add-to-list 'auto-mode-alist '("\\.svelte\\'" . svelte-mode)) -(add-to-list 'auto-mode-alist '("\\.vs\\'" . glsl-mode)) -(add-to-list 'auto-mode-alist '("\\.fs\\'" . glsl-mode)) +(after! svelte-mode + (setq svelte-display-submode-name t) + (setq web-mode-enable-css-colorization nil) + (setq css-fontify-colors nil)) ;; web-mode settings -(add-hook! web-mode (web-mode-toggle-current-element-highlight)) +;; (add-hook! web-mode (web-mode-toggle-current-element-highlight)) (after! web-mode + (setq web-mode-enable-css-colorization nil) (setq web-mode-markup-indent-offset 2) (setq web-mode-css-indent-offset 2) (setq web-mode-code-indent-offset 2)) @@ -225,8 +221,8 @@ ;; sly (after! sly (setq sly-lisp-implementations - '((sbcl ("vend" "repl" "sbcl" "--dynamic-space-size" "4Gb") :coding-system utf-8-unix) - (ecl ("vend" "repl" "ecl" "--dynamic-space-size" "4Gb") :coding-system utf-8-unix))) + '((sbcl ("sbcl" "--dynamic-space-size" "4Gb") :coding-system utf-8-unix) + (ecl ("ecl" "--dynamic-space-size" "4Gb") :coding-system utf-8-unix))) (setq sly-default-lisp 'sbcl) (setq sly-complete-symbol-function 'sly-flex-completions)) @@ -280,7 +276,6 @@ (setq-default eglot-workspace-configuration '(:nixd (:formatting (:command ["alejandra"])))) - ;; load additional config files (load! "obsidian-config.el") (load! "mu4e-config.el") @@ -327,6 +322,10 @@ (end (region-end))) (font-lock-flush beg end)))) +(use-package! magit-todos + :after magit + :config (magit-todos-mode 1)) + (defun +workspaces-associate-frame-fn (frame &optional _new-frame-p) "Create a blank, new perspective and associate it with FRAME." (when persp-mode @@ -340,3 +339,7 @@ ;; ensure every buffer has a buffer-predicate (persp-set-frame-buffer-predicate frame)) (run-at-time 0.1 nil #'+workspace/display))) + +(add-to-list 'auto-mode-alist '("\\.svelte\\'" . svelte-mode)) +(add-to-list 'auto-mode-alist '("\\.vs\\'" . glsl-mode)) +(add-to-list 'auto-mode-alist '("\\.fs\\'" . glsl-mode)) diff --git a/packages.el b/packages.el index 83ec7b8..094508b 100644 --- a/packages.el +++ b/packages.el @@ -5,11 +5,8 @@ ;; on the command line, then restart Emacs for the changes to take effect -- or ;; use 'M-x doom/reload'. -;; (unpin! compat) (unpin! doom-themes) -;;(unpin! lsp-mode) (unpin! sly) -;; (unpin! racket-mode) (unpin! consult) (unpin! vertico) (unpin! embark) @@ -19,16 +16,37 @@ (unpin! yasnippet-capf) (unpin! parinfer-rust-mode) (unpin! use-package) -;; (unpin! geiser) (unpin! vterm) -;; (unpin! mu4e) (package! meow) -(package! direnv) (package! kurecolor) (package! colorful-mode) -(package! magit-annex) (package! bookmark-in-project) +(package! just-mode) +(package! justl) +(package! fennel-mode) +(package! systemd) +(package! nerd-icons-completion) +(package! nerd-icons-dired) +(package! treemacs-nerd-icons) +(package! kind-icon) +(package! caddyfile-mode) +(package! obsidian) +(package! w3m) +(package! terminal-here) +(package! processing-mode) +(package! ob-p5js) +(package! fish-mode) +(package! svelte-mode) +(package! gcode-mode) +(package! consult-yasnippet) +(package! uniline) +(package! sly-asdf) +(package! sly-quicklisp) +(package! mixed-pitch) +(package! nerd-icons-ibuffer) +(package! magit-todos) +(package! platformio-mode) (package! kdl-mode :recipe (:type git @@ -54,30 +72,9 @@ (package! mu4e-overview :recipe (:type git :host github :repo "mkcms/mu4e-overview")) -(package! just-mode) -(package! justl) -(package! fennel-mode) -(package! systemd) -(package! nerd-icons-completion) -(package! nerd-icons-dired) -(package! treemacs-nerd-icons) -(package! kind-icon) -(package! caddyfile-mode) -(package! obsidian) -(package! w3m) -(package! terminal-here) -(package! processing-mode) -(package! ob-p5js) -;; (package! tidal) -(package! fish-mode) -(package! smart-tabs-mode) -(package! svelte-mode) - (package! sclang :recipe (:local-repo "/home/emenel/.local/share/SuperCollider/downloaded-quarks/scel/el")) -(package! platformio-mode) - (package! scad-mode :recipe (:type git :host github @@ -87,18 +84,6 @@ :host github :repo "lenbok/scad-dbus")) -(package! gcode-mode) - -(package! consult-yasnippet) - -(package! uniline) - -(package! sly-asdf) -(package! sly-quicklisp) - -(package! mixed-pitch) -(package! nerd-icons-ibuffer) - (package! lisp-markup :recipe (:type git :host github @@ -110,10 +95,12 @@ :host github :repo "jdtsmith/eglot-booster")) -(package! eldoc :built-in t) -(package! track-changes :pin "63f21ecf8c59ead2168c983f44364d0ac11d8f77") -(package! soap-client :built-in t) - (package! zone-nyan :recipe (:type git :remote "depp.brause.cc/zone-nyan.git")) + +(package! hotfuzz + :recipe (:type git + :host github + :repo "axelf4/hotfuzz")) +