From 96d184c8426d20696ae5b90d00dcca59275e1359 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 9 Oct 2015 17:28:24 -0400 Subject: Add additional languages to spacemacs. --- spacemacs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'spacemacs') diff --git a/spacemacs b/spacemacs index 4a2efb1..85223e5 100644 --- a/spacemacs +++ b/spacemacs @@ -26,6 +26,12 @@ values." ;; auto-completion ;; better-defaults emacs-lisp + shell + c-c++ + haskell + html + javascript + markdown ;; git ;; markdown ;; org @@ -94,7 +100,7 @@ values." :size 20 :weight normal :width normal - :powerline-scale 1.0) + :powerline-scale 1.1) ;; The leader key dotspacemacs-leader-key "SPC" ;; The leader key accessible in `emacs state' and `insert state' @@ -193,6 +199,14 @@ values." "Initialization function for user code. It is called immediately after `dotspacemacs/init'. You are free to put any user code." + ;; bind ctrl-w to backwards-kill-word when no region is selected + (global-set-key (kbd "C-w") 'backward-kill-word-or-kill-region) + + (defun backward-kill-word-or-kill-region (&optional arg) + (interactive "p") + (if (region-active-p) + (kill-region (region-beginning) (region-end)) + (backward-kill-word arg))) ) (defun dotspacemacs/user-config () @@ -200,6 +214,7 @@ user code." This function is called at the very end of Spacemacs initialization after layers configuration. You are free to put any user code." (add-hook 'haskell-mode-hook 'turn-on-haskell-indent) + (setq-default vc-follow-symlinks nil) ) ;; Do not write anything past this comment. This is where Emacs will -- cgit v1.2.3 From 55e42679b93cb40fa01354a5feaeb1f1038b8782 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 10 Oct 2015 15:51:23 -0400 Subject: Spacemacs extra config. --- spacemacs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'spacemacs') diff --git a/spacemacs b/spacemacs index 85223e5..ff95c6f 100644 --- a/spacemacs +++ b/spacemacs @@ -28,18 +28,20 @@ values." emacs-lisp shell c-c++ + semantic haskell html javascript markdown - ;; git + haskell + git ;; markdown ;; org ;; (shell :variables ;; shell-default-height 30 ;; shell-default-position 'bottom) ;; spell-checking - ;; syntax-checking + syntax-checking ;; version-control ) ;; List of additional packages that will be installed without being @@ -48,7 +50,7 @@ values." ;; configuration in `dotspacemacs/config'. dotspacemacs-additional-packages '(haskell-mode) ;; A list of packages and/or extensions that will not be install and loaded. - dotspacemacs-excluded-packages '() + dotspacemacs-excluded-packages '(smartparens) ;; 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'. (default t) @@ -84,8 +86,7 @@ values." ;; 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 '(base16-tomorrow-dark - spacemacs-dark + dotspacemacs-themes '(spacemacs-dark spacemacs-light solarized-light solarized-dark @@ -141,7 +142,7 @@ values." dotspacemacs-enable-paste-micro-state nil ;; 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 + dotspacemacs-which-key-delay 0.2 ;; 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. @@ -214,7 +215,9 @@ user code." This function is called at the very end of Spacemacs initialization after layers configuration. You are free to put any user code." (add-hook 'haskell-mode-hook 'turn-on-haskell-indent) - (setq-default vc-follow-symlinks nil) + (setq-default + vc-follow-symlinks nil + web-mode-code-indent-offset 2) ) ;; Do not write anything past this comment. This is where Emacs will -- cgit v1.2.3 From b3ecc3b33f6bfd4b8e7cc49e6bb2873dc1d36de1 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 10 Oct 2015 19:09:58 -0400 Subject: Add spacemacs nyan-mode. --- spacemacs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'spacemacs') diff --git a/spacemacs b/spacemacs index ff95c6f..3223e41 100644 --- a/spacemacs +++ b/spacemacs @@ -35,8 +35,8 @@ values." markdown haskell git - ;; markdown - ;; org + markdown + org ;; (shell :variables ;; shell-default-height 30 ;; shell-default-position 'bottom) @@ -48,7 +48,7 @@ values." ;; 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'. - dotspacemacs-additional-packages '(haskell-mode) + dotspacemacs-additional-packages '(nyan-mode) ;; A list of packages and/or extensions that will not be install and loaded. dotspacemacs-excluded-packages '(smartparens) ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that @@ -86,7 +86,8 @@ values." ;; 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 '(spacemacs-dark + dotspacemacs-themes '(base16-bright-dark + spacemacs-dark spacemacs-light solarized-light solarized-dark @@ -218,7 +219,7 @@ layers configuration. You are free to put any user code." (setq-default vc-follow-symlinks nil web-mode-code-indent-offset 2) + (nyan-mode) ) - ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. -- cgit v1.2.3