Merge pull request 'feat: Emacs featureset update' (#18) from emacs into main

Reviewed-on: #18

doom/config.org

@@ -257,8 +257,13 @@ numbers are disabled. For relative line numbers, set this to ~relative~.
 	(setq whitespace-line-column nil)
 	(display-line-numbers-mode)
 )
-
 (add-hook 'text-mode-hook #'custom/common-richtext-hook)
+(setq
+	typescript-indent-level 3
+	css-indent-offset 3
+	sh-indentation 3
+	nxml-indent-offset 3
+)
 #+end_src
 
 ** Shells
@@ -643,47 +648,6 @@ Add the necessary hooks for LilyPond mode.
 	(setq rustic-indent-offset standard-indent))
 #+end_src
 
-*** SCAD
-
-#+begin_src emacs-lisp :tangle packages.el
-(package! scad-mode)
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package! scad-mode
-	:after-call scad-mode
-	:config
-		(add-hook 'scad-mode-hook  #'custom/common-program-hook))
-(map! :after scad-mode
-	:localleader
-	:map scad-mode-map
-	:desc "Open"               "o" #'scad-open
-	:desc "Export"             "e" #'scad-export
-	:desc "Preview"            "p" #'scad-preview
-	)
-(map! :after scad-mode
-	:mode scad-preview-mode
-	:map scad-preview-mode-map
-	:desc "Size+"              "+" #'scad-preview-size+
-	:desc "Size-"              "-" #'scad-preview-size-
-	:desc "Distance+"          "[" #'scad-preview-distance+
-	:desc "Distance-"          "]" #'scad-preview-distance-
-	:desc "Toggle Projection"  "p" #'scad-preview-projection
-	:desc "Translate x-"       "h" #'scad-preview-translate-x-
-	:desc "Translate x+"       "l" #'scad-preview-translate-x+
-	:desc "Translate y-"       "j" #'scad-preview-translate-y-
-	:desc "Translate y+"       "k" #'scad-preview-translate-y+
-	:desc "Translate z-"       "n" #'scad-preview-translate-z-
-	:desc "Translate z+"       "m" #'scad-preview-translate-z+
-	:desc "Rotate x-"          "H" #'scad-preview-rotate-x-
-	:desc "Rotate x+"          "L" #'scad-preview-rotate-x+
-	:desc "Rotate y-"          "J" #'scad-preview-rotate-y-
-	:desc "Rotate y+"          "K" #'scad-preview-rotate-y+
-	:desc "Rotate z-"          "N" #'scad-preview-rotate-z-
-	:desc "Rotate z+"          "M" #'scad-preview-rotate-z+
-	)
-#+end_src
-
 ** Tools
 
 *** Language Server Protocol (LSP)
@@ -692,7 +656,7 @@ File path is removed from breadcrumb since it is provided by ~doom-modeline~ and
 since it clutters the header-line.
 
 #+begin_src emacs-lisp
-(setq-hook! lsp-mode
+(setq-hook! 'lsp-mode-hook
 	lsp-headerline-breadcrumb-enable t
 	lsp-headerline-breadcrumb-enable-symbol-numbers nil
 	lsp-headerline-breadcrumb-segments '(symbols)

doom/init.el

@@ -63,7 +63,7 @@
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
-       snippets          ; my elves. They type so I don't have to
+       ;;snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
@@ -95,8 +95,8 @@
        (eval +overlay)   ; run code, run (also, repls)
        ;;gist            ; interacting with github gists
        lookup            ; navigate your code and its documentation
-       (lsp +peek)       ; M-x vscode
-       magit             ; a git porcelain for Emacs
+       (lsp +peek +eglot)       ; M-x vscode
+       (magit +forge)             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
        pass            ; password manager for nerds
        pdf               ; pdf enhancements
@@ -161,7 +161,7 @@
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
-       ;;rest              ; Emacs as a REST client
+       rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        (rust +lsp +tree-sitter)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()