diff options
| -rw-r--r-- | config.el | 78 | ||||
| -rw-r--r-- | config.org | 89 |
2 files changed, 104 insertions, 63 deletions
@@ -261,9 +261,9 @@ (erc-tls :server "irc.cashmere.rs" :port 6697 :nick "cashmere" - :user "cashmere/bitlbee" + :user "cashmere/libera.chat" :password (password-store-get 'soju) - :id 'bitlbee)) + :id 'libera)) (use-package dashboard :ensure t @@ -1392,41 +1392,59 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi ;; :custom ;; (rustic-cargo-use-last-stored-arguments t)) -(use-package nushell-mode - :ensure nil - :straight nil - :mode "\\.nu\\'") - -(use-package nushell-ts-babel - :straight (nushell-ts-babel :type git :host github :repo "herbertjones/nushell-ts-babel") - :after org +(use-package js + :ensure t + :mode ("\\.js\\'" . js-mode) :config - (org-babel-do-load-languages - 'org-babel-load-languages - (append org-babel-load-languages - '((nushell . t))))) + (setq js-indent-level 2)) -(use-package go-mode - :ensure t - :mode "\\.go\\'" - :hook (go-mode . eglot-ensure) +(use-package mint-mode + :straight (mint-mode + :type git + :host github + :repo "creatorrr/emacs-mint-mode") + :mode "\\.mint\\'" + :hook (mint-mode . eglot-ensure) :config (with-eval-after-load 'eglot (add-to-list 'eglot-server-programs - '(go-mode . ("gopls" :initializationOptions - (:staticcheck t - :matcher "CaseSensitive" - :usePlaceholders t))))) + '(mint-mode . ("mint" "tool" "ls"))))) + +;; (use-package nushell-mode +;; :ensure nil +;; :straight nil +;; :mode "\\.nu\\'") + +;; (use-package nushell-ts-babel +;; :straight (nushell-ts-babel :type git :host github :repo "herbertjones/nushell-ts-babel") +;; :after org +;; :config +;; (org-babel-do-load-languages +;; 'org-babel-load-languages +;; (append org-babel-load-languages +;; '((nushell . t))))) + +;; (use-package go-mode +;; :ensure t +;; :mode "\\.go\\'" +;; :hook (go-mode . eglot-ensure) +;; :config +;; (with-eval-after-load 'eglot +;; (add-to-list 'eglot-server-programs +;; '(go-mode . ("gopls" :initializationOptions +;; (:staticcheck t +;; :matcher "CaseSensitive" +;; :usePlaceholders t))))) - (defun go-mode-setup () - (add-hook 'before-save-hook #'eglot-format-buffer -10 t) - (add-hook 'before-save-hook - (lambda () - (when (eglot-managed-p) - (eglot-code-action-organize-imports nil t))) - nil t)) +;; (defun go-mode-setup () +;; (add-hook 'before-save-hook #'eglot-format-buffer -10 t) +;; (add-hook 'before-save-hook +;; (lambda () +;; (when (eglot-managed-p) +;; (eglot-code-action-organize-imports nil t))) +;; nil t)) - (add-hook 'go-mode-hook #'go-mode-setup)) +;; (add-hook 'go-mode-hook #'go-mode-setup)) (use-package json-mode :ensure t @@ -297,9 +297,9 @@ (erc-tls :server "irc.cashmere.rs" :port 6697 :nick "cashmere" - :user "cashmere/bitlbee" + :user "cashmere/libera.chat" :password (password-store-get 'soju) - :id 'bitlbee)) + :id 'libera)) #+end_src @@ -1787,52 +1787,75 @@ ily <3. ;; (rustic-cargo-use-last-stored-arguments t)) #+end_src + +** js-mode + +#+begin_src emacs-lisp +(use-package js + :ensure t + :mode ("\\.js\\'" . js-mode) + :config + (setq js-indent-level 2)) + +(use-package mint-mode + :straight (mint-mode + :type git + :host github + :repo "creatorrr/emacs-mint-mode") + :mode "\\.mint\\'" + :hook (mint-mode . eglot-ensure) + :config + (with-eval-after-load 'eglot + (add-to-list 'eglot-server-programs + '(mint-mode . ("mint" "tool" "ls"))))) +#+end_src + ** Nushell #+begin_src emacs-lisp -(use-package nushell-mode - :ensure nil - :straight nil - :mode "\\.nu\\'") +;; (use-package nushell-mode +;; :ensure nil +;; :straight nil +;; :mode "\\.nu\\'") #+end_src *** nushell org babel #+begin_src emacs-lisp -(use-package nushell-ts-babel - :straight (nushell-ts-babel :type git :host github :repo "herbertjones/nushell-ts-babel") - :after org - :config - (org-babel-do-load-languages - 'org-babel-load-languages - (append org-babel-load-languages - '((nushell . t))))) +;; (use-package nushell-ts-babel +;; :straight (nushell-ts-babel :type git :host github :repo "herbertjones/nushell-ts-babel") +;; :after org +;; :config +;; (org-babel-do-load-languages +;; 'org-babel-load-languages +;; (append org-babel-load-languages +;; '((nushell . t))))) #+end_src ** Go mode #+begin_src emacs-lisp -(use-package go-mode - :ensure t - :mode "\\.go\\'" - :hook (go-mode . eglot-ensure) - :config - (with-eval-after-load 'eglot - (add-to-list 'eglot-server-programs - '(go-mode . ("gopls" :initializationOptions - (:staticcheck t - :matcher "CaseSensitive" - :usePlaceholders t))))) +;; (use-package go-mode +;; :ensure t +;; :mode "\\.go\\'" +;; :hook (go-mode . eglot-ensure) +;; :config +;; (with-eval-after-load 'eglot +;; (add-to-list 'eglot-server-programs +;; '(go-mode . ("gopls" :initializationOptions +;; (:staticcheck t +;; :matcher "CaseSensitive" +;; :usePlaceholders t))))) - (defun go-mode-setup () - (add-hook 'before-save-hook #'eglot-format-buffer -10 t) - (add-hook 'before-save-hook - (lambda () - (when (eglot-managed-p) - (eglot-code-action-organize-imports nil t))) - nil t)) +;; (defun go-mode-setup () +;; (add-hook 'before-save-hook #'eglot-format-buffer -10 t) +;; (add-hook 'before-save-hook +;; (lambda () +;; (when (eglot-managed-p) +;; (eglot-code-action-organize-imports nil t))) +;; nil t)) - (add-hook 'go-mode-hook #'go-mode-setup)) +;; (add-hook 'go-mode-hook #'go-mode-setup)) #+end_src ** json-mode |