chore: update config

4 files changed, 14 insertions, 63 deletions

diff --git a/config.el b/config.el
index 53237d5..be6f37f 100644
--- a/config.el
+++ b/config.el
@@ -79,7 +79,7 @@
 (load! "lang/go")
 (load! "app/osm")
 
-(when (featurep! :tools lsp +eglot)
+(when (modulep! :tools lsp +eglot)
   (setq! flycheck-disabled-checkers '(eglot))
   (set-eglot-client! 'c-mode '("clangd" "-j=3" "--clang-tidy"))
   (set-eglot-client! 'terraform-mode '("terraform-ls" "serve")))
@@ -88,3 +88,5 @@
 (add-hook 'eshell-mode-hook 'with-editor-export-editor)
 (add-hook 'term-exec-hook   'with-editor-export-editor)
 (add-hook 'vterm-mode-hook  'with-editor-export-editor)
+(use-package! ebuild-mode)
+(use-package! salt-mode)
diff --git a/init.el b/init.el
index dc9f436..84c10ef 100644
--- a/init.el
+++ b/init.el
@@ -66,7 +66,7 @@
        word-wrap           ; soft wrapping with language-aware indent
 
        :emacs
-       dired               ; making dired pretty [functional]
+       (dired +icons)      ; making dired pretty [functional]
        electric            ; smarter, keyword-based electric-indent
        ;;ibuffer           ; interactive buffer management
        undo                ; persistent, smarter undo for your inevitable mistakes
@@ -90,7 +90,7 @@
        ;;docker
        editorconfig        ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
-       ;(eval +overlay)    ; run code, run (also, repls)
+       ;;(eval +overlay)    ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        (lookup +dictionary); navigate your code and its documentation
        (lsp +eglot)        ; M-x vscode
@@ -101,14 +101,14 @@
        ;;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
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS
-       tty                 ; improve the terminal Emacs experience
+       (tty +osc)           ; improve the terminal Emacs experience
 
        :lang
        ;;agda              ; types of types of types of types...
@@ -147,7 +147,7 @@
        ;;lua               ; one-based indices? one-based indices
        markdown            ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       (nix +tree-sitter)  ; I hereby declare "nix geht mehr!"
+       ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org +pretty)       ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
@@ -160,7 +160,7 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp +tree-sitter)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;(scheme +guile)   ; a fully conniving family of lisps
        (sh +tree-sitter)   ; she sells {ba,z,fi}sh shells on the C xor
@@ -169,7 +169,7 @@
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
        ;;web               ; the tubes
-       (yaml +lsp)         ; JSON, but readable
+       (yaml +lsp +tree-sitter)         ; JSON, but readable
        ;;zig               ; C, but simpler
 
        :email
diff --git a/lang/go.el b/lang/go.el
index aaf0ba7..2cec390 100644
--- a/lang/go.el
+++ b/lang/go.el
@@ -1,11 +1,6 @@
 ;;; lang/go.el -*- lexical-binding: t; -*-
 
-(when (featurep! :tools lsp +eglot)
+(when (modulep! :tools lsp +eglot)
   (after! eglot
     (add-to-list 'eglot-workspace-configuration
-                 `((:gopls . ((staticcheck . t))))))
-
-  (setq-hook! 'go-mode-hook +format-with :none)
-
-  (add-hook! 'go-mode-hook
-    (add-hook 'before-save-hook #'eglot-format-buffer -30 t)))
+                 `((:gopls . ((staticcheck . t)))))))
diff --git a/packages.el b/packages.el
index 21ff65c..8fc8efb 100644
--- a/packages.el
+++ b/packages.el
@@ -1,53 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; $DOOMDIR/packages.el
 
-;; To install a package with Doom you must declare them here and run 'doom sync'
-;; on the command line, then restart Emacs for the changes to take effect -- or
-;; use 'M-x doom/reload'.
-
-
-;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;(package! some-package)
-
-;; To install a package directly from a remote git repo, you must specify a
-;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
-;; https://github.com/raxod502/straight.el#the-recipe-format
-;(package! another-package
-;  :recipe (:host github :repo "username/repo"))
-
-;; If the package you are trying to install does not contain a PACKAGENAME.el
-;; file, or is located in a subdirectory of the repo, you'll need to specify
-;; `:files' in the `:recipe':
-;(package! this-package
-;  :recipe (:host github :repo "username/repo"
-;           :files ("some-file.el" "src/lisp/*.el")))
-
-;; If you'd like to disable a package included with Doom, you can do so here
-;; with the `:disable' property:
-;(package! builtin-package :disable t)
-
-;; You can override the recipe of a built in package without having to specify
-;; all the properties for `:recipe'. These will inherit the rest of its recipe
-;; from Doom or MELPA/ELPA/Emacsmirror:
-;(package! builtin-package :recipe (:nonrecursive t))
-;(package! builtin-package-2 :recipe (:repo "myfork/package"))
-
-;; Specify a `:branch' to install a package from a particular branch or tag.
-;; This is required for some packages whose default branch isn't 'master' (which
-;; our package manager can't deal with; see raxod502/straight.el#279)
-;(package! builtin-package :recipe (:branch "develop"))
-
-;; Use `:pin' to specify a particular commit to install.
-;(package! builtin-package :pin "1a2b3c4d5e")
-
-
-;; Doom's packages are pinned to a specific commit and updated from release to
-;; release. The `unpin!' macro allows you to unpin single packages...
-;(unpin! pinned-package)
-;; ...or multiple packages
-;(unpin! pinned-package another-pinned-package)
-;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;(unpin! t)
-
 (package! magit-delta)
 (package! osm)
+(package! ebuild-mode)
+(package! salt-mode)