From 44347a217063ef2b43202518adc04419998dfada Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Tue, 21 Jun 2022 14:12:35 -0700 Subject: [PATCH] update doom config --- config/doomemacs/config.el | 15 ++++++++++++++- config/doomemacs/custom.el | 13 +++++++++++++ config/doomemacs/init.el | 8 ++++---- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 config/doomemacs/custom.el diff --git a/config/doomemacs/config.el b/config/doomemacs/config.el index e7b15b8..1a9dc23 100644 --- a/config/doomemacs/config.el +++ b/config/doomemacs/config.el @@ -32,7 +32,7 @@ ;; 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: -(setq doom-theme 'doom-dark+) +(setq doom-theme 'doom-gruvbox) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. @@ -74,3 +74,16 @@ ;; ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. + +;; treemacs extension +(setq treemacs-text-scale 1) +(treemacs-git-mode 'deferred) +(define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action) ;; single click to open tree nodes + +;; code minimap +(minimap-move-overlay-mouse [mouse-1]) + +;; Rust config +;; https://github.com/doomemacs/doomemacs/blob/develop/modules/lang/rust/README.org#enable-rls-by-default +(setq rustic-lsp-server 'rust-analyzer) +(setq rustic-lsp-client 'eglot) diff --git a/config/doomemacs/custom.el b/config/doomemacs/custom.el new file mode 100644 index 0000000..76f9371 --- /dev/null +++ b/config/doomemacs/custom.el @@ -0,0 +1,13 @@ +(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 + '("1d5e33500bc9548f800f9e248b57d1b2a9ecde79cb40c0b1398dec51ee820daf" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "c4063322b5011829f7fdd7509979b5823e8eea2abf1fe5572ec4b7af1dd78519" "a9a67b318b7417adbedaab02f05fa679973e9718d9d26075c6235b1f0db703c8" "f7fed1aadf1967523c120c4c82ea48442a51ac65074ba544a5aefc5af490893b" "1d44ec8ec6ec6e6be32f2f73edf398620bb721afeed50f75df6b12ccff0fbb15" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "6c531d6c3dbc344045af7829a3a20a09929e6c41d7a7278963f7d3215139f6a7" 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. + ) diff --git a/config/doomemacs/init.el b/config/doomemacs/init.el index 79bd12d..0e9359f 100644 --- a/config/doomemacs/init.el +++ b/config/doomemacs/init.el @@ -37,7 +37,7 @@ ;;hydra ;;indent-guides ; highlighted indent columns ;;ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side + minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim @@ -95,11 +95,11 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode + lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds - ;;pdf ; pdf enhancements + pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders ;;rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects @@ -163,7 +163,7 @@ ;;rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ( rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor