aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2024-12-30 08:48:22 -0800
committerFranck Cuny <franck@fcuny.net>2024-12-30 08:48:22 -0800
commitdc89b8652b6e46f2b1cb223c9e1ab3e90f7bedc4 (patch)
tree218d47c2124dde94799b3ca7dc5a41327a72867d
parentremove eza: it is too intrusive (diff)
downloadinfra-dc89b8652b6e46f2b1cb223c9e1ab3e90f7bedc4.tar.gz
add a few aliases to fish and git for git
-rw-r--r--nix/users/fcuny/git.nix14
-rw-r--r--nix/users/fcuny/shell.nix4
2 files changed, 18 insertions, 0 deletions
diff --git a/nix/users/fcuny/git.nix b/nix/users/fcuny/git.nix
index 5f52bef..5263155 100644
--- a/nix/users/fcuny/git.nix
+++ b/nix/users/fcuny/git.nix
@@ -8,11 +8,25 @@
programs.git = {
enable = true;
+
+ delta = {
+ enable = true;
+ options = {
+ features = "side-by-side";
+ };
+ };
+
userName = "Franck Cuny";
userEmail = "franck@fcuny.net";
aliases = {
amend = "commit --amend";
+ a = "commit --amend --no-edit";
+ st = "status";
+ co = "checkout";
+ br = "branch";
+ rb = "pull --rebase";
+ logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate";
};
# https://stackoverflow.com/questions/74012449/git-includeif-hasconfigremote-url-not-working
diff --git a/nix/users/fcuny/shell.nix b/nix/users/fcuny/shell.nix
index f364b1f..b415038 100644
--- a/nix/users/fcuny/shell.nix
+++ b/nix/users/fcuny/shell.nix
@@ -41,11 +41,15 @@ in
enable = true;
interactiveShellInit = ''
set fish_greeting ""
+
+ fish_add_path -p ~/.cargo/bin/
'';
shellAbbrs = {
ncg = "nix-collect-garbage -7d";
c = "clear";
j = "just";
+ g = "git";
+ gap = "git add --patch";
};
};