diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index 41302ea..69fc54c 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -48,7 +48,15 @@ in { userEmail = cfg.userEmail; aliases = { + # Prettier log lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"; + # Find log and grab its hash + lof = '' + !${pkgs.git}/bin/git log --pretty=oneline \ + | ${pkgs.fzf}/bin/fzf --scheme history \ + | ${pkgs.gawk}/bin/awk '{print $1}' + ''; + # Push up a new branch with the same as local pushup = "push -u origin HEAD"; }; diff --git a/modules/home/tools/zsh/default.nix b/modules/home/tools/zsh/default.nix index 8f9c25e..a567854 100644 --- a/modules/home/tools/zsh/default.nix +++ b/modules/home/tools/zsh/default.nix @@ -2,6 +2,7 @@ config, inputs, lib, + pkgs, namespace, ... }: let @@ -27,10 +28,13 @@ in { bindkey '^A' beginning-of-line bindkey '^E' end-of-line bindkey '^R' history-incremental-search-backward - alias view="nvim -R $1" - alias l='ls -la' ''; + shellAliases = { + view = "${pkgs.neovim}/bin/nvim -R $1"; + l = "ls -la"; + }; + plugins = [ { name = "zsh-syntax-highlighting";