From 54026850efdd5bc96260d97add0f4f905710002e Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Tue, 30 Jan 2018 11:50:56 -0800
Subject: [PATCH] add some fish aliases, git aliases, and update atom config

---
 atom/.atom/config.cson              |  4 ++++
 fish/.config/fish/config.fish       |  1 +
 fish/.config/fish/functions/vi.fish |  4 ++++
 git/.gitconfig                      | 17 +++++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 fish/.config/fish/functions/vi.fish
 create mode 100644 git/.gitconfig

diff --git a/atom/.atom/config.cson b/atom/.atom/config.cson
index a32df95..524fd5a 100644
--- a/atom/.atom/config.cson
+++ b/atom/.atom/config.cson
@@ -34,6 +34,7 @@
     tabLength: 4
   "exception-reporting":
     userId: "c6ecdfe6-c496-4331-937d-5bb16acf637e"
+  "highlight-selected": {}
   jekyll: {}
   "markdown-preview":
     useGitHubStyle: true
@@ -62,6 +63,9 @@
   editor:
     softWrapHangingIndent: 2
     tabType: "soft"
+".python.source":
+  editor:
+    autoIndentOnPaste: true
 ".sass.source":
   editor:
     softWrapHangingIndent: 2
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 46ed9e8..5903d2c 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -18,3 +18,4 @@ set FLCLR_USER_FG           white
 set -gx GCC_COLORS 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 set -gx CLICOLOR 1
 set -gx LSCOLORS 'ExcxdxfxgxxexcxdxfBxBx'
+
diff --git a/fish/.config/fish/functions/vi.fish b/fish/.config/fish/functions/vi.fish
new file mode 100644
index 0000000..b6d5ad1
--- /dev/null
+++ b/fish/.config/fish/functions/vi.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 0
+function vi --description 'alias vi vim'
+	vim  $argv;
+end
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..13f3da8
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,17 @@
+[user]
+	name = drewcassidy
+	email = drewcassidy@me.com
+	signingkey = 8FD477A1
+[core]
+	autocrlf = input
+[commit]
+	gpgsign = true
+[gpg]
+	program = /usr/local/bin/gpg
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[alias]
+	tree = log --all --decorate --oneline --graph