diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..d1e8d42
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,16 @@
+[user]
+	name = J.Fernando Sánchez
+	email = balkian@gmail.com
+[diff]
+	tool = vimdiff
+[alias]
+	d = difftool
+[github]
+	user = balkian
+[color]
+	ui = always
+
+[alias]
+lg1 = log --graph --all --format=format:'%C(yellow)%h%C(reset) - %C(green)(%ad)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative
+lg2 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(bold white)— %an%C(reset)' --abbrev-commit
+lg = !"git lg1"
diff --git a/xinitrc b/xinitrc
new file mode 100755
index 0000000..adaf98b
--- /dev/null
+++ b/xinitrc
@@ -0,0 +1,2 @@
+setxkbmap -option ctrl:nocaps
+#caps:swapescape