From 2cf7eef38727a9efdfe600a367ea81936b3c4611 Mon Sep 17 00:00:00 2001
From: Isaac Shoebottom <ir.shoebottom@gmail.com>
Date: Wed, 18 Sep 2024 13:28:19 -0300
Subject: [PATCH] Bring pairty with windows dotfiles

---
 dot_bash_profile                    | 11 +------
 dot_bashrc                          | 11 ++++---
 dot_config/alacritty/alacritty.toml | 18 +++++++++++
 dot_config/fastfetch/config.jsonc   | 28 ++++++++++++++++++
 dot_editorconfig                    | 12 ++++++++
 dot_gitconfig                       |  5 ++++
 dot_profile                         |  5 ----
 dot_ssh/config                      | 46 +++++++++++++++++++++++++++++
 empty_dot_profile                   |  0
 9 files changed, 115 insertions(+), 21 deletions(-)
 create mode 100644 dot_config/alacritty/alacritty.toml
 create mode 100644 dot_config/fastfetch/config.jsonc
 create mode 100644 dot_editorconfig
 delete mode 100644 dot_profile
 create mode 100644 dot_ssh/config
 create mode 100644 empty_dot_profile

diff --git a/dot_bash_profile b/dot_bash_profile
index 571fe1e..796b05a 100644
--- a/dot_bash_profile
+++ b/dot_bash_profile
@@ -1,10 +1 @@
-#
-# ~/.bash_profile
-#
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-
-
-# Added by Toolbox App
-export PATH="$PATH:/home/isaac/.local/share/JetBrains/Toolbox/scripts"
-
+[[ -f ~/.bashrc ]] && . ~/.bashrc
\ No newline at end of file
diff --git a/dot_bashrc b/dot_bashrc
index 3205984..54b34f6 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -1,12 +1,11 @@
-#
-# ~/.bashrc
-#
-
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
+# Set up terminal variables and scripts
+[[ -f ~/.bash_setup.sh ]] && . ~/.bash_setup.sh
+
+# Set aliases if aliases exist
+[[ -f ~/.bash_alias.sh ]] && . ~/.bash_alias.sh
 
 # Helpful tool: https://bash-prompt-generator.org
 # On github: https://github.com/Scriptim/bash-prompt-generator
diff --git a/dot_config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml
new file mode 100644
index 0000000..45aebae
--- /dev/null
+++ b/dot_config/alacritty/alacritty.toml
@@ -0,0 +1,18 @@
+live_config_reload = true
+
+[shell]
+program = "pwsh"
+args = ["-NoLogo"]
+
+[window]
+dimensions.columns = 120
+dimensions.lines = 30
+dynamic_padding = true
+dynamic_title = true
+
+[font]
+normal.family = "CaskaydiaCove Nerd Font"
+
+[cursor]
+style.shape = "Beam"
+style.blinking = "Off"
\ No newline at end of file
diff --git a/dot_config/fastfetch/config.jsonc b/dot_config/fastfetch/config.jsonc
new file mode 100644
index 0000000..ca59aad
--- /dev/null
+++ b/dot_config/fastfetch/config.jsonc
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "modules": [
+    "title",
+    "separator",
+    "os",
+    "host",
+    "kernel",
+    "uptime",
+    "packages",
+    "shell",
+    "de",
+    "wm",
+    "wmtheme",
+    "theme",
+    "font",
+    "cursor",
+    "terminal",
+    "terminalfont",
+    "cpu",
+    "gpu",
+    "memory",
+    "localip",
+    "battery",
+    "poweradapter",
+    "weather"
+  ]
+}
diff --git a/dot_editorconfig b/dot_editorconfig
new file mode 100644
index 0000000..2386457
--- /dev/null
+++ b/dot_editorconfig
@@ -0,0 +1,12 @@
+# https://editorconfig.org/
+# top-most EditorConfig file
+root = true
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = tab
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/dot_gitconfig b/dot_gitconfig
index 962af41..bc1f4fa 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -10,3 +10,8 @@
 	name = Isaac Shoebottom
 [core]
 	editor = nano
+	autocrlf = false
+[init]
+	defaultBranch = master
+[pull]
+	rebase = true
diff --git a/dot_profile b/dot_profile
deleted file mode 100644
index 1f65185..0000000
--- a/dot_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-# Added by Toolbox App
-export PATH="$PATH:/home/isaac/.local/share/JetBrains/Toolbox/scripts"
-
diff --git a/dot_ssh/config b/dot_ssh/config
new file mode 100644
index 0000000..3833506
--- /dev/null
+++ b/dot_ssh/config
@@ -0,0 +1,46 @@
+Host fcslinux
+	Hostname fcslinux.cs.unb.ca
+	Port 22
+	User ishoebot
+	IdentityFile ~/.ssh/unb.ed25519
+	AddKeysToAgent yes
+	ForwardAgent yes
+
+Host remotelab34
+	Hostname remotelabm34.cs.unb.ca
+	User ishoebot
+	Port 22
+	ProxyCommand ssh -q -W %h:%p fcslinux
+
+Host remotelab35
+	Hostname remotelabm35.cs.unb.ca
+	User ishoebot
+	Port 22
+	ProxyCommand ssh -q -W %h:%p fcslinux
+
+Host cs3103
+	Hostname cs3103.cs.unb.ca
+	User ishoebot
+	Port 22
+	ProxyCommand ssh -q -W %h:%p fcslinux
+
+Host ubuntu
+	Hostname ssh.shoebottom.ca
+	User isaac
+	Port 2222
+	IdentityFile ~/.ssh/ubuntu.ed25519
+	AddKeysToAgent yes
+
+Host github
+	Hostname github.com
+	User git
+	IdentityFile ~/.ssh/git.ed25519
+	AddKeysToAgent yes
+	ForwardAgent yes
+
+Host gitea
+	Hostname ssh.shoebottom.ca
+	User gitea
+	IdentityFile ~/.ssh/git.ed25519
+	AddKeysToAgent yes
+	ForwardAgent yes
\ No newline at end of file
diff --git a/empty_dot_profile b/empty_dot_profile
new file mode 100644
index 0000000..e69de29