From c11e91574bbbc5c2b3d2021915e694ec15a02709 Mon Sep 17 00:00:00 2001 From: cake Date: Mon, 28 Apr 2025 20:52:16 +0200 Subject: [PATCH] IDFK what I am doing anymore --- custom.el | 7 ++++++- init.el | 59 ++++++++++++++++++++++--------------------------------- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/custom.el b/custom.el index 9d338a3..8a2e390 100644 --- a/custom.el +++ b/custom.el @@ -5,7 +5,12 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(delete-selection-mode nil) - '(package-selected-packages nil) + '(package-selected-packages + '(all-the-icons astro-ts-mode company-quickhelp dashboard + doom-modeline doom-themes evil-collection + fennel-mode flycheck lsp-pyright lsp-ui magit + rustic sideline slime treemacs-evil + treemacs-projectile)) '(warning-suppress-log-types '((lsp-mode) (lsp-mode))) '(warning-suppress-types '((lsp-mode)))) (custom-set-faces diff --git a/init.el b/init.el index 10eddc8..03c6708 100644 --- a/init.el +++ b/init.el @@ -1,8 +1,12 @@ (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) (load custom-file) -(require 'package) -(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(use-package package + :ensure nil + :config (package-initialize) + :custom (package--native-compile-async t) + (package-archives '(("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/")))) ;; THEMES (use-package doom-themes :ensure t :config (load-theme 'doom-dracula t)) @@ -21,6 +25,11 @@ ;; UI (use-package company :ensure t :config (global-company-mode)) +(use-package company-quickhelp + :ensure t + :after company + :hook (company-mode . company-quickhelp-mode) + :config) (use-package flycheck :ensure t :config @@ -28,6 +37,7 @@ (use-package all-the-icons :ensure t :if (display-graphic-p)) +(use-package magit :ensure t) ;; EVIL (use-package evil :ensure t :init (setq evil-want-keybinding nil) :config (evil-mode t)) @@ -36,49 +46,21 @@ :after (treemacs evil) :ensure t) -;; LSP -(use-package lsp-mode - :ensure t - :config - (lsp-mode t) - (setq lsp-headerline-breadcrumb-enable nil)) - -(use-package lsp-ui - :ensure t - :after lsp-mode - :config - (setq lsp-ui-doc-enable nil) - (setq lsp-ui-doc-show-with-mouse nil) - (setq lsp-ui-doc-show-with-cursor t) - (setq lsp-ui-doc-position 'bottom) - (setq lsp-ui-doc-alignment 'frame)) - -(use-package lsp-pyright - :ensure t - :custom (lsp-pyright-langserver-command "pyright") ;; or basedpyright - :hook (python-ts-mode . (lambda () - (require 'lsp-pyright) - (lsp)))) ; or lsp-deferred - -(use-package company-quickhelp - :ensure t - :after company - :hook (company-mode . company-quickhelp-mode) - :config) -(use-package magit :ensure t) +;; EGLOT +(use-package eglot :ensure t) ;; MODES (use-package rustic :ensure t :config (setq rustic-format-on-save nil) + (setq rustic-lsp-client 'eglot) :custom (rustic-cargo-use-last-stored-arguments t)) (use-package astro-ts-mode :ensure t) (use-package fennel-mode :ensure t) -(setq major-mode-remap-alist - '((python-mode . python-ts-mode))) - +(use-package slime :ensure t) + ;; OTHER (use-package treemacs-projectile :after (treemacs projectile) @@ -99,5 +81,10 @@ (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src") (python "https://github.com/tree-sitter/tree-sitter-python") - (rust "https://github.com/tree-sitter/tree-sitter-rust")))) + (rust "https://github.com/tree-sitter/tree-sitter-rust"))) + (setq inferior-lisp-program "sbcl") + (setq major-mode-remap-alist + '((python-mode . python-ts-mode)))) + +;;; init.el ends here