From 7f29d01f8696064c3471a452dc44f0e06a726ae5 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Sat, 14 Oct 2023 18:14:52 -0400
Subject: [PATCH] slight cleanup

---
 configs/bash/.bashrc                           | 18 ++++++++++++++++++
 configs/git/.gitconfig                         |  7 ++++++-
 configs/git/.mailmap                           |  7 +++++++
 install.conf.yaml                              |  6 +++++-
 .../run-logid => solutions/run-logid.sh        |  0
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 configs/bash/.bashrc
 create mode 100644 configs/git/.mailmap
 rename configs/scripts/run-logid => solutions/run-logid.sh (100%)

diff --git a/configs/bash/.bashrc b/configs/bash/.bashrc
new file mode 100644
index 0000000..19ec4c7
--- /dev/null
+++ b/configs/bash/.bashrc
@@ -0,0 +1,18 @@
+# This is a somewhat hacky bashrc that is used to provide some of the conveniences from my zshrc on machines that I can't get zsh on
+export EWCONFIG_ROOT="$HOME/.config/ewconfig"
+
+# I always want my ~/bin to be in my PATH
+export PATH="$HOME/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+
+# Makes a directory, then moves into it
+mkcd() {
+    if [ $# != 1 ]; then
+        echo "Usage: mkcd <dir>"
+    else
+        mkdir -p $1 && cd $1
+    fi
+}
+
+# A basic prompt to display user@host dir sign
+export PS1="(bash) \[\e[0;32m\]\u@\h \[\e[0;36m\]\w \[\e[0;36m\]\$ \[\e[0m\]"
diff --git a/configs/git/.gitconfig b/configs/git/.gitconfig
index a2f753e..65aafc9 100644
--- a/configs/git/.gitconfig
+++ b/configs/git/.gitconfig
@@ -17,6 +17,9 @@
 
 [alias]
 	authors = shortlog --summary --numbered --email
+	tree = log --graph --decorate --abbrev-commit --all \
+			--pretty=format:'%C(auto,yellow)commit %h%C(auto,cyan)%d%n%C(auto,cyan)Author:%Creset %aN <%aE>%n%C(auto,cyan)Date:%Creset %ad%n%s%n' \
+			--date=format:'%b %d %Y %H:%M:%S %z'
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f
@@ -25,7 +28,6 @@
 	required = true
 
 [url "ssh://git@github.com/"]
-    #insteadOf = https://github.com/
     pushInsteadOf = https://github.com/
 
 [credential "https://github.com"]
@@ -41,3 +43,6 @@
 	smtpuser = evan@ewpratten.com
 	smtpencryption = tls
 	smtpserverport = 587
+
+[mailmap]
+	file = ~/.config/git/.mailmap
diff --git a/configs/git/.mailmap b/configs/git/.mailmap
new file mode 100644
index 0000000..992bb9a
--- /dev/null
+++ b/configs/git/.mailmap
@@ -0,0 +1,7 @@
+Evan Pratten <evan@ewpratten.com>
+Evan Pratten <evan@ewpratten.com> <ewpratten@gmail.com>
+William Meathrel <wcmeathrel@gmail.com> <Wcmeathrel@gmail.com>
+Carter Tomlenovich <cartertom@tuta.io>
+James Nickoli <jnick722547@gmail.com>
+Sam Lownie <slownie16@gmail.com>
+Sam Lownie <slownie16@gmail.com> <30960735+slownie@users.noreply.github.com>
\ No newline at end of file
diff --git a/install.conf.yaml b/install.conf.yaml
index ce8f30b..bc61213 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -18,6 +18,7 @@
     - ~/.config/logid
     - ~/.config/systemd/user
     - ~/.config/autostart
+    - ~/.config/git
     - ~/.cargo
     - ~/.config/user-tmpfiles.d
     # Program plugins
@@ -27,12 +28,16 @@
 - link:
     # Git
     ~/.gitconfig: configs/git/.gitconfig
+    ~/.config/git/.mailmap: configs/git/.mailmap
     ~/.ssh/allowed_signers: configs/ssh/allowed_signers
 
     # Shell
     ~/.zshrc:
       path: configs/zsh/.zshrc
       force: true
+    ~/.bashrc:
+      path: configs/bash/.bashrc
+      force: true
 
     # Vim
     ~/.config/nvim/init.vim: configs/nvim/init.vim
@@ -43,7 +48,6 @@
     ~/bin/catto: configs/scripts/catto
     ~/bin/aspath: configs/scripts/aspath
     ~/bin/fetch-steamdeck-screenshots: configs/scripts/fetch-steamdeck-screenshots
-    ~/bin/run-logid: configs/scripts/run-logid
     ~/bin/houdini-tool: configs/scripts/houdini-tool.py
     ~/bin/hython-latest: configs/scripts/hython-latest
     ~/bin/usdnc-to-usd: configs/scripts/usdnc-to-usd.py
diff --git a/configs/scripts/run-logid b/solutions/run-logid.sh
similarity index 100%
rename from configs/scripts/run-logid
rename to solutions/run-logid.sh