From f1221bbe3b78d5bc910f9e66ba3db4fe95411d3a Mon Sep 17 00:00:00 2001
From: Vasili Svirydau <vsviridov@exceede.com>
Date: Wed, 24 Jun 2015 18:47:51 -0700
Subject: [PATCH] changed stuff

---
 gitconfig | 17 ++++++++++++++++-
 htoprc    | 22 ++++++++++++++++++++++
 tmux.conf |  1 +
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 htoprc

diff --git a/gitconfig b/gitconfig
index 95abae9..c0163b8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,21 @@
 [user]
 	name = Vasili Svirydau
-	email = vasili.svirydau@move.com
+	email = vsviridov@exceede.com
 
 [push]
     default = simple
+[difftool "bcompare-mac"]
+    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare"\"
+[mergetool "bcompare-mac"]
+    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
+    trustExitCode = true
+
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+    # path =
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+
+[core]
+	editor = /usr/bin/vim
diff --git a/htoprc b/htoprc
new file mode 100644
index 0000000..8858044
--- /dev/null
+++ b/htoprc
@@ -0,0 +1,22 @@
+# Beware! This file is rewritten every time htop exits.
+# The parser is also very primitive, and not human-friendly.
+# (I know, it's in the todo list).
+fields=0 48 17 18 38 39 40 2 46 47 49 1 
+sort_key=47
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=1
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=0
+header_margin=1
+detailed_cpu_time=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory Swap 
+left_meter_modes=1 1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2 
diff --git a/tmux.conf b/tmux.conf
index 4fe6741..58ec45e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,4 @@
+set -g default-command "reattach-to-user-namespace -l $SHELL"
 set -g default-terminal "screen-256color"
 set -g base-index 1
 if-shell '[ "$(tmux -V | awk '{print $2*10}')" -ge 17 ]' 'set -g pane-base-index 1'