summaryrefslogtreecommitdiff
path: root/spacemacs
diff options
context:
space:
mode:
authorKJ Ørbekk <orbekk@google.com>2016-02-09 16:38:59 -0500
committerKJ Ørbekk <orbekk@google.com>2016-02-09 16:51:53 -0500
commit2719fddaa4b42e45a7d23c196d35d16d7c84a6c5 (patch)
tree28040325cf3fed66eb3f61da116106bd4199cd56 /spacemacs
parent0f3e4b1622ec975c1ec2726e59ae0cf1c9d22ea0 (diff)
Install magit on the spaceship.
Diffstat (limited to 'spacemacs')
-rw-r--r--spacemacs9
1 files changed, 6 insertions, 3 deletions
diff --git a/spacemacs b/spacemacs
index a10746f..4f92f27 100644
--- a/spacemacs
+++ b/spacemacs
@@ -34,7 +34,7 @@ values."
javascript
markdown
haskell
- ;; git
+ git
markdown
org
;; (shell :variables
@@ -42,7 +42,7 @@ values."
;; shell-default-position 'bottom)
spell-checking
;; syntax-checking
- ;; version-control
+ version-control
)
;; List of additional packages that will be installed without being
;; wrapped in a layer. If you need some configuration for these
@@ -54,7 +54,7 @@ values."
;; 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)
- dotspacemacs-delete-orphan-packages t))
+ dotspacemacs-delete-orphan-packages nil))
(defun dotspacemacs/init ()
"Initialization function.
@@ -250,4 +250,7 @@ layers configuration. You are free to put any user code."
(kj-bindings)
(kj-org-config)
(load-file "~/.spacemacs.local")
+ ;; I have been warned about magit stealing my files:
+ (setq magit-last-seen-setup-instructions "1.4.0")
+ (setq-default git-magit-status-fullscreen t)
)