More emacs 31.1 stuff

init.el

@@ -323,7 +323,7 @@ Apply OLDFUN with to ARGS."
   (dolist (ent '((c "https://github.com/tree-sitter/tree-sitter-c")
                  (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
                  (java "https://github.com/tree-sitter/tree-sitter-java")
-                 ;; (glsl "https://github.com/tree-sitter-grammars/tree-sitter-glsl")
+                 (glsl "https://github.com/tree-sitter-grammars/tree-sitter-glsl")
                  (python "https://github.com/tree-sitter/tree-sitter-python")
                  (rust "https://github.com/tree-sitter/tree-sitter-rust")
                  (json "https://github.com/tree-sitter/tree-sitter-json")
@@ -2201,10 +2201,6 @@ This is :around advice, so OLDFUN is the real function
   :ensure nil)
 
 ;; go mode
-(use-package go-mode
-  :hook (go-mode . my/eglot-if-trusted)
-  :config
-  (my/setup-c-style-newline-keys go-mode-map))
 (use-package go-ts-mode
   :ensure nil
   :hook (go-ts-mode . my/eglot-if-trusted)
@@ -2212,7 +2208,6 @@ This is :around advice, so OLDFUN is the real function
   (go-ts-mode-indent-offset 4))
 
 ;; rust
-(use-package rust-mode)
 (use-package rust-ts-mode
   :ensure nil
   :hook (rust-ts-mode . my/eglot-if-trusted)
@@ -2261,7 +2256,6 @@ This is :around advice, so OLDFUN is the real function
   (setq kdl-ts-mode-indent-offset 4))
 
 ;; json
-(use-package json-mode)
 (use-package json-ts-mode
   :hook (json-ts-mode . my/eglot-if-trusted)
   :custom
@@ -4139,6 +4133,14 @@ vising, and their major mode"
   :config
   (global-form-feed-mode 1))
 
+;; EWW
+(use-package eww
+  :ensure nil
+  :defer t
+  :hook (eww-mode . my/-setup-eww)
+  :init
+  (defun my/-setup-eww ()
+    (setq-local shr-fill-text nil)))
 
 ;; world clocks
 (setopt zoneinfo-style-world-list