From 578a845e6032e7da1750562fedb5e9612b0914d8 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sat, 30 Dec 2023 23:30:33 +0800
Subject: [PATCH] feat: aliases for git/eza/bat/emacs/nvim, and some
 completions

---
 home/base/desktop/emacs/default.nix  | 10 +++++++++-
 home/base/desktop/neovim/default.nix | 10 +++++++++-
 home/base/desktop/shell.nix          |  9 ++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/home/base/desktop/emacs/default.nix b/home/base/desktop/emacs/default.nix
index 812061b4..474cee92 100644
--- a/home/base/desktop/emacs/default.nix
+++ b/home/base/desktop/emacs/default.nix
@@ -4,7 +4,7 @@
 #
 # Emacs Tutorials:
 #  1. Official: <https://www.gnu.org/software/emacs/tour/index.html>
-#  2. Doom Emacs: <https://github.com/doomemacs/doomemacs/blob/master/docs/index.org> 
+#  2. Doom Emacs: <https://github.com/doomemacs/doomemacs/blob/master/docs/index.org>
 #
 {
   config,
@@ -18,6 +18,11 @@ with lib; let
   envExtra = ''
     export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH"
   '';
+  shellAliases = {
+    e = "emacs";
+    ediff = ''emacs -nw --eval "(ediff-files \"$1\" \"$2\")"'';
+    eman = ''emacs -nw --eval "(switch-to-buffer (man \"$1\"))"'';
+  };
 in {
   options.modules.editors.emacs = {
     enable = mkEnableOption "Emacs Editor";
@@ -58,6 +63,9 @@ in {
 
     programs.bash.bashrcExtra = envExtra;
     programs.zsh.envExtra = envExtra;
+    home.shellAliases = shellAliases;
+    programs.nushell.shellAliases = shellAliases;
+
     # allow fontconfig to discover fonts and configurations installed through `home.packages`
     fonts.fontconfig.enable = true;
 
diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix
index 33ed14de..39331cfc 100644
--- a/home/base/desktop/neovim/default.nix
+++ b/home/base/desktop/neovim/default.nix
@@ -8,7 +8,12 @@
 #  AstroNvim's configuration and all its dependencies(lsp, formatter, etc.)
 #
 #e#############################################################################
-{
+let
+  shellAliases = {
+    v = "nvim";
+    vdiff = "nvim -d";
+  };
+in {
   xdg.configFile = {
     # astronvim's config
     "nvim" = {
@@ -21,6 +26,9 @@
     "astronvim/lua/user".source = ./astronvim_user;
   };
 
+  home.shellAliases = shellAliases;
+  programs.nushell.shellAliases = shellAliases;
+
   nixpkgs.config = {
     programs.npm.npmrc = ''
       prefix = ''${HOME}/.npm-global
diff --git a/home/base/desktop/shell.nix b/home/base/desktop/shell.nix
index 7b9f12ac..dd19991d 100644
--- a/home/base/desktop/shell.nix
+++ b/home/base/desktop/shell.nix
@@ -21,13 +21,20 @@ in {
     # https://github.com/nushell/nushell/issues/8214
     extraConfig = ''
       source /etc/agenix/alias-for-work.nushell
+      # completion
       use ${nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/make/make-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/man/man-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/pnpm/pnpm-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/cargo/cargo-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/zellij/zellij-completions.nu *
+      # alias
+      use ${nu_scripts}/share/nu_scriptsaliases/git/git-aliases.nu *
+      use ${nu_scripts}/share/nu_scripts/aliases/eza/eza-aliases.nu *
+      use ${nu_scripts}/share/nu_scripts/aliases/bat/bat-aliases.nu *
     '';
   };
 }