From ace4219a0d784b8272cb314bc57d7ad35289aedd Mon Sep 17 00:00:00 2001
From: Colin Henry <jchenry@users.noreply.github.com>
Date: Sun, 8 May 2022 09:25:07 -0700
Subject: [PATCH] added git configuration and a small fix to tmux

---
 .gitignore           |  2 ++
 git/config           | 22 ++++++++++++
 git/gitignore_global | 86 ++++++++++++++++++++++++++++++++++++++++++++
 tmux/tmux.conf       |  3 ++
 4 files changed, 113 insertions(+)
 create mode 100755 git/config
 create mode 100755 git/gitignore_global

diff --git a/.gitignore b/.gitignore
index c97e58f..7f21f56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
 !scripts/*
 !nano/*
 !x11/**
+!git/*
 !starship.toml
+
 #directory catchall
 !*/
\ No newline at end of file
diff --git a/git/config b/git/config
new file mode 100755
index 0000000..612b70f
--- /dev/null
+++ b/git/config
@@ -0,0 +1,22 @@
+
+[hub]
+	protocol = https
+[core]
+	editor = code --wait
+[user]
+	name = Colin Henry
+	email = jchenry@users.noreply.github.com
+[push]
+	default = simple
+[diff]
+	tool = vscode
+[difftool "vscode"]
+	cmd = code --wait --diff $LOCAL $REMOTE
+[merge]
+ 	tool = vscode
+[mergetool "vscode"]
+	cmd = code --wait $MERGED
+[alias]
+	lgb = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
+[http]
+	sslverify = true
diff --git a/git/gitignore_global b/git/gitignore_global
new file mode 100755
index 0000000..0fac0ea
--- /dev/null
+++ b/git/gitignore_global
@@ -0,0 +1,86 @@
+# temp files
+~*
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.app
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+
+#eclipse projects #
+###################
+*.classpath
+*.project
+.codepro/
+lib/*.jar
+build/
+dist/
+tmp/
+logs/
+eclipse/
+precompiled/
+*.settings
+
+
+# play project #
+################
+test-result/
+db/h2/
+indicies/
+index/
+
+# antlr project #
+#################
+gen/
+*.tokens
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Trident specific files #
+##########################
+src/com/simplymeasured/trident/Version.java
+
+# Blog Generated Files #
+########################
+_site/
+
+# Maven Specific Files #
+target/
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 073c9ab..4d6c2f3 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -4,7 +4,10 @@ set -g prefix C-a
 unbind r
 bind r source-file ~/.config/tmux/tmux.conf
 
+unbind h
 bind h split-window -v
+
+unbind v
 bind v split-window -h
 
 # set -g mouse on