diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | configuration.el | 35 | ||||
| -rwxr-xr-x | init.el | 23 | ||||
| -rw-r--r-- | theme.el | 12 |
4 files changed, 61 insertions, 12 deletions
@@ -9,4 +9,5 @@ projectile* straight/ eshell/ .lsp-session* -.dap*
\ No newline at end of file +.dap* +postgres-secrets.el
\ No newline at end of file diff --git a/configuration.el b/configuration.el index 40b0746..2628dbd 100644 --- a/configuration.el +++ b/configuration.el @@ -22,9 +22,10 @@ (use-package lsp-ui :straight t :init - (setq lsp-ui-doc-enable t) - (setq lsp-ui-sideline-diagnostic-max-lines 7) - (setq lsp-ui-sideline-diagnostic-max-line-length 40) + (setq lsp-ui-doc-enable t + lsp-ui-sideline-diagnostic-max-lines 7 + lsp-ui-sideline-diagnostic-max-line-length 40 + lsp-lens-enable nil) (defun magueta/lsp-ui-doc-toggle () "For some reason it is required to do at least once a call to lsp-ui-doc-show in order for this to work. Probably the problem resides on the frame created requiring some preparation before actually being used, so `frame-live-p` doesn't return nil." (interactive) @@ -162,8 +163,8 @@ (setq dashboard-startup-banner "~/.emacs.d/sources/emacs.svg") (setq dashboard-banner-logo-title "Welcome to MageMacs, a magic GNU Emacs customization") (setq dashboard-items '((recents . 5) - (bookmarks . 5) - (projects . 5))) + (bookmarks . 5) + (projects . 5))) (setq dashboard-center-content t) (setq dashboard-footer-messages '("Quod oculus non vidit, nec auris audivit - I Corinthios II,IX"))) @@ -176,6 +177,21 @@ ("C-q <tab>" . copilot-accept-completion) ("C-q <right>" . copilot-next-completion) ("C-q <left>" . copilot-previous-completion))) + +(use-package candle-mode + :after lsp-mode + :straight (:host github :repo "PerplexSystems/candle-mode" :files ("dist" "*.el")) + :hook ((candle-mode . lsp-deferred)) + :config + (setq-default indent-tabs-mode nil) + (setq-default tab-width 4) + (setq indent-line-function 'insert-tab) + (add-to-list 'lsp-language-id-configuration + '(candle-mode . "candle")) + (lsp-register-client + (make-lsp-client :new-connection (lsp-stdio-connection "millet-ls") + :activation-fn (lsp-activate-on "candle") + :server-id 'millet))) (use-package erlang :straight t @@ -255,5 +271,14 @@ (use-package protobuf-mode :straight t) +(load-file ".emacs.d/postgres-secrets.el") + +(use-package sqlformat + :straight t + :ensure t + :custom + (sqlformat-command 'pgformatter) + (sqlformat-args '("-s2" "-g"))) + (provide 'configuration) ;;; configuration.el ends here @@ -22,3 +22,26 @@ (load-file "~/.emacs.d/behaviour.el") (load-file "~/.emacs.d/configuration.el") +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("76ddb2e196c6ba8f380c23d169cf2c8f561fd2013ad54b987c516d3cabc00216" default))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(default ((t (:family "Hack" :foundry "nil" :slant normal :weight regular :height 145 :width normal)))) + '(fill-column-indicator ((t (:foreground "#CCCCCC" :weight normal)))) + '(multi-magit-repo-heading ((t (:inherit magit-section-heading :box nil)))) + '(rainbow-delimiters-depth-1-face ((t (:foreground "systemTealColor")))) + '(rainbow-delimiters-depth-2-face ((t (:foreground "Brown")))) + '(rainbow-delimiters-depth-3-face ((t (:foreground "Blue")))) + '(rainbow-delimiters-depth-4-face ((t (:foreground "Orange")))) + '(rainbow-delimiters-depth-5-face ((t (:foreground "Purple")))) + '(rainbow-delimiters-depth-6-face ((t (:foreground "dark green")))) + '(rainbow-delimiters-depth-9-face ((t (:foreground "indian red")))) + '(speedbar-selected-face ((t (:foreground "#119911" :underline t))))) @@ -5,17 +5,17 @@ ;; :custom catppuccin-flavor 'mocha ;; :config (load-theme 'catppuccin t)) -(use-package organic-green-theme - :straight t - :config (load-theme 'organic-green t)) +;; (use-package organic-green-theme +;; :straight t +;; :config (load-theme 'organic-green t)) ;; (use-package pastelmac-theme ;; :straight t ;; :config (load-theme 'pastelmac t)) -;; (use-package color-theme-sanityinc-tomorrow - ;; :straight t - ;; :config (load-theme 'sanityinc-tomorrow-blue)) +(use-package color-theme-sanityinc-tomorrow + :straight t + :config (load-theme 'sanityinc-tomorrow-blue)) ;; (use-package solarized-theme ;; :straight t) |