From 93fa50eba3289dfbb87c4bc920a4a45b40df282e Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Sun, 21 Jul 2019 16:47:00 +0200 Subject: [PATCH] cleanup, added alda layer, added utilities, new themes \o/ --- .spacemacs | 106 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 19 deletions(-) diff --git a/.spacemacs b/.spacemacs index 0327b8b..e60a8bc 100644 --- a/.spacemacs +++ b/.spacemacs @@ -33,7 +33,8 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers - '(asm + '(alda + asm (auto-completion :variables auto-completion-complete-with-key-sequence-delay 0.02 auto-completion-enable-help-tooltip 'manual @@ -86,8 +87,6 @@ This function should only modify configuration layer settings." javascript-fmt-tool 'web-beautify) (json :variables json-fmt-tool 'web-beautify) - ;; (keyboard-layout :variables - ;; kl-layout 'bepo) (latex :variables latex-build-command "xelatex" latex-enable-auto-fill t @@ -99,6 +98,7 @@ This function should only modify configuration layer settings." "c++" "python" "scala" + "rust" ("elisp" "emacs-lisp"))) (org :variables org-enable-reveal-js-support t @@ -157,16 +157,21 @@ This function should only modify configuration layer settings." dotspacemacs-additional-packages '(atomic-chrome cmake-mode dired-x + dionysos + doom-themes edit-indirect elcord eshell-git-prompt + fireplace image-dired+ + kaolin-themes meson-mode modern-cpp-font-lock multiple-cursors outorg pinentry visual-fill-column + wttrin xresources-theme yasnippet-snippets) ;; A list of packages that cannot be updated. @@ -174,6 +179,7 @@ This function should only modify configuration layer settings." ;; A list of packages that will not be installed and loaded. dotspacemacs-excluded-packages '(popwin) + ;; Defines the behaviour of Spacemacs when installing packages. ;; Possible values are `used-only', `used-but-keep-unused' and `all'. ;; `used-only' installs only explicitly used packages and deletes any unused @@ -255,6 +261,7 @@ It should only modify the values of Spacemacs settings." ;; section of the documentation for details on available variables. ;; (default 'vim) dotspacemacs-editing-style 'emacs + ;; If non nil output loading progress in `*Messages*' buffer. (default nil) dotspacemacs-verbose-loading nil @@ -274,6 +281,7 @@ It should only modify the values of Spacemacs settings." ;; `spacemacs-buffer-startup-lists-length' takes effect. dotspacemacs-startup-lists '((recents . 15) (projects . 15)) + ;; True if the home buffer should respond to resize events. dotspacemacs-startup-buffer-responsive t @@ -294,7 +302,22 @@ It should only modify the values of Spacemacs settings." ;; with 2 themes variants, one dark and one light) dotspacemacs-themes '(xresources spacemacs-dark - spacemacs-light) + doom-one + doom-opera + doom-nord + doom-dracula + doom-molokai + doom-peacock + doom-vibrant + doom-sourcerer + doom-spacegrey + kaolin-dark + kaolin-aurora + kaolin-bubblegum + kaolin-galaxy + kaolin-mono-dark + kaolin-temple + kaolin-valley-dark) ;; Set the theme for the Spaceline. Supported themes are `spacemacs', ;; `all-the-icons', `custom', `doom', `vim-powerline' and `vanilla'. The @@ -303,7 +326,9 @@ It should only modify the values of Spacemacs settings." ;; refer to the DOCUMENTATION.org for more info on how to create your own ;; spaceline theme. Value can be a symbol or list with additional properties. ;; (default '(spacemacs :separator wave :separator-scale 1.5)) - dotspacemacs-mode-line-theme '(spacemacs :separator wave :separator-scale 1.5) + dotspacemacs-mode-line-theme '(doom + :separator wave + :separator-scale 1.0) ;; If non-nil the cursor color matches the state color in GUI Emacs. ;; (default t) @@ -316,7 +341,7 @@ It should only modify the values of Spacemacs settings." :size 13 :weight normal :width normal - :powerline-scale 1.1) + :powerline-scale 1.0) ;; The leader key dotspacemacs-leader-key "SPC" @@ -366,6 +391,7 @@ It should only modify the values of Spacemacs settings." ;; literally to avoid performance issues. Opening a file literally means that ;; no major mode or minor modes are active. (default is 1) dotspacemacs-large-file-size 10 + ;; Location where to auto-save files. Possible values are `original' to ;; auto-save the file in-place, `cache' to auto-save the file to another ;; file stored in the cache directory and `nil' to disable auto-saving. @@ -447,10 +473,14 @@ It should only modify the values of Spacemacs settings." dotspacemacs-smooth-scrolling t ;; Control line numbers activation. - ;; If set to `t' or `relative' line numbers are turned on in all `prog-mode' and - ;; `text-mode' derivatives. If set to `relative', line numbers are relative. + ;; If set to `t', `relative' or `visual' then line numbers are enabled in all + ;; `prog-mode' and `text-mode' derivatives. If set to `relative', line + ;; numbers are relative. If set to `visual', line numbers are also relative, + ;; but lines are only visual lines are counted. For example, folded lines + ;; will not be counted and wrapped lines are counted as multiple lines. ;; This variable can also be set to a property list for finer control: ;; '(:relative nil + ;; :visual nil ;; :disabled-for-modes dired-mode ;; doc-view-mode ;; markdown-mode @@ -458,12 +488,10 @@ It should only modify the values of Spacemacs settings." ;; pdf-view-mode ;; text-mode ;; :size-limit-kb 1000) - ;; (default nil) - dotspacemacs-line-numbers '(:disabled-for-modes - dired-mode - doc-view-mode - pdf-view-mode - nov-mode) + ;; When used in a plist, `visual' takes precedence over `relative'. + dotspacemacs-line-numbers '(:relative nil + :enabled-for-modes prog-mode) + ;; Code folding method. Possible values are `evil' and `origami'. ;; (default 'evil) dotspacemacs-folding-method 'evil @@ -559,6 +587,7 @@ See the header of this file for more information." (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/") t) (add-hook 'flycheck-mode-hook #'flycheck-rust-setup) + (add-to-list 'custom-theme-load-path "~/.emacs.d/private/themes") (flyspell-mode 0) (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='tramp.%%C' -o ControlPersist=no")) @@ -572,6 +601,14 @@ dump." (defun dotspacemacs/user-config () +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ; Media ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + (setq dionysos-backend 'mpd + dionysos-notify-p t + dionysos-volume-cmd 'pamixer) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Misc ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -581,13 +618,14 @@ dump." twittering-use-master-password t edit-server-default-major-mode 'org-mode epa-pinentry-mode 'loopback - paragraph-start "\f\\|[ \t]*$\\|[ \t]*[-+*] ") + paragraph-start "\f\\|[ \t]*$\\|[ \t]*[-+*] " + wttrin-default-cities '("Aubervilliers" "Paris" "Lyon" "Nonières" + "Saint Agrève")) (add-hook 'before-save-hook 'delete-trailing-whitespace) + (add-hook 'prog-mode-hook 'eldoc-mode) (mapc (lambda (x) (add-hook 'prog-mode-hook x)) '(visual-line-mode)) - ;; (add-hook 'prog-mode-hook 'fci-mode) - ;; (add-hook 'prog-mode-hook 'visual-line-mode) (mapc (lambda (x) (add-hook x 'auto-fill-mode) (add-hook x 'visual-line-mode)) @@ -686,6 +724,8 @@ dump." "oac" 'calc "oaC" 'calendar "oae" 'eww + "oaf" 'fireplace + "oaw" 'wttrin "oB" 'fancy-battery-mode "occ" 'outorg-copy-edits-and-exit "oce" 'outorg-edit-as-org @@ -1072,6 +1112,7 @@ This function is called at the very end of Spacemacs initialization." '(default-input-method "ipa-x-sampa") '(eshell-aliases-file "/home/phundrak/dotfiles/eshell-alias") '(evil-want-Y-yank-to-eol nil) + '(fci-rule-color "#5B6268") '(hl-todo-keyword-faces '(("TODO" . "#dc752f") ("NEXT" . "#dc752f") @@ -1088,16 +1129,43 @@ This function is called at the very end of Spacemacs initialization." ("FIXME" . "#dc752f") ("XXX" . "#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 - '(ob-restclient forge emacsql doom-modeline cpp-auto-include company-glsl counsel swiper ivy ess window-purpose treemacs font-lock+ 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)) + '(alda-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 '("#655370" . "#fbf8ef")) '(safe-local-variable-values '((org-confirm-babel-evaluate) (javascript-backend . tern) (javascript-backend . lsp) (go-backend . go-mode) - (go-backend . lsp)))) + (go-backend . lsp))) + '(solaire-mode-auto-swap-bg t) + '(vc-annotate-background "#282c34") + '(vc-annotate-color-map + (list + (cons 20 "#98be65") + (cons 40 "#b4be6c") + (cons 60 "#d0be73") + (cons 80 "#ECBE7B") + (cons 100 "#e6ab6a") + (cons 120 "#e09859") + (cons 140 "#da8548") + (cons 160 "#d38079") + (cons 180 "#cc7cab") + (cons 200 "#c678dd") + (cons 220 "#d974b7") + (cons 240 "#ec7091") + (cons 260 "#ff6c6b") + (cons 280 "#cf6162") + (cons 300 "#9f585a") + (cons 320 "#6f4e52") + (cons 340 "#5B6268") + (cons 360 "#5B6268"))) + '(vc-annotate-very-old-color nil)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.