dotfiles

commit 1f3f18e581a252c71dc279495076a0f7fe4a9b6c
parent d1fdd1d99514aafeb9b4607890356a1de675ca49
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Sat, 12 Jul 2014 14:04:51 +0200

add solarized-dark

Diffstat:
M
.emacs.d/init.el
 | 
19
+++++++++++++------
M
.i3/config
 | 
1
+
A
bin/solarized-dark.sh
 | 
2
++
A
bin/solarized-light.sh
 | 
2
++

4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -110,6 +110,8 @@
   "p" 'org-latex-export-to-pdf
   "c" 'compile
   "g" 'magit-commit
+  "w" 'color-theme-solarized-light
+  "d" 'color-theme-solarized-dark
   "i" (lambda () (interactive)(find-file "~/.emacs.d/init.el"))
   "t" (lambda () (interactive)(find-file "~/owncloud/todo.org")))
 
@@ -387,13 +389,18 @@
 
 ;; font config
 (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.
+ '(custom-safe-themes (quote ("1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" default)))
  '(send-mail-function (quote smtpmail-send-it)))
 (custom-set-faces
- '(default ((t (:inherit nil :stipple nil :background "#002b36" :foreground
-                         "#839496" :inverse-video nil :box nil :strike-through
-                         nil :overline nil :underline nil :slant normal :weight
-                         normal :height 128 :width normal :foundry "unknown"
-                         :family "termsyn")))))
+ ;; 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 (:inherit nil :stipple nil :background "#002b36" :foreground "#839496" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 128 :width normal :foundry "unknown" :family "termsyn")))))
 ;; choose your own fonts, in a system dependant way
 (if (string-match "apple-darwin" system-configuration)
   (set-face-font 'default "Monaco-11"))     ; os x
@@ -404,4 +411,4 @@
 (put 'dired-find-alternate-file 'disabled nil)
 
 ;; do not apply background color in terminal
-(custom-set-faces (if (not window-system) '(default ((t (:background "nil"))))))
+
diff --git a/.i3/config b/.i3/config
@@ -88,6 +88,7 @@ bindsym $mod+Shift+s exec mpc stop
 
 # Light X colors
 bindsym $mod+Shift+w exec --no-startup-id /home/adc/bin/solarized-light.sh
+bindsym $mod+Shift+d exec --no-startup-id /home/adc/bin/solarized-light.sh
 
 # screen lock
 bindsym $mod+z exec /home/adc/bin/zzz
diff --git a/bin/solarized-dark.sh b/bin/solarized-dark.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrdb -merge $HOME/.colors/solarized
diff --git a/bin/solarized-light.sh b/bin/solarized-light.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrdb -merge $HOME/.colors/solarized_light