From 3db3e6f5857b0f9ff9f1ef00b28f4732252a4426 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Tue, 8 Aug 2023 09:30:11 -0300 Subject: Added Go and more improvements to doom emacs --- .config/doom/config.el | 43 +++++++++++++++++++++++++++---------------- .config/doom/init.el | 2 +- .config/doom/packages.el | 2 ++ .config/i3/config | 3 ++- 4 files changed, 32 insertions(+), 18 deletions(-) (limited to '.config') diff --git a/.config/doom/config.el b/.config/doom/config.el index 8cfa1353..d37fa3f7 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -31,22 +31,22 @@ ;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) ;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) -;; (setq doom-font (font-spec :family "Mononoki Nerd Font" :size 14) -;; doom-variable-pitch-font (font-spec :family "sans") -;; doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) -;;(setq doom-font (font-spec :family "MesloLGS NF" :size 14) - ;;doom-variable-pitch-font (font-spec :family "sans") - ;;doom-big-font (font-spec :family "MesloLGS NF" :size 24)) +(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 14) + doom-variable-pitch-font (font-spec :family "sans") + doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) +(setq doom-font (font-spec :family "MesloLGS NF" :size 14) + doom-variable-pitch-font (font-spec :family "sans") + doom-big-font (font-spec :family "MesloLGS NF" :size 24)) ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -;;(after! doom-themes - ;;(setq doom-themes-enable-bold t - ;;doom-themes-enable-italic t)) -;;(custom-set-faces! - ;;'(font-lock-comment-face :slant italic) - ;;'(font-lock-keyword-face :slant italic)) +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) (setq doom-theme 'doom-badger) ;; If you use `org' and don't want your org files in the default location below, @@ -341,7 +341,10 @@ text and copying to the killring." ;; Save all org buffers on each save (add-hook 'auto-save-hook 'org-save-all-org-buffers) - (add-hook 'after-save-hook 'org-save-all-org-buffers)) + (add-hook 'after-save-hook 'org-save-all-org-buffers) + + ;; Enable Org Modern + (with-eval-after-load 'org (global-org-modern-mode))) ;; My own menu (map! :leader @@ -426,6 +429,7 @@ text and copying to the killring." (after! groovy-mode (define-key groovy-mode-map (kbd "") 'my/jenkins-verify)) +;; Git (setq forge-alist '(("github.com-underarmour" "api.github.com" "github.com" forge-github-repository) ("github.com" "api.github.com" "github.com" forge-github-repository) ("gitlab.com" "gitlab.com/api/v4" "gitlab.com" forge-gitlab-repository) @@ -441,14 +445,17 @@ text and copying to the killring." ("git.suckless.org" nil "git.suckless.org" forge-stagit-repository) ("git.sr.ht" nil "git.sr.ht" forge-srht-repository))) +;;;; Use delta instead of the default diff +(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1))) + ;; Misc (beacon-mode t) ;; ChatGPT -(setq chatgpt-shell-chatgpt-model-version "gpt-3.5-turbo") -(setq chatgpt-shell-chatgpt-streaming "t") -(setq chatgpt-shell-chatgpt-system-prompt "You are a senior Python developer in charge of maintaining a very big application") +(setq chatgpt-shell-model-version "gpt-4") +(setq chatgpt-shell-streaming "t") +(setq chatgpt-shell-system-prompt "You are a senior Python developer in charge of maintaining a very big application") ;; Github Copilot ;; accept completion from copilot and fallback to company @@ -472,3 +479,7 @@ text and copying to the killring." (add-to-list 'auto-mode-alist '("\\.plantuml\\'" . plantuml-mode)) (setq org-babel-default-header-args:plantuml '((:results . "verbatim") (:exports . "results") (:cache . "no"))) + +;; Go +(setq lsp-go-analyses '((shadow . t) + (simplifycompositelit . :json-false))) diff --git a/.config/doom/init.el b/.config/doom/init.el index 754e12d1..035552bb 100644 --- a/.config/doom/init.el +++ b/.config/doom/init.el @@ -135,7 +135,7 @@ ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect + (go +lsp) ; the hipster dialect ;;(graphql +lsp) ; Give queries a REST ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python diff --git a/.config/doom/packages.el b/.config/doom/packages.el index e2c0716e..8fb922e7 100644 --- a/.config/doom/packages.el +++ b/.config/doom/packages.el @@ -69,3 +69,5 @@ (package! ob-chatgpt-shell) (package! dall-e-shell) (package! ob-dall-e-shell) +(package! magit-delta) +(package! org-modern) diff --git a/.config/i3/config b/.config/i3/config index c97bbf88..4c5603c4 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -230,7 +230,8 @@ bindsym --release Ctrl+Shift+F11 exec ksnip -r -p "/tmp/image.png" # Shortcuts -bindsym $aux+g exec loffice ~/Documents/Gastos/Gastos.ods +bindsym $aux+g exec loffice ~/Documents/Gastos/Gastos\ USD.ods +bindsym $aux+u exec loffice ~/Documents/Gastos/Gastos\ UYU.ods bindsym $aux+b exec loffice ~/Documents/Gastos/BTC.ods bindsym $aux+l exec lollypop -- cgit v1.2.3