commit 82d9f469d33c7a9ba4b2a97ec86bf3f2b4689583
parent 5db62bbb004a22181a444cb15112ec02389f8011
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Mon, 28 Sep 2015 14:10:54 +0200
fix missing string delimiter
Diffstat:
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/.spacemacs b/.spacemacs
@@ -20,7 +20,7 @@
better-defaults
git
github
- diff-hl
+ ;diff-hl
markdown
org
syntax-checking
@@ -31,9 +31,10 @@
lua
shell
shell-scripts
- yasnippet
+ ;yasnippet
osx
tmux
+ themes-megapack
)
;; A list of packages and/or extensions that will not be install and loaded.
dotspacemacs-excluded-packages '()
@@ -70,11 +71,11 @@ before layers configuration."
;; 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
;; with 2 themes variants, one dark and one light)
- ;dotspacemacs-themes '(solarized-dark
- ;solarized-light
- ;leuven
- ;monokai
- ;zenburn)
+ dotspacemacs-themes '(solarized-dark
+ solarized-light
+ leuven
+ monokai
+ zenburn)
;; If non nil the cursor color matches the state color.
dotspacemacs-colorize-cursor-according-to-state t
;; Default font. `powerline-scale' allows to quickly tweak the mode-line
@@ -170,7 +171,8 @@ layers configuration."
(setq-default tab-width 4)
(setq c-default-style "linux" c-basic-offset 4)
- ;(custom-set-faces (if (not window-system) '(default ((t (:background "nil"))))))
+ ;; disable background color in terminal
+ (custom-set-faces (if (not window-system) '(default ((t (:background "nil"))))))
;; text lines limit to 80 characters
(setq fill-column 80)
diff --git a/.tmux.conf b/.tmux.conf
@@ -44,7 +44,7 @@ bind -r L resize-pane -R 5
bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$|emacs.*$' && tmux send-keys C-h) || tmux select-pane -L"
bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$|emacs.*$' && tmux send-keys C-j) || tmux select-pane -D"
bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$|emacs.*$' && tmux send-keys C-k) || tmux select-pane -U"
-bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$|emacs.*$' && tmux send-keys C-l) || tmux select-pane -R
+bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$|emacs.*$' && tmux send-keys C-l) || tmux select-pane -R"
# split window
bind v split-window -v
diff --git a/.vimrc b/.vimrc
@@ -297,7 +297,7 @@ let mapleader="\<Space>"
nmap <leader>r :source $MYVIMRC<CR>
" Shortcut to switch background color
-"nmap <leader>w :ToggleBG<CR>
+nmap <leader>W :ToggleBG<CR>
" Save file
nmap <Leader>w :w<CR>