diff --git a/.spacemacs b/.spacemacs index 415ca29..c80c9f0 100644 --- a/.spacemacs +++ b/.spacemacs @@ -3,8 +3,14 @@ ;; It must be stored in your home directory. (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 + ;; 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. ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') dotspacemacs-configuration-layer-path '() @@ -23,167 +29,227 @@ git markdown org - osx (shell :variables shell-default-height 30 shell-default-position 'bottom) + spell-checking syntax-checking - version-control + ;; version-control puppet themes-megapack ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these - ;; packages then consider to create a layer, you can also put the - ;; configuration in `dotspacemacs/config'. + ;; packages, then consider creating a layer. You can also put the + ;; configuration in `dotspacemacs/user-config'. dotspacemacs-additional-packages '() ;; A list of packages and/or extensions that will not be install and loaded. dotspacemacs-excluded-packages '() ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that ;; 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)) (defun dotspacemacs/init () "Initialization function. 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 ;; spacemacs settings. (setq-default - ;; Either `vim' or `emacs'. Evil is always enabled but if the variable - ;; is `emacs' then the `holy-mode' is enabled at startup. + ;; If non nil ELPA repositories are contacted via HTTPS whenever it's + ;; possible. Set it to nil if you have no way to use HTTPS in your + ;; environment, otherwise it is strongly recommended to let it set to t. + ;; This variable has no effect if Emacs is launched with the parameter + ;; `--insecure' which forces the value of this variable to nil. + ;; (default t) + dotspacemacs-elpa-https t + ;; Maximum allowed time in seconds to contact an ELPA repository. + dotspacemacs-elpa-timeout 5 + ;; If non nil then spacemacs will check for updates at startup + ;; when the current branch is not `develop'. (default t) + dotspacemacs-check-for-update t + ;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the + ;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid' + ;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil + ;; unchanged. (default 'vim) dotspacemacs-editing-style 'vim - ;; If non nil output loading progress in `*Messages*' buffer. + ;; If non nil output loading progress in `*Messages*' buffer. (default nil) dotspacemacs-verbose-loading nil ;; Specify the startup banner. Default value is `official', it displays ;; the official spacemacs logo. An integer value is the index of text ;; banner, `random' chooses a random text banner in `core/banners' ;; directory. A string value must be a path to an image format supported ;; 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 ;; 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) + ;; Number of recent files to show in the startup buffer. Ignored if + ;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5) + dotspacemacs-startup-recent-list-size 5 + ;; Default major mode of the scratch buffer (default `text-mode') + dotspacemacs-scratch-mode 'text-mode ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press T n to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) - dotspacemacs-themes '( - smyx - subatomic256 - inkpot - spacemacs-dark - spacemacs-light - solarized-light - solarized-dark - leuven - monokai - zenburn) - ;; If non nil the cursor color matches the state color. + dotspacemacs-themes '(smyx + monokai) + ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. - ;dotspacemacs-default-font '("Source Code Pro" - ; :size 13 - ; :weight normal - ; :width normal - ; :powerline-scale 1.1) + dotspacemacs-default-font '("Liberation Mono for Powerline" + :size 26 + ;;:size ,(if (eq window-system 'x) + ;; 26 + ;; 13 + ;; ) + :weight normal + :width normal + :powerline-scale 1.1) ;; The leader key dotspacemacs-leader-key "SPC" ;; The leader key accessible in `emacs state' and `insert state' + ;; (default "M-m") dotspacemacs-emacs-leader-key "M-m" ;; Major mode leader key is a shortcut key which is the equivalent of - ;; pressing ` m`. Set it to `nil` to disable it. + ;; pressing ` m`. Set it to `nil` to disable it. (default ",") 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" + ;; These variables control whether separate commands are bound in the GUI to + ;; the key pairs C-i, TAB and C-m, RET. + ;; Setting it to a non-nil value, allows for separate commands under + ;; and TAB or and RET. + ;; In the terminal, these pairs are generally indistinguishable, so this only + ;; works in the GUI. (default nil) + dotspacemacs-distinguish-gui-tab nil + ;; (Not implemented) dotspacemacs-distinguish-gui-ret nil ;; The command key used for Evil commands (ex-commands) and ;; Emacs commands (M-x). ;; By default the command key is `:' so ex-commands are executed like in Vim ;; with `:' and Emacs commands are executed with ` :'. dotspacemacs-command-key ":" + ;; If non nil `Y' is remapped to `y$'. (default t) + dotspacemacs-remap-Y-to-y$ t + ;; Name of the default layout (default "Default") + dotspacemacs-default-layout-name "Default" + ;; If non nil the default layout name is displayed in the mode-line. + ;; (default nil) + dotspacemacs-display-default-layout nil + ;; If non nil then the last auto saved layouts are resume automatically upon + ;; start. (default nil) + dotspacemacs-auto-resume-layouts nil ;; 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 ;; file stored in the cache directory and `nil' to disable auto-saving. - ;; Default value is `cache'. + ;; (default 'cache) dotspacemacs-auto-save-file-location 'cache + ;; Maximum number of rollback slots to keep in the cache. (default 5) + dotspacemacs-max-rollback-slots 5 ;; 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 + ;; If non nil, `helm' will try to minimize the space it uses. (default nil) + dotspacemacs-helm-resize t + ;; 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` - ;; several times cycle between the kill ring content. + ;; several times cycle between the kill ring content. (default nil) dotspacemacs-enable-paste-micro-state nil - ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing - ;; the commands bound to the current keystrokes. - dotspacemacs-guide-key-delay 0.4 + ;; Which-key delay in seconds. The which-key buffer is the popup listing + ;; the commands bound to the current keystroke sequence. (default 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 'right ;; 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 - ;; nil ;; to boost the loading time. + ;; nil to boost the loading time. (default 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) dotspacemacs-fullscreen-at-startup nil ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. - ;; Use to disable fullscreen animations in OSX." - ;dotspacemacs-fullscreen-use-non-native nil + ;; Use to disable fullscreen animations in OSX. (default nil) + dotspacemacs-fullscreen-use-non-native nil ;; If non nil the frame is maximized when Emacs starts up. ;; 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 ;; A value from the range (0..100), in increasing opacity, which describes ;; 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 ;; A value from the range (0..100), in increasing opacity, which describes ;; 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 - ;; 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 ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; 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 + ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' + ;; derivatives. If set to `relative', also turns on relative line numbers. + ;; (default nil) + dotspacemacs-line-numbers nil ;; If non-nil smartparens-strict-mode will be enabled in programming modes. + ;; (default nil) dotspacemacs-smartparens-strict-mode nil ;; Select a scope to highlight delimiters. Possible values are `any', ;; `current', `all' or `nil'. Default is `all' (highlight any scope and - ;; emphasis the current one). + ;; emphasis the current one). (default 'all) dotspacemacs-highlight-delimiters 'all ;; If non nil advises quit functions to keep server open when quitting. + ;; (default nil) 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'. + ;; (default '("ag" "pt" "ack" "grep")) dotspacemacs-search-tools '("ag" "pt" "ack" "grep") ;; The default package repository used if no explicit repository has been ;; specified with an installed package. - ;; Not used for now. + ;; Not used for now. (default nil) dotspacemacs-default-package-repository nil - ) - ;; User initialization goes here - (setq-default - ns-use-native-fullscreen nil - ;; ;; If non nil pressing 'jk' in insert state, ido or helm will activate the - ;; ;; evil leader. - ;; dotspacemacs-feature-toggle-leader-on-jk nil - ;; ;; Paradox github integration - ;; paradox-github-token "..." - ;; ;; Always show trailing whitespace - ;; show-trailing-whitespace t - ;; ;; Fix paren/quote matching - ;; sp-cancel-autoskip-on-backward-movement nil + ;; Delete whitespace while saving buffer. Possible values are `all' + ;; to aggressively delete empty line and long sequences of whitespace, + ;; `trailing' to delete only the whitespace at end of lines, `changed'to + ;; delete only whitespace for changed lines or `nil' to disable cleanup. + ;; (default nil) + dotspacemacs-whitespace-cleanup nil + )) +(defun dotspacemacs/user-init () + "Initialization function for user code. +It is called immediately after `dotspacemacs/init'. You are free to put almost +any user code here. The exception is org related code, which should be placed +in `dotspacemacs/user-config'." + ;; (setq-default ;; Custom font - dotspacemacs-default-font `("Liberation Mono for Powerline" - :size ,(if (eq window-system 'x) - 26 - 13 - ) - :weight normal - :width normal - :powerline-scale 1.4) - ) + ;; dotspacemacs-default-font `("Liberation Mono for Powerline" + ;; :size ,(if (eq window-system 'x) + ;; 26 + ;; 13 + ;; ) + ;; :weight normal + ;; :width normal + ;; :powerline-scale 1.4) + ;; ) ;; Set to the location of your Org files on your local system ;; (setq org-directory "~/org") ;; (setq org-mobile-inbox-for-pull "~/org/inbox.org") @@ -196,43 +262,31 @@ before layers configuration." ;; (setq eshell-review-quick-commands nil) ;; (setq eshell-smart-space-goes-to-end t) ;; (setq eshell-scroll-to-bottom-on-input t) + (spacemacs/toggle-mode-line-battery-on) ;; Configure colors for the powerline - ;(setq ns-use-srgb-colorspace t) + ;(setq ns-use-srgb-colorspace t) ;; undo-tree history across restarts - (setq undo-tree-history-directory-alist - `((".*" . ,(concat spacemacs-cache-directory "undo-tree-history")))) - (setq undo-tree-auto-save-history t) + ;; (setq undo-tree-history-directory-alist + ;; `((".*" . ,(concat spacemacs-cache-directory "undo-tree-history")))) + ;; (setq undo-tree-auto-save-history t) ;; Don't use the clipboard please - (setq select-enable-clipboard nil) + ;; (setq select-enable-clipboard nil) ;; Don't show the menu bar on the terminal - (setq menu-bar-mode nil) - ;; ;; Bind to the correct mac keys - ;; ;(setq mac-option-modifier 'meta) - ;; ;(setq mac-command-modifier 'super) - ;; ;(setq mac-pass-control-to-system nil) - ;; ;(global-set-key (kbd "s-q") 'save-buffers-kill-emacs) - ;; ;(global-set-key (kbd "s-v") 'yank) - ;; ;(global-set-key (kbd "s-c") 'copy-region-as-kill) - - ;; ;; Set transparency of emacs - ;; (defun transparency (value) - ;; "Sets the transparency of the frame window. 0=transparent/100=opaque" - ;; (interactive "nTransparency Value 0 - 100 opaque:") - ;; (set-frame-parameter (selected-frame) 'alpha value)) - + ;; (setq menu-bar-mode nil) ) -(defun dotspacemacs/config () - "Configuration function. - This function is called at the very end of Spacemacs initialization after -layers configuration." +(defun dotspacemacs/user-config () + "Configuration function for user code. +This function is called at the very end of Spacemacs initialization after +layers configuration. You are free to put any user code." ;; Make C-g work like ;(define-key evil-normal-state-map "\C-g" 'evil-normal-state) ;(define-key evil-visual-state-map "\C-g" 'evil-normal-state) ;(define-key evil-insert-state-map "\C-g" 'evil-normal-state) (define-key evil-visual-state-map "\C-c" 'evil-normal-state) (define-key evil-insert-state-map "\C-c" 'evil-normal-state) + (define-key evil-hybrid-state-map "\C-c" 'evil-normal-state) (define-key evil-normal-state-map "\C-h" 'evil-window-left) (define-key evil-normal-state-map "\C-j" 'evil-window-down) (define-key evil-normal-state-map "\C-k" 'evil-window-up) @@ -242,32 +296,15 @@ layers configuration." ;(define-key global-map "\\v" 'helm-projectile-find-file) ;(define-key global-map "\\c" 'helm-projectile-switch-project) ;(define-key global-map "\\b" 'helm-mini) - (setq powerline-default-separator (if (eq window-system 'x) - 'arrow - nil - )) + ;; (setq powerline-default-separator (if (eq window-system 'x) + ;; 'arrow + ;; nil + ;; )) ;;(smartparens-global-mode f) ;; Relative line numbers by default ;(linum-relative-toggle) ;(global-linum-mode t) -) + ) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. -(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. - '(package-selected-packages - (quote - (pbcopy launchctl zonokai-theme zenburn-theme zen-and-art-theme window-numbering volatile-highlights vi-tilde-fringe underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme 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 stekene-theme spray spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle shell-pop seti-theme rfringe reverse-theme rainbow-delimiters purple-haze-theme puppetfile-mode puppet-mode professional-theme powerline popwin planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme pcre2el pastels-on-dark-theme paradox page-break-lines organic-green-theme org-repo-todo org-present org-pomodoro org-bullets open-junk-file oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc magit-gitflow macrostep lush-theme linum-relative light-soap-theme leuven-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hungry-delete htmlize highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme helm-unicode helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-gitignore helm-flyspell helm-descbinds helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md gandalf-theme fringe-helper flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-terminal-cursor-changer evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-matchit evil-lisp-state evil-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help elisp-slime-nav django-theme diff-hl define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme company-statistics company-quickhelp colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme birds-of-paradise-plus-theme auto-yasnippet auto-highlight-symbol auto-dictionary apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-mode ac-ispell auto-complete avy names pos-tip company anzu iedit smartparens highlight flx flycheck popup yasnippet request gitignore-mode projectile helm helm-core async parent-mode magit magit-popup git-commit with-editor markdown-mode alert log4e gntp spinner pkg-info epl evil-leader evil which-key quelpa package-build use-package bind-key s dash spacemacs-theme))) - '(ring-bell-function (quote ignore))) -(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 "#1c1c1c" :foreground "#d7d7d7")))) - '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) - '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))