From 0370e84236f529da8e8c3713248576e358cbfc71 Mon Sep 17 00:00:00 2001
From: Frost-Phoenix <67cyril6767@gmail.com>
Date: Sun, 5 Nov 2023 21:55:37 +0100
Subject: [PATCH] update shell alias config

---
 modules/home/git/default.nix | 21 ---------------------
 modules/home/zsh/default.nix | 28 ++++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index a456bc2..1dd5b8f 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -10,27 +10,6 @@
       init.defaultBranch = "main";
       credential.helper = "store";
     };
-
-    aliases = {
-      # Git aliases
-      ga = "git add";
-      gaa = "git add --all";
-      gs = "git status";
-      gb = "git branch";
-      gm = "git merge";
-      gpl = "git pull";
-      gplo = "git pull origin";
-      gps = "git push";
-      gpso = "git push origin";
-      gc = "git commit";
-      gcm = "git commit -m";
-      gch = "git checkout";
-      gchb = "git checkout -b";
-      gcoe = "git config user.email";
-      gcon = "git config user.name";
-
-      g = "lazygit";
-    };
   };
 
   home.packages = [ pkgs.gh ];
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index 709068d..161a939 100755
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -14,6 +14,7 @@
       # record = "wf-recorder --audio=alsa_output.pci-0000_08_00.6.analog-stereo.monitor -f $HOME/Videos/$(date +'%Y%m%d%H%M%S_1.mp4')";
       # ani = "bash $HOME/.local/bin/anime --dub";
 
+      # Utils
       vim = "nvim";
       cat = "bat --theme 'Visual Studio Dark+'";
       l = "eza --icons  -a --group-directories-first -1"; #EZA_ICON_SPACING=2
@@ -21,15 +22,34 @@
       tree = "eza --icons --tree --group-directories-first";
       findw = "grep -rl";
 
-      # nixos
-      nix-switch = "sudo nixos-rebuild switch --flake nixos-config#nixos";
-      nix-switchu = "sudo nixos-rebuild switch --upgrade --flake nixos-config#nixos";
-      nix-flake-update = "sudo nix flake update nixos-config#";
+      # Nixos
+      nix-switch = "sudo nixos-rebuild switch --flake ~/nixos-config#nixos";
+      nix-switchu = "sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#nixos";
+      nix-flake-update = "sudo nix flake update ~/nixos-config#";
       nix-clean = "nix-collect-garbage && nix-collect-garbage -d && sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/*";
       # nix-clean = "sudo nix-collect-garbage -d";
       # nix-cleanold = "sudo nix-collect-garbage --delete-old";
       # nix-cleanboot = "sudo /run/current-system/bin/switch-to-configuration boot";
 
+      # Git
+      ga = "git add";
+      gaa = "git add --all";
+      gs = "git status";
+      gb = "git branch";
+      gm = "git merge";
+      gpl = "git pull";
+      gplo = "git pull origin";
+      gps = "git push";
+      gpso = "git push origin";
+      gc = "git commit";
+      gcm = "git commit -m";
+      gch = "git checkout";
+      gchb = "git checkout -b";
+      gcoe = "git config user.email";
+      gcon = "git config user.name";
+
+      g = "lazygit";
+
       # python
       piv = "python -m venv .venv";
       psv = "source .venv/bin/activate";