Move git aliases + add config.aliases

2 files changed, 23 insertions, 10 deletions

diff --git a/home/git/aliases.nix b/home/git/aliases.nix
new file mode 100644
index 0000000..8a7c9fa
--- /dev/null
+++ b/home/git/aliases.nix
@@ -0,0 +1,22 @@
+# This module defines my personal git aliases. Some of these are
+# pseudo-subcommands which are easier to remember while others simply save me
+# some keystrokes.
+{...}: {
+  programs.git.aliases = {
+    unstage = "restore --staged";
+    forgor = "commit --amend --no-edit --";
+  };
+
+  home.shellAliases = {
+    gs = "git status";
+    gd = "git diff --";
+
+    gc = "git commit";
+    gf = "git forgor";
+
+    ga = "git add --";
+    gan = "git add -N";
+    gap = "git add --patch";
+    gu = "git unstage";
+  };
+}
diff --git a/home/git/default.nix b/home/git/default.nix
index 68e0a25..2a72aa9 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -6,7 +6,7 @@
   inherit (lib.modules) mkIf;
   inherit (pkgs.stdenv.hostPlatform) isDarwin;
 in {
-  imports = [./ignore.nix];
+  imports = [./ignore.nix ./aliases.nix];
 
   programs.git = {
     enable = true;
@@ -19,13 +19,4 @@ in {
   };
 
   programs.git-credential-lastpass.enable = !isDarwin;
-
-  home.shellAliases = {
-    gs = "git status";
-    gd = "git diff";
-    gc = "git commit";
-    ga = "git add";
-    gan = "git add -N";
-    gap = "git add --patch";
-  };
 }