From 1fd62474fc08967a8b9cb53ea2e2e85acf51d467 Mon Sep 17 00:00:00 2001 From: oreodave Date: Tue, 16 Jul 2019 14:51:46 +0100 Subject: Added sql layer and formatting --- spacemacs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/spacemacs b/spacemacs index 60054bf..40c4a28 100644 --- a/spacemacs +++ b/spacemacs @@ -69,6 +69,7 @@ values." :variables org-startup-truncated t) spacemacs-org + sql markdown) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these @@ -178,6 +179,8 @@ It should only modify the values of Spacemacs settings." ;; If the value is nil then no banner is displayed. (default 'official) dotspacemacs-startup-banner 'official + dotspacemacs-mode-line-theme 'all-the-icons + ;; List of items to show in startup buffer or an association list of ;; the form `(list-type . list-size)`. If nil then it is disabled. ;; Possible values for list-type are: @@ -497,11 +500,13 @@ you should place your code here." (spacemacs/set-leader-keys "os" 'helm-etags-select) (spacemacs/set-leader-keys "oc" 'get-calendar) (spacemacs/set-leader-keys-for-major-mode 'csharp-mode - "m=" 'omnisharp-code-format-entire-file) + "o=" 'omnisharp-code-format-entire-file) - ;; elcord + ;; configuration (load-file "~/.emacs.d/private/local/elcord.el") - (require 'elcord)) + (require 'elcord) + + ) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. @@ -520,9 +525,9 @@ you should place your code here." (java-mode . "java") (awk-mode . "awk") (other . "k&r")))) - ;; '(elcord-display-buffer-details t) - ;; '(elcord-mode t nil (elcord)) - ;; '(elcord-use-major-mode-as-main-icon t) + '(elcord-display-buffer-details t) + '(elcord-mode t nil (elcord)) + '(elcord-use-major-mode-as-main-icon t) '(evil-want-Y-yank-to-eol nil) '(flycheck-python-pycompile-executable "\"python3\"") '(menu-bar-mode nil) @@ -542,3 +547,43 @@ 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 (:background "#141414" :foreground "#f8f8f8"))))) +(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. + '(ansi-color-faces-vector + [default default default italic underline success warning error]) + '(c-basic-offset 2) + '(c-default-style + (quote + ((c-mode . "k&r") + (c++-mode . "k&r") + (java-mode . "java") + (awk-mode . "awk") + (other . "k&r")))) + '(evil-want-Y-yank-to-eol nil) + '(flycheck-python-pycompile-executable "\"python3\"") + '(menu-bar-mode nil) + '(org-agenda-files (quote ("~/Text/calendar.org"))) + '(org-startup-truncated t) + '(package-selected-packages + (quote + (sql-indent pipenv vimrc-mode dactyl-mode elcord fsharp-mode company-quickhelp zeal-at-point helm-dash dash-docs stickyfunc-enhance srefactor ranger monokai-pro-theme-theme monokai-pro-theme wakatime-mode xterm-color shell-pop multi-term eshell-z eshell-prompt-extras esh-help mu4e-maildirs-extension mu4e-alert ht flyspell-correct-helm flyspell-correct auto-dictionary yasnippet-snippets unfill mwim mmm-mode markdown-toc markdown-mode gh-md typit mmt sudoku pacmacs 2048 -game emoji-cheat-sheet-plus company-emoji zenburn-theme zen-and-art-theme white-sand-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme rebecca-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme exotica-theme espresso-theme dracula-theme django-theme darktooth-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes afternoon-theme flycheck-pos-tip pos-tip smeargle orgit magit-gitflow magit-popup helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit transient org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download htmlize gnuplot yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode company-anaconda anaconda-mode pythonic web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode omnisharp livid-mode skewer-mode simple-httpd less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc helm-css-scss haml-mode emmet-mode disaster csharp-mode company-web web-completion-data company-tern dash-functional tern company-c-headers coffee-mode cmake-mode clang-format helm-company helm-c-yasnippet git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-commit with-editor git-gutter fuzzy diff-hl company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete tide typescript-mode flycheck 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 lv hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile projectile pkg-info epl helm-mode-manager helm-make 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 highlight 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 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))) + '(python-shell-exec-path (quote ("python3"))) + '(python-shell-interpreter "python3" t) + '(standard-indent 2) + '(wakatime-cli-path "/usr/local/bin/wakatime") + '(wakatime-python-bin 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. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(default ((t (:background "#141414" :foreground "#f8f8f8"))))) +) -- cgit v1.2.3-13-gbd6f