From 342eba117c4a72406f252c1e36ab3e836ea94fcc Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Tue, 25 Aug 2020 06:16:28 +0200 Subject: [PATCH] [Emacs] Update Emacs configuration New variables were introduced to the template dotspacemacs file. This commit adds them in my spacemacs.org configuration file. The dotspacemacs file was modified. This commit updates it. --- .spacemacs | 15 ++++------ org/config/spacemacs.org | 60 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/.spacemacs b/.spacemacs index 9a39c18..67c3c4c 100644 --- a/.spacemacs +++ b/.spacemacs @@ -100,8 +100,7 @@ This function is called at the very end of Spacemacs initialization." '(evil-want-Y-yank-to-eol nil) '(fci-rule-color "#5B6268") '(hl-todo-keyword-faces - (quote - (("TODO" . "#dc752f") + '(("TODO" . "#dc752f") ("NEXT" . "#dc752f") ("THEM" . "#2d9574") ("PROG" . "#3a81c3") @@ -115,21 +114,19 @@ This function is called at the very end of Spacemacs initialization." ("TEMP" . "#b1951d") ("FIXME" . "#dc752f") ("XXX" . "#dc752f") - ("XXXX" . "#dc752f")))) + ("XXXX" . "#dc752f"))) '(jdee-db-active-breakpoint-face-colors (cons "#1B2229" "#51afef")) '(jdee-db-requested-breakpoint-face-colors (cons "#1B2229" "#98be65")) '(jdee-db-spec-breakpoint-face-colors (cons "#1B2229" "#3f444a")) '(objed-cursor-color "#ff6c6b") '(org-export-headline-levels 4) '(package-selected-packages - (quote - (org-treeusage caddyfile-mode org-ref lsp-dart mu4e-maildirs-extension mu4e-alert helm-mu xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))) - '(pdf-view-midnight-colors (quote ("#655370" . "#fbf8ef"))) + '(org-treeusage caddyfile-mode org-ref lsp-dart mu4e-maildirs-extension mu4e-alert helm-mu xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async)) + '(pdf-view-midnight-colors '("#655370" . "#fbf8ef")) '(safe-local-variable-values - (quote - ((org-confirm-babel-evaluate) + '((org-confirm-babel-evaluate) (javascript-backend . tern) - (javascript-backend . lsp)))) + (javascript-backend . lsp))) '(solaire-mode-auto-swap-bg t) '(vc-annotate-background "#282c34") '(vc-annotate-color-map diff --git a/org/config/spacemacs.org b/org/config/spacemacs.org index 6049670..d4c90d7 100644 --- a/org/config/spacemacs.org +++ b/org/config/spacemacs.org @@ -612,7 +612,7 @@ repositories, so I’ll disable the Spacemacs support for this feature. The default value of this variable is =nil=. #+BEGIN_SRC emacs-lisp - (setq-default dotspacemacs-enable-emacs-pdumper nil) + (setq-default dotspacemacs-enable-emacs-pdumper t) #+END_SRC In case the support for pdumper was enabled, Spacemacs needs to know the name @@ -630,6 +630,7 @@ #+BEGIN_SRC sh :tangle no :exports code ./emacs --dump-file=~/.config/emacs/.cache/dumps/spacemacs.pdmp #+END_SRC + The default value of this variable is ="spacemacs.pdmp"=. #+BEGIN_SRC emacs-lisp (setq-default dotspacemacs-emacs-dumper-dump-file "spacemacs.pdmp") @@ -726,6 +727,13 @@ hybrid-mode-default-state 'normal)) #+END_SRC + If non-nil, the paste transient-state is enabled. While enabled, after you + paste something, pressing ~C-j~ and ~C-k~ several times cycles through the + elements in the ~kill-ring~. Default ~nil~. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-enable-paste-transient-state t) + #+END_SRC + ** Spacemacs home configuration :PROPERTIES: :CUSTOM_ID: Init-Spacemacs_home_configuration-8375cdcc @@ -764,6 +772,12 @@ (setq-default dotspacemacs-startup-buffer-responsive t) #+END_SRC + If non-nil show the version string in the Spacemacs buffer. It will appear as + ~(spacemacs version)@(emacs version)~. Default ~t~. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-startup-buffer-show-version t) + #+END_SRC + ** Default major modes :PROPERTIES: :CUSTOM_ID: Init-Default_major_modes-37f4a891 @@ -781,6 +795,7 @@ #+BEGIN_SRC emacs-lisp (setq-default dotspacemacs-scratch-mode 'org-mode) #+END_SRC + By the way, it is possible to set a default message for the scratch buffer, such as “Welcome to Spacemacs!”. I prefer to keep it clean. The default value is =nil=. @@ -1148,7 +1163,7 @@ You can also set a custom emacs server socket location. If the value is ~nil~, Emacs will use whatever the Emacs default is, otherwise a directory - path like ="~/.config/emacs/server"=. It has no effect if + path like ="$HOME/.config/emacs/server"=. It has no effect if ~dotspacemacs-enable-server~ is ~nil~. #+BEGIN_SRC emacs-lisp (setq-default dotspacemacs-server-socket-dir nil) @@ -1193,7 +1208,7 @@ - ~grep~ The default value is ~'("rg" "ag" "pt" "ack" "grep")~. #+BEGIN_SRC emacs-lisp - (setq-default dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")) + (setq-default dotspacemacs-search-tools '("rg" "grep")) #+END_SRC Delete whitespace while saving buffer. Possible values are: @@ -1206,6 +1221,41 @@ (setq-default dotspacemacs-whitespace-cleanup nil) #+END_SRC + Set ~gc-cons-threshold~ and ~gc-cons-percentage~ when startup finishes. This + is an advanced option and should not be changed unless you suspect performance + issues due to garbage collection operations. The default is ~'(100000000 0.1)~ + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-gc-cons '(100000000 0.1)) + #+END_SRC + + If non nil activate ~clean-aindent-mode~ which tries to correct virtual + indentation of simple modes. This can interfer with mode specific indent + handling like has been reported for ~go-mode~. If it does deactivate it here. + Default ~t~. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-use-clean-aindent-mode t) + #+END_SRC + + Text of shifted values from your keyboard's number row. Default + ~'!@#$%^&*()'~. I adapted it to the bépo layout. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-snoopy-keyrow "\"«»()@+-/*") + #+END_SRC + + If non-nil activate ~snoopy-mode~ which shifts your number row to match the + set of signs given in ~dotspacemacs-snoopy-keyrow~ in programming modes + (~insert-mode~ only). Default ~nil~. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-use-snoopy-mode nil) + #+END_SRC + + Set ~read-process-output-max~ when startup finishes. This defines how much + data is read from a foreign process. Setting this >= 1 MB should increase + performance for lsp servers in emacs 27. + #+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-read-process-output-max (* 1024 1024 8)) + #+END_SRC + * User Initialization :PROPERTIES: :header-args:emacs-lisp: :tangle ~/.config/emacs/private/user-init.el :exports code :results silent @@ -1291,14 +1341,14 @@ "Return a typical new assignment for arguments. Inspired from elpy’s functions https://github.com/jorgenschaefer/elpy" - (let ((identation (make-string (save-excursion + (let ((indentation (make-string (save-excursion (goto-char start-point) (current-indentation)) ?\s))) (mapconcat (lambda (arg) (if (string-match "^\\*" (car arg)) "" - (format "%s,\n%s" (car arg) identation))) + (format "%s,\n%s" (car arg) indentation))) (phundrak//yas-snippet-split-args arg-string) ""))) #+END_SRC