From 68a53bb619d1ca349fd07077be659737af31dce0 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sat, 23 Nov 2019 18:01:52 +0100 Subject: [PATCH] =?UTF-8?q?Removed=20some=20old=20fixes=20now=20useless,?= =?UTF-8?q?=20unused=20layers,=20made=20evil=20b=C3=A9po-compatible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .spacemacs | 72 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/.spacemacs b/.spacemacs index e6d7cd9..fced18f 100644 --- a/.spacemacs +++ b/.spacemacs @@ -26,16 +26,13 @@ This function should only modify configuration layer settings." ;; a layer lazily. (default t) dotspacemacs-ask-for-lazy-installation t - ;; If non-nil layers with lazy install support are lazy installed. ;; List of additional paths where to look for configuration layers. ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') dotspacemacs-configuration-layer-path '() ;; List of configuration layers to load. dotspacemacs-configuration-layers - '(php - ansible - asm + '(asm (auto-completion :variables auto-completion-complete-with-key-sequence-delay 0.2 auto-completion-enable-help-tooltip 'manual @@ -100,6 +97,9 @@ This function should only modify configuration layer settings." node-add-modules-path t) (json :variables json-fmt-tool 'web-beautify) + (keyboard-layout :variables + kl-layout 'bepo + kl-disabled-configurations '(magit)) (latex :variables latex-build-command "xelatex" latex-enable-auto-fill t @@ -107,7 +107,7 @@ This function should only modify configuration layer settings." latex-enable-magic t) lsp (markdown :variables - markdown-live-preview-engine 'vmd + markdown-live-preview-engine 'vmd markdown-mmm-auto-modes '("c" "c++" "python" @@ -142,8 +142,7 @@ This function should only modify configuration layer settings." (shell :variables shell-default-height 40 shell-default-position 'right - shell-default-shell 'eshell - shell-default-full-span nil) + shell-default-shell 'eshell) shell-scripts selectric semantic @@ -171,6 +170,9 @@ This function should only modify configuration layer settings." ;; wrapped in a layer. If you need some configuration for these ;; packages, then consider creating a layer. You can also put the ;; configuration in `dotspacemacs/user-config'. + ;; To use a local version of a package, use the `:location' property: + ;; '(your-package :location "~/path/to/your-package/") + ;; Also include the dependencies as they will not be resolved automatically. dotspacemacs-additional-packages '(atomic-chrome bbdb dianyou @@ -219,8 +221,8 @@ It should only modify the values of Spacemacs settings." ;; (default nil) dotspacemacs-enable-emacs-pdumper nil - ;; File path pointing to emacs 27.1 executable compiled with support - ;; for the portable dumper (this is currently the branch pdumper). + ;; Name of executable file pointing to emacs 27+. This executable must be + ;; in your PATH. ;; (default "emacs") dotspacemacs-emacs-pdumper-executable-file "emacs" @@ -256,8 +258,8 @@ It should only modify the values of Spacemacs settings." dotspacemacs-use-spacelpa nil ;; If non-nil then verify the signature for downloaded Spacelpa archives. - ;; (default nil) - dotspacemacs-verify-spacelpa-archives nil + ;; (default t) + dotspacemacs-verify-spacelpa-archives t ;; If non-nil then spacemacs will check for updates at startup ;; when the current branch is not `develop'. Note that checking for @@ -281,9 +283,6 @@ It should only modify the values of Spacemacs settings." hybrid-mode-enable-hjkl-bindings nil hybrid-mode-default-state 'normal) - ;; If non nil output loading progress in `*Messages*' buffer. (default nil) - dotspacemacs-verbose-loading nil - ;; Specify the startup banner. Default value is `official', it displays ;; the official spacemacs logo. An integer value is the index of text ;; banner, `random' chooses a random text banner in `core/banners' @@ -358,7 +357,8 @@ It should only modify the values of Spacemacs settings." :size 8.0 :weight normal :width normal) - ;; The leader key + + ;; The leader key (default "SPC") dotspacemacs-leader-key "SPC" ;; The key used for Emacs commands `M-x' (after pressing on the leader key). @@ -594,20 +594,17 @@ See the header of this file for more information." (spacemacs/load-spacemacs-env)) (defun dotspacemacs/user-init () - (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") + "Initialization for user code: +This function is called immediately after `dotspacemacs/init', before layer +configuration. +It is mostly for variables that should be set before packages are loaded. +If you are unsure, try setting them in `dotspacemacs/user-config' first." (load "~/.emacs.d/private/private_emacs.el") (require 'org-id) (require 'package) (require 'ox-latex) (require 'ox-publish) - (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/") - ("melpa" . "https://melpa.org/packages/") - ("melpa-stable" . "https://melpa.milkbox.net/packages/") - ("org" . "https://orgmode.org/elpa/"))) - - ;; (add-to-list 'package-archives - ;; '("melpa" . "http://melpa.milkbox.net/packages/") t) (add-hook 'flycheck-mode-hook #'flycheck-rust-setup) (flyspell-mode 0) (setq tramp-ssh-controlmaster-options @@ -621,6 +618,17 @@ dump." ) (defun dotspacemacs/user-config () + "Configuration for user code: +This function is called at the very end of Spacemacs startup, after layer +configuration. +Put your configuration code here, except for variables that should be set +biefore packages are loaded." + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ; Dart ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (spacemacs/set-leader-keys-for-major-mode 'dart-mode + "o=" 'dart-server-format) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Media ; @@ -673,6 +681,7 @@ dump." text-mode-hook markdown-mode-hook)) (global-aggressive-indent-mode 1) + (add-to-list 'aggressive-indent-excluded-modes 'dart-mode) (defun phundrak/fill-paragraph() (interactive) @@ -938,18 +947,19 @@ So a typical ID could look like \"Org-4nd91V40HI\"." org-latex-listings 'minted org-reveal-root "file:///home/phundrak/fromGIT/reveal.js" ;; org-latex-listings t - org-latex-packages-alist '(("" "minted" t) - ("" "graphicx" t)) + ;; org-latex-packages-alist '(("" "minted" t) + ;; ("" "graphicx" t)) ;; org-plantuml-jar-path "/opt/plantuml/plantuml.jar" org-latex-pdf-process '("xelatex -shell-escape -interaction nonstopmode -output-directory %o %f" "xelatex -shell-escape -interaction nonstopmode -output-directory %o %f") org-src-tab-acts-natively t user-full-name "Lucien Cartier-Tilet" - user-mail-address "phundrak@phundrak.fr" + user-mail-address "lucien@phundrak.com" ;; subscripts and superscripts need {} to work org-use-sub-superscripts (quote {}) org-latex-default-packages-alist '(("" "graphicx" t) + ("" "minted" t) ("" "grffile" t) ("" "longtable" nil) ("" "wrapfig" nil) @@ -1097,6 +1107,14 @@ double-quotes matter and must be escaped appropriately." ; Eshell ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (setenv "PATH" + (concat + (concat (getenv "HOME") "/.local/bin") ":" + (concat (getenv "HOME") "/go/bin") ":" + (concat (getenv "HOME") "/.cargo/bin") ":" + (concat (getenv "HOME") "/.pub-cache/bin") ":" + (getenv "PATH"))) + (defadvice find-file (around find-files activate) "Also find all files within a list of files. This even works recursively." (if (listp filename) @@ -1200,7 +1218,7 @@ This function is called at the very end of Spacemacs initialization." '(org-export-headline-levels 4) '(package-selected-packages (quote - (dianyou bbdb helm-gtags ggtags counsel-gtags counsel swiper ivy company-php ac-php-core xcscope 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))) + (dap-mode bui tree-mode 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"))) '(safe-local-variable-values (quote