From 83d96e9172fc4a83e5e688080c6b4f5cd7518a22 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Fri, 12 Jan 2024 13:57:38 -0500
Subject: [PATCH] global/shell: move common aliases into universe.shellAliases

---
 hosts/data.cs.purdue.edu/default.nix |  2 ++
 modules/global/options.nix           |  1 +
 modules/global/shell.nix             | 35 +++++++++++++++++-----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/hosts/data.cs.purdue.edu/default.nix b/hosts/data.cs.purdue.edu/default.nix
index f4063a4..e7c55d5 100644
--- a/hosts/data.cs.purdue.edu/default.nix
+++ b/hosts/data.cs.purdue.edu/default.nix
@@ -20,6 +20,8 @@
         home-manager
       ] ++ main.universe.packages;
 
+      inherit (main.universe) shellAliases;
+
       file.".profile".target = ".profile-hm";
 
       homeDirectory = lib.mkForce "/homes/${config.home.username}";
diff --git a/modules/global/options.nix b/modules/global/options.nix
index c3bbd4d..029dd82 100644
--- a/modules/global/options.nix
+++ b/modules/global/options.nix
@@ -37,6 +37,7 @@ in
 
     universe = {
       packages = mkOpt (listOf package) [ ];
+      shellAliases = mkOpt (attrsOf str) { };
     };
 
     common = mkOpt (attrsOf anything) { };
diff --git a/modules/global/shell.nix b/modules/global/shell.nix
index 2c52e6b..b1fb11e 100644
--- a/modules/global/shell.nix
+++ b/modules/global/shell.nix
@@ -8,10 +8,11 @@ in
     zsh.enable = true;
   };
 
-  environment.shellAliases = {
+  universe.shellAliases = {
     uni = "universe-cli";
 
     # quick cd
+    ".." = "cd ..";
     "..." = "cd ../..";
     "...." = "cd ../../..";
     "....." = "cd ../../../..";
@@ -39,6 +40,7 @@ in
     gcd = "cd $(git root || echo \".\")";
     ucd = "cd $(uni cd || echo \".\")";
 
+
     # grep
     grep = "rg";
     gi = "grep -i";
@@ -50,6 +52,24 @@ in
     # internet ip
     myip = "echo $(curl -s ipecho.net/plain)";
 
+    # Miscellaneous
+    dd = "dd status=progress";
+
+    cat = "bat --paging=never";
+    catp = "bat --paging=always";
+
+    mktmp = "cd $(mktemp -d)";
+
+    edit = "$EDITOR";
+
+    lpath = "echo \"$PATH\" | tr \":\" \"\n\"";
+    timestamp = "date +%s -d";
+
+    neofetch = "neowofetch";
+
+  };
+
+  environment.shellAliases = config.universe.shellAliases // {
     # sudo
     s = ifSudo "sudo -E ";
     si = ifSudo "sudo -i";
@@ -68,10 +88,6 @@ in
     jtl = "journalctl";
 
     # Miscellaneous
-    dd = "dd status=progress";
-
-    cat = "bat --paging=never";
-    catp = "bat --paging=always";
     acat = "mpv --no-audio-display";
     vcat = "mpv";
 
@@ -80,15 +96,6 @@ in
     mnt = ifSudo "s mount";
     umnt = ifSudo "s umount";
 
-    mktmp = "cd $(mktemp -d)";
-
-    edit = "$EDITOR";
-
-    lpath = "echo \"$PATH\" | tr \":\" \"\n\"";
-    timestamp = "date +%s -d";
-
-    neofetch = "neowofetch";
-
     # yt-dlp
     yt-m4a = ''yt-dlp -f "bestaudio[ext=m4a]" -o "%(title)s.%(ext)s"'';
     yt-mp4 = ''yt-dlp -f "best[ext=mp4]" -o "%(title)s.%(ext)s"'';