diff --git a/.spacemacs b/.spacemacs index d4b33e42edb76720f7e7740460d1115c42985f84..5ccca2c956fee52fb3aff755a835e8f2d9a86ca6 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 - '( + '(rust + php spacemacs-layouts ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. @@ -100,6 +101,7 @@ This function should only modify configuration layer settings." ;;ivy button-lock fixmee + dash-functional ) ;; A list of packages that cannot be updated. @@ -525,8 +527,18 @@ before packages are loaded." (require 'button-lock) (require 'fixmee) (global-fixmee-mode 1) + (spacemacs/set-leader-keys "gvn" 'smerge-vc-next-conflict) ) + +;; recursively add agenda files, this is needed because journal files dnt have expected ".org" extension +(setq org-agenda-file-regexp "\\`[^.].*\\.org'\\|[0-9]+$") +(setq org-agenda-files '("~/org/" "~/org/journal/" "~/org/brain/")) +;(setq org-agenda-files (append (directory-files-recursively "~/org" "^[^.#].*\\.org"))) +;(setq org-agenda-files (append (directory-files-recursively "~/org/journal" "^[^.#][0-9]*-[0-9]*-[0-9]*$"))) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. (defun dotspacemacs/emacs-custom-settings () @@ -558,10 +570,8 @@ This function is called at the very end of Spacemacs initialization." ("FIXME" . "#dc752f") ("XXX+" . "#dc752f") ("\\?\\?\\?+" . "#dc752f"))) - '(org-agenda-files - '("~/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 - '(nginx-mode 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)) + '(tern toml-mode ron-mode racer flycheck-rust cargo rust-mode phpunit phpcbf php-extras php-auto-yasnippets helm-gtags ggtags geben drupal-mode posframe counsel-gtags company-phpactor phpactor composer php-runtime company-php ac-php-core xcscope php-mode nginx-mode 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