From 4d2f4f6db85be8517873d325cf788e41de2d330c Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sun, 25 Aug 2024 13:01:17 -0400
Subject: [PATCH] Home-manager: add Zellij alias; fix git aliases

---
 flake.lock                      | 6 +++---
 modules/users/aires/default.nix | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 837dde0..c4cd5f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -249,11 +249,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1724495652,
-        "narHash": "sha256-Q/sAhwemnZqAsSadjTNqTkoLN2xPouPdU1oLJ3Tjlhg=",
+        "lastModified": 1724575805,
+        "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "1c84c314db42dd40ed6cf9293b9451ec2e7ebee4",
+        "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895",
         "type": "github"
       },
       "original": {
diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix
index bf59897..404d533 100644
--- a/modules/users/aires/default.nix
+++ b/modules/users/aires/default.nix
@@ -87,7 +87,11 @@ in
               userEmail = config.secrets.users.aires.email;
               extraConfig = {
                 push.autoSetupRemote = "true";
-                aliases.pull = "!git pull && git submodule foreach --recursive 'git pull origin main'";
+                alias = {
+                  add = "add *";
+                  pull = "!git pull && git submodule foreach --recursive 'git pull origin main'";
+                  unstage = "reset HEAD --";
+                };
               };
             };
 
@@ -103,6 +107,7 @@ in
                 theme = "gentoo";
               };
               shellAliases = {
+                z = "zellij";
                 update = "upgrade";
                 upgrade = "nh os boot --update --ask";
               };