From b146b063119dd7b06154bc1b43daf630bc3e468b Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Sat, 10 Oct 2020 18:24:33 -0400 Subject: [PATCH] Fixed warning where all-the-icons was initalized by a previous package first. --- .spacemacs | 34 +++++++++++++++++++++++++++++----- display/packages.el | 2 +- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.spacemacs b/.spacemacs index b81d618..413cdc1 100644 --- a/.spacemacs +++ b/.spacemacs @@ -32,7 +32,8 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers - '( + '(typescript + html ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press `SPC f e R' (Vim style) or @@ -72,6 +73,10 @@ This function should only modify configuration layer settings." restclient ;;pdf-tools display + ruby + haskell + javascript + ;scala ) ;; List of additional packages that will be installed without being @@ -523,12 +528,31 @@ This function is called at the very end of Spacemacs initialization." ;; 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. + '(ansi-color-names-vector + ["#0a0814" "#f2241f" "#67b11d" "#b1951d" "#4f97d7" "#a31db1" "#28def0" "#b2b2b2"]) + '(evil-want-Y-yank-to-eol nil) + '(hl-todo-keyword-faces + '(("TODO" . "#dc752f") + ("NEXT" . "#dc752f") + ("THEM" . "#2d9574") + ("PROG" . "#4f97d7") + ("OKAY" . "#4f97d7") + ("DONT" . "#f2241f") + ("FAIL" . "#f2241f") + ("DONE" . "#86dc2f") + ("NOTE" . "#b1951d") + ("KLUDGE" . "#b1951d") + ("HACK" . "#b1951d") + ("TEMP" . "#b1951d") + ("FIXME" . "#dc752f") + ("XXX+" . "#dc752f") + ("\\?\\?\\?+" . "#dc752f"))) '(org-agenda-files - (quote - ("~/org/brain/CleverThis.org" "~/org/journal/2020-01-07" "~/org/journal/2020-01-06"))) + '("~/org/brain/hotkeys.org" "~/org/brain/health.org" "~/org/journal/2020-01-20" "~/org/brain/CleverThis.org" "~/org/journal/2020-01-07" "~/org/journal/2020-01-06")) '(package-selected-packages - (quote - (fixmee string-utils back-button button-lock ucs-utils smartrep nav-flash persistent-soft list-utils wgrep smex ivy-xref ivy-hydra flyspell-correct-ivy ivy-yasnippet ivy-purpose counsel-projectile counsel swiper ivy prettify-utils mvn meghanada maven-test-mode lsp-java groovy-mode groovy-imports pcache gradle-mode lsp-ui lsp-treemacs lsp-python-ms helm-lsp dap-mode bui tree-mode company-lsp lsp-mode yasnippet-snippets yapfify yaml-mode ws-butler writeroom-mode winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package unfill treemacs-projectile treemacs-magit treemacs-evil toc-org symon symbol-overlay string-inflection spaceline-all-the-icons smeargle restclient-helm restart-emacs rainbow-delimiters pytest pyenv-mode py-isort popwin pippel pipenv pip-requirements persp-mode pcre2el password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-journal org-download org-cliplink org-bullets org-brain open-junk-file ob-restclient ob-http nameless mwim move-text mmm-mode markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum live-py-mode link-hint indent-guide importmagic hybrid-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-org helm-mode-manager helm-make helm-ls-git helm-gitignore helm-git-grep helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ gh-md fuzzy font-lock+ flyspell-correct-helm flycheck-pos-tip flycheck-package flycheck-elsa flx-ido fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eval-sexp-fu elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker diminish devdocs define-word cython-mode company-statistics company-restclient company-anaconda column-enforce-mode clean-aindent-mode centered-cursor-mode browse-at-remote blacken auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile aggressive-indent ace-link ace-jump-helm-line ac-ispell)))) + '(tide typescript-mode import-js grizzl web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode simple-httpd helm-css-scss haml-mode emmet-mode counsel-css company-web web-completion-data add-node-modules-path scala-mode sbt-mode noflet fixmee string-utils back-button button-lock ucs-utils smartrep nav-flash persistent-soft list-utils wgrep smex ivy-xref ivy-hydra flyspell-correct-ivy ivy-yasnippet ivy-purpose counsel-projectile counsel swiper ivy prettify-utils mvn meghanada maven-test-mode lsp-java groovy-mode groovy-imports pcache gradle-mode lsp-ui lsp-treemacs lsp-python-ms helm-lsp dap-mode bui tree-mode company-lsp lsp-mode yasnippet-snippets yapfify yaml-mode ws-butler writeroom-mode winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package unfill treemacs-projectile treemacs-magit treemacs-evil toc-org symon symbol-overlay string-inflection spaceline-all-the-icons smeargle restclient-helm restart-emacs rainbow-delimiters pytest pyenv-mode py-isort popwin pippel pipenv pip-requirements persp-mode pcre2el password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-journal org-download org-cliplink org-bullets org-brain open-junk-file ob-restclient ob-http nameless mwim move-text mmm-mode markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum live-py-mode link-hint indent-guide importmagic hybrid-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-org helm-mode-manager helm-make helm-ls-git helm-gitignore helm-git-grep helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ gh-md fuzzy font-lock+ flyspell-correct-helm flycheck-pos-tip flycheck-package flycheck-elsa flx-ido fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eval-sexp-fu elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker diminish devdocs define-word cython-mode company-statistics company-restclient company-anaconda column-enforce-mode clean-aindent-mode centered-cursor-mode browse-at-remote blacken auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile aggressive-indent ace-link ace-jump-helm-line ac-ispell)) + '(paradox-github-token t) + '(pdf-view-midnight-colors '("#b2b2b2" . "#292b2e"))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/display/packages.el b/display/packages.el index e956376..885eed0 100644 --- a/display/packages.el +++ b/display/packages.el @@ -24,7 +24,7 @@ ;;; Owned Packages ;;;; All-the-icons -(defun display/init-all-the-icons () +(defun display/post-init-all-the-icons () (use-package all-the-icons :config (let ((hy-icon '(all-the-icons-fileicon "hy" :face all-the-icons-orange)) -- GitLab