summaryrefslogtreecommitdiff
path: root/spacemacs
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-09 17:28:24 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-09 17:28:24 -0400
commit96d184c8426d20696ae5b90d00dcca59275e1359 (patch)
tree652aa127d45b2dc354d667463b6903694e813194 /spacemacs
parent616b70ba670b0e43a4411267f3ac99431f866354 (diff)
Add additional languages to spacemacs.
Diffstat (limited to 'spacemacs')
-rw-r--r--spacemacs17
1 files changed, 16 insertions, 1 deletions
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