From a36da6fe5e2ae0b46a9d02d251d4c34eb6d85660 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 20 Jul 2023 09:42:08 +0800
Subject: [PATCH] unify aliases

---
 programs/aliases.nix       | 17 +++++++++++++++++
 programs/fish.nix          | 18 +-----------------
 programs/zsh.nix           |  2 ++
 programs/zsh/initExtra.zsh | 17 -----------------
 4 files changed, 20 insertions(+), 34 deletions(-)
 create mode 100644 programs/aliases.nix

diff --git a/programs/aliases.nix b/programs/aliases.nix
new file mode 100644
index 0000000..7cbf6e3
--- /dev/null
+++ b/programs/aliases.nix
@@ -0,0 +1,17 @@
+{
+  "vim" = "hx";
+  "ls" = "exa --all --icons";
+  "dig" = "doggo";
+
+  "glol" = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
+  "ghrvw" = "gh repo view --web";
+
+  "opr" = "op run --env-file=.env.1password --";
+  "dr" = "doppler run --";
+
+  "dequarantine" = "xattr -d com.apple.quarantine";
+
+  "bcpa" = "brew cleanup --prune=all";
+  "puil" = "pnpm update --interactive --latest";
+  "pip-upgrade-all" = "pip --disable-pip-version-check list --outdated --format=json | python -c \"import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))\" | xargs -n1 pip install -U";
+}
diff --git a/programs/fish.nix b/programs/fish.nix
index 7ed0644..3b4362d 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -1,23 +1,7 @@
 {...}: {
   programs.fish = {
     enable = true;
-    shellAbbrs = {
-      "vim" = "hx";
-      "ls" = "exa --all --icons";
-      "dig" = "doggo";
-
-      "glol" = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
-      "ghrvw" = "gh repo view --web";
-
-      "opr" = "op run --env-file=.env.1password --";
-      "dr" = "doppler run --";
-
-      "dequarantine" = "xattr -d com.apple.quarantine";
-
-      "bcpa" = "brew cleanup --prune=all";
-      "puil" = "pnpm update --interactive --latest";
-      "pip-upgrade-all" = "pip --disable-pip-version-check list --outdated --format=json | python -c \"import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))\" | xargs -n1 pip install -U";
-    };
+    shellAbbrs = import ./aliases.nix;
   };
 
   home.file.".config/fish/conf.d" = {
diff --git a/programs/zsh.nix b/programs/zsh.nix
index 24f7ccc..2edba13 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -11,6 +11,8 @@
     initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;
     initExtra = builtins.readFile ./zsh/initExtra.zsh;
 
+    shellAliases = import ./aliases.nix;
+
     localVariables = {
       vivid_theme = "catppuccin-macchiato";
     };
diff --git a/programs/zsh/initExtra.zsh b/programs/zsh/initExtra.zsh
index 4f011fd..f885518 100644
--- a/programs/zsh/initExtra.zsh
+++ b/programs/zsh/initExtra.zsh
@@ -26,23 +26,6 @@ zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 
 zstyle ':completion:*' group-name \'\'
 
-# aliases
-alias vim="hx"
-alias ls="exa --all --icons"
-alias dig="doggo"
-
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
-alias ghrvw="gh repo view --web"
-
-alias opr="op run --env-file=.env.1password --"
-alias dr="doppler run --"
-
-alias dequarantine="xattr -d com.apple.quarantine"
-
-alias bcpa="brew cleanup --prune=all"
-alias puil="pnpm update --interactive --latest"
-alias pip-upgrade-all="pip --disable-pip-version-check list --outdated --format=json | python -c \"import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))\" | xargs -n1 pip install -U"
-
 function take() {
   mkdir "$1"
   cd "$1" || return 1