Merge xmonad config.

3 files changed, 17 insertions, 2 deletions

diff --git a/i3/config b/i3/config
index 564a45a..ab47118 100644
--- a/i3/config
+++ b/i3/config
@@ -73,6 +73,11 @@ bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
+bindsym $mod+apostrophe workspace 1
+bindsym $mod+comma workspace 2
+bindsym $mod+period workspace 3
+bindsym $mod+p workspace 4
+bindsym $mod+y workspace 5
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move workspace 1
@@ -144,7 +149,7 @@ mode "resize" {
 # finds out, if available)
 bar {
         status_command i3blocks || i3status
-        font xft:Droid Sans Mono 8
+        font xft:Source Code Pro 10
 }
 
 exec xrdb -merge $HOME/.Xresources
@@ -153,5 +158,7 @@ exec $HOME/bin/keyboard_setup.sh
 exec $HOME/bin/local.sh
 exec xbindkeys
 exec xset -b
+exec nm-applet &
 exec google-chrome &
 exec xautolock -time 10 -locker 'i3lock -c 2A3462' &
+exec redshift -l 40:-70 -r -t 5500:3700 &
diff --git a/i3status.conf b/i3status.conf
index 0b3b483..8d4744d 100644
--- a/i3status.conf
+++ b/i3status.conf
@@ -11,6 +11,7 @@ order += "disk /"
 #order += "run_watch VPN"
 order += "wireless wlp4s0"
 order += "ethernet enp0s25"
+order += "battery 1"
 order += "battery 0"
 order += "cpu_temperature 0"
 order += "load"
@@ -37,6 +38,13 @@ ethernet enp0s25 {
         format_down = ""
 }
 
+battery 1 {
+        last_full_capacity = true
+        low_threshold = 15
+        threshold_type = time
+        format = "%status %percentage %remaining (%consumption)"
+}
+
 battery 0 {
         last_full_capacity = true
         low_threshold = 15
diff --git a/spacemacs b/spacemacs
index f6493f1..cefea53 100644
--- a/spacemacs
+++ b/spacemacs
@@ -245,7 +245,7 @@ user code."
    '(("t" "Todo" entry (file+headline "~/org/in.org" "Tasks")
       "* TODO %?")))
   (eval-after-load "org" '(require 'ox-md nil t))
-  (global-git-commit-mode t)
+  ; (global-git-commit-mode t)
   )
 
 (defun mu4e-config ()