From 063887a90c2b4c8d82594cfbeba5ff2444a73cb3 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Sun, 1 Jan 2023 23:33:29 -0500
Subject: [PATCH] maybe fixing fish

---
 config/fish/config.fish                          | 3 +++
 {jobs => config/fish}/everquote.fish             | 0
 config/fish/shell_aliases.fish                   | 8 ++++++++
 shell_funcs.fish => config/fish/shell_funcs.fish | 2 --
 hosts/ts-tl-mbp/brew.nix                         | 1 +
 rebuild.sh                                       | 4 ++++
 6 files changed, 16 insertions(+), 2 deletions(-)
 rename {jobs => config/fish}/everquote.fish (100%)
 create mode 100644 config/fish/shell_aliases.fish
 rename shell_funcs.fish => config/fish/shell_funcs.fish (96%)
 create mode 100755 rebuild.sh

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 5cf019e..193d302 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -14,4 +14,7 @@ if status is-interactive
 
     # source ~/code/dotfiles/shell_aliases
     # source ~/code/dotfiles/shell_funcs.fish
+    source ~/.config/fish/shell_funcs.fish
+    source ~/.config/fish/shell_aliases.fish
+    source ~/.config/fish/everquote.fish
 end
diff --git a/jobs/everquote.fish b/config/fish/everquote.fish
similarity index 100%
rename from jobs/everquote.fish
rename to config/fish/everquote.fish
diff --git a/config/fish/shell_aliases.fish b/config/fish/shell_aliases.fish
new file mode 100644
index 0000000..4b1db02
--- /dev/null
+++ b/config/fish/shell_aliases.fish
@@ -0,0 +1,8 @@
+alias cat='bat'
+alias dots='cd ~/code/dotfiles/'
+alias fuckingip="curl https://wtfismyip.com/json"
+alias g='git'
+alias gp='git push -u'
+alias ls="exa -lhFgxUm --git --time-style long-iso --group-directories-first"
+alias vimini="vim ~/.config/nvim/init.vim"
+alias vim=nvim
diff --git a/shell_funcs.fish b/config/fish/shell_funcs.fish
similarity index 96%
rename from shell_funcs.fish
rename to config/fish/shell_funcs.fish
index 765a175..8108508 100644
--- a/shell_funcs.fish
+++ b/config/fish/shell_funcs.fish
@@ -68,5 +68,3 @@ function lab
   jupyter lab
   deactivate
 end
-
-source ~/code/dotfiles/jobs/everquote.fish
diff --git a/hosts/ts-tl-mbp/brew.nix b/hosts/ts-tl-mbp/brew.nix
index 06b5fa1..ed6e5dc 100644
--- a/hosts/ts-tl-mbp/brew.nix
+++ b/hosts/ts-tl-mbp/brew.nix
@@ -7,6 +7,7 @@
       "discord"
       "divvy"
       "firefox"
+      "gpg-suite"
       "jetbrains-toolbox"
       "karabiner-elements"
       "slack"
diff --git a/rebuild.sh b/rebuild.sh
new file mode 100755
index 0000000..6c313f7
--- /dev/null
+++ b/rebuild.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git add . # YOLO
+./result/sw/bin/darwin-rebuild switch --flake .