From b15e91889048f8e30bb811baedc94abef183362d Mon Sep 17 00:00:00 2001
From: Abhay Rana <me@captnemo.in>
Date: Wed, 21 Dec 2016 17:17:50 +0530
Subject: [PATCH] Random updates

---
 files/bash/.bashrc                            |  1 +
 files/dl/.wgetrc                              |  3 +-
 .../conf.d/10-powerline-symbols.conf          | 36 +++++++++++++++++++
 files/git/.gitconfig                          |  2 ++
 files/i3/.config/i3status/config              |  7 +++-
 files/snippets/.snippy/help                   |  2 +-
 files/ssh/.ssh/config.d/public                |  5 ++-
 files/x11/.xinitrc                            |  1 +
 8 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/files/bash/.bashrc b/files/bash/.bashrc
index 2fef705..e0b9f29 100644
--- a/files/bash/.bashrc
+++ b/files/bash/.bashrc
@@ -279,6 +279,7 @@ alias sd='fasd -sid'     # interactive directory selection
 alias sf='fasd -sif'     # interactive file selection
 alias z='fasd_cd -d'     # cd, same functionality as j in autojump
 alias zz='fasd_cd -d -i' # cd with interactive selection
+alias vim='nvim'
 
 
 ##### History Shenanigans
diff --git a/files/dl/.wgetrc b/files/dl/.wgetrc
index 86138c8..3cec5df 100644
--- a/files/dl/.wgetrc
+++ b/files/dl/.wgetrc
@@ -34,5 +34,4 @@ robots = off
 # Print the HTTP and FTP server responses
 #server_response = off
 
-# Disguise as IE 9 on Windows 7
-user_agent = Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)
+user_agent = Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2873.0 Safari/537.36
diff --git a/files/fonts/.config/fontconfig/conf.d/10-powerline-symbols.conf b/files/fonts/.config/fontconfig/conf.d/10-powerline-symbols.conf
index 7c23e0b..7e34a12 100644
--- a/files/fonts/.config/fontconfig/conf.d/10-powerline-symbols.conf
+++ b/files/fonts/.config/fontconfig/conf.d/10-powerline-symbols.conf
@@ -10,6 +10,18 @@
 		<family>Droid Sans Mono</family>
 		<prefer><family>PowerlineSymbols</family></prefer>
 	</alias>
+	<alias>
+		<family>Droid Sans Mono Slashed</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Droid Sans Mono Dotted</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>DejaVu Sans Mono</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
 	<alias>
 		<family>DejaVu Sans Mono</family>
 		<prefer><family>PowerlineSymbols</family></prefer>
@@ -66,4 +78,28 @@
 		<family>Ubuntu Mono</family>
 		<prefer><family>PowerlineSymbols</family></prefer>
 	</alias>
+	<alias>
+		<family>Meslo LG L</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Meslo LG L DZ</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Meslo LG M</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Meslo LG M DZ</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Meslo LG S</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
+	<alias>
+		<family>Meslo LG S DZ</family>
+		<prefer><family>PowerlineSymbols</family></prefer>
+	</alias>
 </fontconfig>
diff --git a/files/git/.gitconfig b/files/git/.gitconfig
index 900d132..715c2db 100644
--- a/files/git/.gitconfig
+++ b/files/git/.gitconfig
@@ -20,6 +20,7 @@
     co  = checkout
     ci  = commit
     from = "! git fetch origin; git rebase origin/master"
+    frum = "! git fetch upstream; git rebase upstream/master"
 
 [rerere]
     enabled = true
@@ -51,3 +52,4 @@
 [core]
     # https://github.com/so-fancy/diff-so-fancy
     pager = diff-so-fancy | less --tabs=4 -RFX
+	preloadindex = true
diff --git a/files/i3/.config/i3status/config b/files/i3/.config/i3status/config
index 91c3eec..f5d1d6e 100644
--- a/files/i3/.config/i3status/config
+++ b/files/i3/.config/i3status/config
@@ -14,13 +14,14 @@ general {
 #order += "ipv6"
 order += "external_script cmus"
 order += "disk /home"
+order += "disk /"
 order += "bluetooth"
 #order += "weather_yahoo"
 #order += "run_watch DHCP"
 #order += "run_watch VPN"
 order += "wireless _first_"
 #order += "ethernet _first_"
-order += "battery_level"
+#order += "battery_level"
 # order += "load"
 order += "tztime local"
 
@@ -73,6 +74,10 @@ disk "/home" {
     format = "%avail"
 }
 
+disk "/" {
+    format = "%avail"
+}
+
 weather_yahoo {
     city_code = "INKA0686"
 }
diff --git a/files/snippets/.snippy/help b/files/snippets/.snippy/help
index f60cd70..cbbf9f7 100644
--- a/files/snippets/.snippy/help
+++ b/files/snippets/.snippy/help
@@ -1 +1 @@
-/sk How may I help you?
+/sk Hi, how may I help you?
diff --git a/files/ssh/.ssh/config.d/public b/files/ssh/.ssh/config.d/public
index df29e79..14f2915 100644
--- a/files/ssh/.ssh/config.d/public
+++ b/files/ssh/.ssh/config.d/public
@@ -18,4 +18,7 @@ Host koding
   HostName vm-0.captn3m0.koding.kd.io
   ProxyCommand ssh %r@ssh.koding.com nc %h %p
   Protocol 2
-  ServerAliveInterval 60
\ No newline at end of file
+  ServerAliveInterval 60
+
+Host 35.*.*.*
+  User abhay
diff --git a/files/x11/.xinitrc b/files/x11/.xinitrc
index 94280c7..01486bf 100755
--- a/files/x11/.xinitrc
+++ b/files/x11/.xinitrc
@@ -1,4 +1,5 @@
 #!/bin/sh
 xrdb ~/.Xresources
 xset -b
+export PATH="${PATH}:/home/nemo/.nvm/versions/node/v6.7.0/bin:/home/nemo/projects/scripts"
 exec i3