From cbcee601ac2583eb67d5911e54440c58f93b2d9a Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 3 Jul 2016 09:56:54 -0700
Subject: [PATCH] Update, add clipboard, xfce/i3 mix

---
 .bash_aliases             |  4 ++++
 .config/terminator/config |  4 ++--
 .emacs.d/init.el          |  3 ++-
 .i3/config                | 16 ++++++++--------
 .spacemacs                | 11 +++++++++++
 .xinitrc                  |  8 ++++----
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index bef2ba5..7b7b7ca 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -54,6 +54,10 @@ alias tm="tmux -2 attach"
 alias ppjson="python -mjson.tool"
 #alias tmux-pwn='tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t'
 
+# I can never remember the xclip options, so:
+alias setclip='xclip -selection c'
+alias getclip='xclip -selection clipboard -o'
+
 #machines
 alias lear="ssh -D 7777 -Y barak@lear.barakmich.com"
 alias hero="ssh -D 7777 -Y barak@hero.barakmich.com"
diff --git a/.config/terminator/config b/.config/terminator/config
index 0c7d1e1..52c2ce1 100644
--- a/.config/terminator/config
+++ b/.config/terminator/config
@@ -26,7 +26,7 @@
     background_darkness = 0.8
     background_image = None
     background_type = transparent
-    font = Droid Sans Mono Dotted 16
+    font = Droid Sans Mono Dotted 14
     foreground_color = "#ffffff"
     scroll_on_output = False
     scrollback_infinite = True
@@ -57,7 +57,7 @@
     background_darkness = 0.8
     background_image = None
     background_type = transparent
-    font = Inconsolata Medium 26
+    font = Droid Sans Mono Dotted 14
     foreground_color = "#ffffff"
     scrollback_infinite = True
     scrollbar_position = hidden
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4161b8b..780e7e3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -13,7 +13,8 @@
 ;; (package-initialize)
 
 (setq gc-cons-threshold 100000000)
-(defconst spacemacs-version         "0.105.20" "Spacemacs version.")
+
+(defconst spacemacs-version         "0.105.21" "Spacemacs version.")
 (defconst spacemacs-emacs-min-version   "24.3" "Minimal version of Emacs.")
 
 (if (not (version<= spacemacs-emacs-min-version emacs-version))
diff --git a/.i3/config b/.i3/config
index 7c128c9..d5c831e 100644
--- a/.i3/config
+++ b/.i3/config
@@ -15,7 +15,7 @@ set $mod Mod1
 # is used in the bar {} block below.
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 10 
+font pango:DejaVu Sans Mono 13
 # Before i3 v4.8, we used to recommend this one as the default:
 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
@@ -195,10 +195,10 @@ bindsym $mod+t mode "moveworkspace"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-bar {
-#        status_command i3status
-        status_command i3-wrapper
-        position top
-        tray_output primary
-}
-
+#bar {
+##        status_command i3status
+        #status_command i3-wrapper
+        #position top
+        #tray_output primary
+#}
+exec --no-startup-id xfce4-panel --disable-wm-check
diff --git a/.spacemacs b/.spacemacs
index 5c0a27c..a0d757b 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -38,6 +38,7 @@ values."
             shell-default-term-shell "/bin/zsh")
      ;; spell-checking
      python
+     yaml
      syntax-checking
      (version-control :variables
                       version-control-diff-tool 'diff-hl
@@ -312,6 +313,16 @@ BUFFER may be either a buffer or its name (a string)."
   (add-to-list 'default-frame-alist '(alpha 85 85))
 
   (setq diff-hl-side 'left)
+  (defun cleanup-org-tables ()
+    (save-excursion
+      (goto-char (point-min))
+      (while (search-forward "-+-" nil t) (replace-match "-|-"))
+      ))
+
+  (add-hook 'markdown-mode-hook 'orgtbl-mode)
+  (add-hook 'markdown-mode-hook
+            (lambda()
+              (add-hook 'after-save-hook 'cleanup-org-tables  nil 'make-it-local)))
 
 )
 
diff --git a/.xinitrc b/.xinitrc
index 1cd3ccf..a21d7f9 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 export PATH=$HOME/bin:$PATH
+xfsettingsd &
 xrdb -merge .Xdefaults &
 
 #gnome-settings-daemon & 
@@ -16,14 +17,13 @@ synclient PalmDetect=1
 # Running a really minimal arch system? This helps:
 
 /usr/lib/xfce4/notifyd/xfce4-notifyd &
-xfsettingsd &
 pulseaudio --start &
 blueman-applet &
 #wicd-gtk --tray &
 
-#if [ -f ~/.xrandrrc ]; then
-    #~/.xrandrrc
-#fi
+if [ -f ~/.xrandrrc ]; then
+    ~/.xrandrrc
+fi
 
 ~/.fehbg &
 if command -v compton &>/dev/null; then