From ddf77ee4aef03e2a63c134a27052784e8deadc58 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Wed, 31 Oct 2018 18:24:47 +0800 Subject: [PATCH] use develop branch of spacemacs --- dot.spacemacs | 90 +++++++++++++++++++++++++- layers.personal/customized/packages.el | 6 -- 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dot.spacemacs b/dot.spacemacs index a9c71cd..51b9987 100644 --- a/dot.spacemacs +++ b/dot.spacemacs @@ -134,7 +134,7 @@ values." latex-build-command "LatexMk") ;;ocaml racket - python + (python :variables python-backend 'lsp) shell-scripts (chinese :variables chinese-enable-youdao-dict t @@ -151,7 +151,7 @@ values." ;; javascript scala myeiffel - mycquery + ;;mycquery ;;my-polymode orgtools ;;smex @@ -168,6 +168,7 @@ values." graphviz mytools mymermaid + lsp ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these @@ -401,6 +402,7 @@ values." dotspacemacs-highlight-delimiters 'all ;; If non nil, advise quit functions to keep server open when quitting. ;; (default nil) + dotspacemacs-enable-server t dotspacemacs-persistent-server nil ;; List of search tool executable names. Spacemacs uses the first installed ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. @@ -540,3 +542,87 @@ you should place your code here." ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(default ((t (:family "Inconsolata LGC" :foundry "nil" :slant normal :weight normal :height 140 :width normal))))) +(defun dotspacemacs/emacs-custom-settings () + "Emacs custom settings. +This is an auto-generated function, do not modify its content directly, use +Emacs customize menu instead. +This function is called at the very end of Spacemacs initialization." +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; 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. + '(blink-cursor-mode nil) + '(c-basic-offset 4) + '(c-block-comment-prefix "* ") + '(c-comment-prefix-regexp + (quote + ((pike-mode . "//+!?\\|\\**") + (awk-mode . "#+") + (other . "//+\\|\\**")))) + '(c-default-style + (quote + ((java-mode . "java") + (awk-mode . "awk") + (other . "gnu")))) + '(column-number-mode t) + '(debug-on-error t) + '(exec-path-from-shell-arguments (quote ("-l"))) + '(helm-popup-tip-mode t) + '(org-babel-ditaa-java-cmd (find-java)) + '(org-babel-load-languages + (quote + ((emacs-lisp . t) + (awk . t) + (plantuml . t) + (ditaa . t) + (dot . t) + (gnuplot . t) + (mscgen . t) + (maxima . t) + (octave . t) + (shell . t) + (org . t) + (latex . t) + (C . t) + (mermaid . t) + (R . t)))) + '(org-babel-tangle-lang-exts + (quote + (("awk" . "awk") + ("ruby" . "rb") + ("python" . "py") + ("picolisp" . "l") + ("ocaml" . "ml") + ("maxima" . "max") + ("lisp" . "lisp") + ("latex" . "tex") + ("emacs-lisp" . "el") + ("elisp" . "el") + ("mermaid" . "mmd")))) + '(org-confirm-babel-evaluate nil) + '(org-ditaa-eps-jar-path "~/workenv/emacs/jars/DitaaEps.jar") + '(org-ditaa-jar-path "~/workenv/emacs/jars/ditaa.jar") + '(org-modules + (quote + (org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-w3m org-choose org-depend org-learn org-toc))) + '(org-plantuml-jar-path "~/workenv/emacs/jars/plantuml.jar") + '(package-selected-packages + (quote + (lsp-java toml-mode racer flycheck-rust cargo rust-mode lsp-python company-lsp lsp-ui cquery lsp-mode white-sand-theme rebecca-theme org-mime intero hlint-refactor hindent helm-hoogle haskell-snippets flycheck-haskell exotica-theme ghub let-alist company-ghci company-ghc ghc haskell-mode cmm-mode go-guru go-eldoc go-mode vmd-mode ox-epub vlfi pyim pyim-basedict org-category-capture graphviz-dot-mode yaml-mode polymode orgit org-dotemacs ox-tufte winum unfill solarized-theme madhat2r-theme fuzzy csv-mode engine-mode vlf telephone-line autothemer slime-company insert-shebang hide-comnt web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode company-web web-completion-data pollen-mode geiser cdlatex origami xterm-color shell-pop multi-term helm-company helm-c-yasnippet eshell-z eshell-prompt-extras esh-help company-tern dash-functional company-statistics company-shell company-emoji company-c-headers company-auctex company-anaconda common-lisp-snippets auto-yasnippet ac-ispell auto-complete names chinese-word-at-point caml faceup powerline spinner alert log4e gntp markdown-mode macrostep skewer-mode simple-httpd json-snatcher json-reformat multiple-cursors js2-mode hydra parent-mode projectile request gitignore-mode fringe-helper git-gutter+ git-gutter gh marshal logito pcache ht flyspell-correct flycheck pkg-info epl flx magit magit-popup git-commit with-editor smartparens iedit anzu evil goto-chg undo-tree highlight ctable ess julia-mode company yasnippet sbt-mode scala-mode diminish chinese-pyim-basedict pos-tip bind-map bind-key packed auctex pythonic f dash s markup-faces pinyinlib ace-jump-mode helm avy helm-core popup async package-build tern zonokai-theme zenburn-theme zen-and-art-theme youdao-dictionary yapfify ws-butler window-numbering which-key web-beautify volatile-highlights vi-tilde-fringe uuidgen utop use-package underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tuareg tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stickyfunc-enhance stekene-theme srefactor spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smeargle slime seti-theme reverse-theme restart-emacs rainbow-mode rainbow-identifiers rainbow-delimiters railscasts-theme racket-mode quelpa pyvenv pytest pyenv-mode py-isort purple-haze-theme professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pastels-on-dark-theme paradox pangu-spacing ox-gfm organic-green-theme org-projectile org-present org-pomodoro org-download org-bullets open-junk-file omtose-phellack-theme oldlace-theme ocp-indent occidental-theme obsidian-theme noflet noctilux-theme niflheim-theme neotree naquadah-theme mwim mustang-theme move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme merlin material-theme markdown-toc majapahit-theme magit-gitflow magit-gh-pulls lush-theme lorem-ipsum livid-mode live-py-mode linum-relative link-hint light-soap-theme json-mode js2-refactor js-doc jbeans-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gtags helm-gitignore helm-flx helm-descbinds helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate google-c-style golden-ratio gnuplot github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gist gh-md ggtags gandalf-theme flyspell-correct-helm flycheck-pos-tip flx-ido flatui-theme flatland-theme fish-mode firebelly-theme find-by-pinyin-dired fill-column-indicator farmhouse-theme 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-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu ess-smart-equals ess-R-object-popup ess-R-data-view espresso-theme ensime emoji-cheat-sheet-plus elisp-slime-nav dumb-jump dracula-theme django-theme disaster diff-hl define-word darktooth-theme darkokai-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme column-enforce-mode colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized color-identifiers-mode coffee-mode cmake-mode clues-theme clean-aindent-mode clang-format chinese-pyim cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk apropospriate-theme anti-zenburn-theme anaconda-mode ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adoc-mode adaptive-wrap ace-window ace-pinyin ace-link ace-jump-helm-line))) + '(paradox-github-token t) + '(safe-local-variable-values + (quote + ((org-tex-engine . "xelatex2") + (buffer-file-coding-system . utf-8-unix)))) + '(tool-bar-mode nil) + '(url-configuration-directory "/usr/home/rshen/.emacs.d/.cache/url/") + '(url-cookie-file "/usr/home/rshen/.emacs.d/.cache/url/cookies") + '(url-history-file "/usr/home/rshen/.emacs.d/.cache/url/history")) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; 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. + '(default ((t (:family "Inconsolata LGC" :foundry "nil" :slant normal :weight normal :height 140 :width normal))))) +) diff --git a/layers.personal/customized/packages.el b/layers.personal/customized/packages.el index dc81454..cd11941 100644 --- a/layers.personal/customized/packages.el +++ b/layers.personal/customized/packages.el @@ -32,7 +32,6 @@ (defconst customized-packages '( (my-c-styles :location local) - google-c-style cc-mode) "The list of Lisp packages required by the customized layer. @@ -77,9 +76,4 @@ Each entry is either: (t (use-my-c-style))))) '(c-mode-hook c++-mode-hook))) -(defun customized/init-google-c-style () - (use-package google-c-style - :defer t - :commands google-set-c-style)) - ;;; packages.el ends here