Getting spacemacs config file up to date with the current

master
Dustin Swan 9 years ago
parent aae9b47abe
commit 5243a69e5b

@ -3,8 +3,14 @@
;; It must be stored in your home directory. ;; It must be stored in your home directory.
(defun dotspacemacs/layers () (defun dotspacemacs/layers ()
"Configuration Layers declaration." "Configuration Layers declaration.
You should not put any user code in this function besides modifying the variable
values."
(setq-default (setq-default
;; Base distribution to use. This is a layer contained in the directory
;; `+distribution'. For now available distributions are `spacemacs-base'
;; or `spacemacs'. (default 'spacemacs)
dotspacemacs-distribution 'spacemacs
;; List of additional paths where to look for configuration layers. ;; List of additional paths where to look for configuration layers.
;; Paths must have a trailing slash (i.e. `~/.mycontribs/') ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
dotspacemacs-configuration-layer-path '() dotspacemacs-configuration-layer-path '()
@ -13,75 +19,94 @@
dotspacemacs-configuration-layers dotspacemacs-configuration-layers
'(version-control '(version-control
git git
github
perforce perforce
syntax-checking
spell-checking
better-defaults better-defaults
github
osx
nixos
c-c++ c-c++
haskell haskell
idris
ocaml ocaml
html html
react
javascript javascript
elm
purescript purescript
rust rust
ruby ruby
ruby-on-rails
python python
markdown markdown
yaml
extra-langs extra-langs
latex latex
auto-completion auto-completion
colors colors
restclient restclient
evil-snipe evil-snipe
vinegar
unimpaired
eyebrowse eyebrowse
search-engine search-engine
erc erc
(org :variables org-enable-github-support t) (org :variables org-enable-github-support t)
emacs-lisp emacs-lisp
slime common-lisp
scheme
(shell :variables shell-default-shell 'eshell shell-default-term-shell "/bin/bash") (shell :variables shell-default-shell 'eshell shell-default-term-shell "/bin/bash")
xkcd xkcd
spotify spotify
emoji) emoji)
;; List of additional packages that will be installed without being ;; List of additional packages that will be installed without being
;; wrapped in a layer. If you need some configuration for these ;; wrapped in a layer. If you need some configuration for these
;; packages then consider to create a layer, you can also put the ;; packages then consider to create a layer, you can also put the
;; configuration in `dotspacemacs/config'. ;; configuration in `dotspacemacs/config'.
dotspacemacs-additional-packages '(idris-mode) dotspacemacs-additional-packages '()
;; A list of packages and/or extensions that will not be install and loaded. ;; A list of packages and/or extensions that will not be install and loaded.
dotspacemacs-excluded-packages '() dotspacemacs-excluded-packages '()
;; If non-nil spacemacs will delete any orphan packages, i.e. packages that ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
;; are declared in a layer which is not a member of ;; are declared in a layer which is not a member of
;; the list `dotspacemacs-configuration-layers' ;; the list `dotspacemacs-configuration-layers'. (default t)
dotspacemacs-delete-orphan-packages t)) dotspacemacs-delete-orphan-packages t))
(defun dotspacemacs/init () (defun dotspacemacs/init ()
"Initialization function. "Initialization function.
This function is called at the very startup of Spacemacs initialization This function is called at the very startup of Spacemacs initialization
before layers configuration." before layers configuration.
You should not put any user code in there besides modifying the variable
values."
;; This setq-default sexp is an exhaustive list of all the supported ;; This setq-default sexp is an exhaustive list of all the supported
;; spacemacs settings. ;; spacemacs settings.
(setq-default (setq-default
;; Either `vim' or `emacs'. Evil is always enabled but if the variable ;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the
;; is `emacs' then the `holy-mode' is enabled at startup. ;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid'
dotspacemacs-editing-style 'vim ;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil
;; If non nil output loading progress in `*Messages*' buffer. ;; unchanged. (default 'vim)
dotspacemacs-editing-style 'hybrid
;; If non nil output loading progress in `*Messages*' buffer. (default nil)
dotspacemacs-verbose-loading nil dotspacemacs-verbose-loading nil
;; Specify the startup banner. Default value is `official', it displays ;; Specify the startup banner. Default value is `official', it displays
;; the official spacemacs logo. An integer value is the index of text ;; the official spacemacs logo. An integer value is the index of text
;; banner, `random' chooses a random text banner in `core/banners' ;; banner, `random' chooses a random text banner in `core/banners'
;; directory. A string value must be a path to an image format supported ;; directory. A string value must be a path to an image format supported
;; by your Emacs build. ;; by your Emacs build.
;; If the value is nil then no banner is displayed. ;; If the value is nil then no banner is displayed. (default 'official)
dotspacemacs-startup-banner 'official dotspacemacs-startup-banner 'official
;; List of items to show in the startup buffer. If nil it is disabled. ;; List of items to show in the startup buffer. If nil it is disabled.
;; Possible values are: `recents' `bookmarks' `projects'." ;; Possible values are: `recents' `bookmarks' `projects'.
;; (default '(recents projects))
dotspacemacs-startup-lists '(recents projects) dotspacemacs-startup-lists '(recents projects)
;; List of themes, the first of the list is loaded when spacemacs starts. ;; List of themes, the first of the list is loaded when spacemacs starts.
;; Press <SPC> T n to cycle to the next theme in the list (works great ;; Press <SPC> T n to cycle to the next theme in the list (works great
;; with 2 themes variants, one dark and one light) ;; with 2 themes variants, one dark and one light)
dotspacemacs-themes '(monokai dotspacemacs-themes '(monokai spacemacs-dark zenburn solarized-dark)
zenburn)
;; If non nil the cursor color matches the state color. ;; If non nil the cursor color matches the state color.
dotspacemacs-colorize-cursor-according-to-state t dotspacemacs-colorize-cursor-according-to-state t
;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
@ -90,15 +115,17 @@ before layers configuration."
:size 11 :size 11
:weight normal :weight normal
:width normal :width normal
:powerline-scale 1.1) :powerline-scale 1.2)
;; The leader key ;; The leader key
dotspacemacs-leader-key "SPC" dotspacemacs-leader-key "SPC"
;; The leader key accessible in `emacs state' and `insert state' ;; The leader key accessible in `emacs state' and `insert state'
;; (default "M-m")
dotspacemacs-emacs-leader-key "M-m" dotspacemacs-emacs-leader-key "M-m"
;; Major mode leader key is a shortcut key which is the equivalent of ;; Major mode leader key is a shortcut key which is the equivalent of
;; pressing `<leader> m`. Set it to `nil` to disable it. ;; pressing `<leader> m`. Set it to `nil` to disable it. (default ",")
dotspacemacs-major-mode-leader-key "," dotspacemacs-major-mode-leader-key ","
;; Major mode leader key accessible in `emacs state' and `insert state' ;; Major mode leader key accessible in `emacs state' and `insert state'.
;; (default "C-M-m)
dotspacemacs-major-mode-emacs-leader-key "C-M-m" dotspacemacs-major-mode-emacs-leader-key "C-M-m"
;; The command key used for Evil commands (ex-commands) and ;; The command key used for Evil commands (ex-commands) and
;; Emacs commands (M-x). ;; Emacs commands (M-x).
@ -108,73 +135,104 @@ before layers configuration."
;; Location where to auto-save files. Possible values are `original' to ;; 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 ;; 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. ;; file stored in the cache directory and `nil' to disable auto-saving.
;; Default value is `cache'. ;; (default 'cache)
dotspacemacs-auto-save-file-location 'cache dotspacemacs-auto-save-file-location 'cache
;; If non nil then `ido' replaces `helm' for some commands. For now only ;; If non nil then `ido' replaces `helm' for some commands. For now only
;; `find-files' (SPC f f) is replaced. ;; `find-files' (SPC f f), `find-spacemacs-file' (SPC f e s), and
;; `find-contrib-file' (SPC f e c) are replaced. (default nil)
dotspacemacs-use-ido nil dotspacemacs-use-ido nil
;; If non nil, `helm' will try to miminimize the space it uses. (default nil)
dotspacemacs-helm-resize nil
;; if non nil, the helm header is hidden when there is only one source.
;; (default nil)
dotspacemacs-helm-no-header nil
;; define the position to display `helm', options are `bottom', `top',
;; `left', or `right'. (default 'bottom)
dotspacemacs-helm-position 'bottom
;; If non nil the paste micro-state is enabled. When enabled pressing `p` ;; If non nil the paste micro-state is enabled. When enabled pressing `p`
;; several times cycle between the kill ring content. ;; several times cycle between the kill ring content. (default nil)
dotspacemacs-enable-paste-micro-state nil dotspacemacs-enable-paste-micro-state nil
;; Guide-key delay in seconds. The Guide-key is the popup buffer listing ;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystrokes. ;; the commands bound to the current keystroke sequence. (default 0.4)
dotspacemacs-guide-key-delay 0.4 dotspacemacs-which-key-delay 0.4
;; Which-key frame position. Possible values are `right', `bottom' and
;; `right-then-bottom'. right-then-bottom tries to display the frame to the
;; right; if there is insufficient space it displays it at the bottom.
;; (default 'bottom)
dotspacemacs-which-key-position 'bottom
;; If non nil a progress bar is displayed when spacemacs is loading. This ;; If non nil a progress bar is displayed when spacemacs is loading. This
;; may increase the boot time on some systems and emacs builds, set it to ;; may increase the boot time on some systems and emacs builds, set it to
;; nil ;; to boost the loading time. ;; nil to boost the loading time. (default t)
dotspacemacs-loading-progress-bar t dotspacemacs-loading-progress-bar t
;; If non nil the frame is fullscreen when Emacs starts up. ;; If non nil the frame is fullscreen when Emacs starts up. (default nil)
;; (Emacs 24.4+ only) ;; (Emacs 24.4+ only)
dotspacemacs-fullscreen-at-startup nil dotspacemacs-fullscreen-at-startup t
;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen.
;; Use to disable fullscreen animations in OSX." ;; Use to disable fullscreen animations in OSX. (default nil)
dotspacemacs-fullscreen-use-non-native nil dotspacemacs-fullscreen-use-non-native t
;; If non nil the frame is maximized when Emacs starts up. ;; If non nil the frame is maximized when Emacs starts up.
;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil.
;; (Emacs 24.4+ only) ;; (default nil) (Emacs 24.4+ only)
dotspacemacs-maximized-at-startup nil dotspacemacs-maximized-at-startup nil
;; A value from the range (0..100), in increasing opacity, which describes ;; A value from the range (0..100), in increasing opacity, which describes
;; the transparency level of a frame when it's active or selected. ;; the transparency level of a frame when it's active or selected.
;; Transparency can be toggled through `toggle-transparency'. ;; Transparency can be toggled through `toggle-transparency'. (default 90)
dotspacemacs-active-transparency 90 dotspacemacs-active-transparency 90
;; A value from the range (0..100), in increasing opacity, which describes ;; A value from the range (0..100), in increasing opacity, which describes
;; the transparency level of a frame when it's inactive or deselected. ;; the transparency level of a frame when it's inactive or deselected.
;; Transparency can be toggled through `toggle-transparency'. ;; Transparency can be toggled through `toggle-transparency'. (default 90)
dotspacemacs-inactive-transparency 90 dotspacemacs-inactive-transparency 90
;; If non nil unicode symbols are displayed in the mode line. ;; If non nil unicode symbols are displayed in the mode line. (default t)
dotspacemacs-mode-line-unicode-symbols t dotspacemacs-mode-line-unicode-symbols t
;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth
;; scrolling overrides the default behavior of Emacs which recenters the ;; scrolling overrides the default behavior of Emacs which recenters the
;; point when it reaches the top or bottom of the screen. ;; point when it reaches the top or bottom of the screen. (default t)
dotspacemacs-smooth-scrolling t dotspacemacs-smooth-scrolling t
;; If non-nil smartparens-strict-mode will be enabled in programming modes. ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
;; (default nil)
dotspacemacs-smartparens-strict-mode nil dotspacemacs-smartparens-strict-mode nil
;; Select a scope to highlight delimiters. Possible value is `all', ;; Select a scope to highlight delimiters. Possible values are `any',
;; `current' or `nil'. Default is `all' ;; `current', `all' or `nil'. Default is `all' (highlight any scope and
;; emphasis the current one). (default 'all)
dotspacemacs-highlight-delimiters 'all dotspacemacs-highlight-delimiters 'all
;; If non nil advises quit functions to keep server open when quitting. ;; If non nil advises quit functions to keep server open when quitting.
;; (default nil)
dotspacemacs-persistent-server nil dotspacemacs-persistent-server nil
;; List of search tool executable names. Spacemacs uses the first installed ;; List of search tool executable names. Spacemacs uses the first installed
;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'.
;; (default '("ag" "pt" "ack" "grep"))
dotspacemacs-search-tools '("ag" "ack" "grep") dotspacemacs-search-tools '("ag" "ack" "grep")
;; The default package repository used if no explicit repository has been ;; The default package repository used if no explicit repository has been
;; specified with an installed package. ;; specified with an installed package.
;; Not used for now. ;; Not used for now. (default nil)
dotspacemacs-default-package-repository nil dotspacemacs-default-package-repository nil
) ))
;; User initialization goes here
(defun dotspacemacs/user-init ()
"Initialization function for user code.
It is called immediately after `dotspacemacs/init'. You are free to put any
user code."
(setq-default git-magit-status-fullscreen t) (setq-default git-magit-status-fullscreen t)
(setq-default git-enable-github-support t) (setq-default git-enable-github-support t)
(add-to-list 'load-path "~/ghc-mod/elisp") (add-to-list 'load-path "~/ghc-mod/elisp")
;(org-babel-do-load-languages
; 'org-babel-load-languages
; '((haskell . t)
; (emacs-lisp . t)
; (python . t)
; ))
) )
(defun dotspacemacs/config () (defun dotspacemacs/user-config ()
"Configuration function. "Configuration function for user code.
This function is called at the very end of Spacemacs initialization after This function is called at the very end of Spacemacs initialization after
layers configuration." layers configuration. You are free to put any user code."
(display-time-mode 1)
(eyebrowse-setup-opinionated-keys) (eyebrowse-setup-opinionated-keys)
;; (add-hook 'doc-view-mode-hook 'auto-revert-mode) ;; (add-hook 'doc-view-mode-hook 'auto-revert-mode)
;; (setq powerline-default-separator 'nil) ;; (setq org-default-notes-file (concat org-directory "~/Dropbox/Org/org.org"))
(setq ort/prefix-arg-directory "/Users/dustinswan/Dropbox/Org/")
) )
;; Do not write anything past this comment. This is where Emacs will ;; Do not write anything past this comment. This is where Emacs will

Loading…
Cancel
Save