From 1a9b54fff92acfa3d0c356259c5199116388a703 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 5 Apr 2023 23:09:27 +0100 Subject: [PATCH] fix(zsh): add prompt with zplug --- home-manager/modules/zsh.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index e4ffa75..8ceca66 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -5,14 +5,6 @@ enableCompletion = false; dotDir = ".config/zsh"; - shellAliases = { - fetch = "git fetch --all --jobs=4 --progress --prune"; - run = "./run"; - pull = "git pull --autostash --jobs=4 --summary origin"; - rebase = "git rebase --autostash --stat"; - update = "fetch && rebase"; - }; - initExtra = '' # Make Caps Lock behave like Ctrl. setxkbmap -option ctrl:nocaps @@ -88,6 +80,12 @@ bindkey " " expand-alias-space bindkey -M isearch " " magic-space + ialias fetch="git fetch --all --jobs=4 --progress --prune" + ialias run="./run" + ialias pull="git pull --autostash --jobs=4 --summary origin" + ialias rebase="git rebase --autostash --stat" + ialias update="fetch && rebase" + setopt auto_cd setopt auto_pushd setopt pushd_ignore_dups @@ -98,6 +96,7 @@ enable = true; plugins = [ + { name = "themes/robbyrussell"; tags = [from:oh-my-zsh as:theme]; } { name = "plugin/git"; tags = [from:oh-my-zsh]; } { name = "plugin/vi-mode"; tags = [from:oh-my-zsh]; } { name = "mollifier/cd-gitroot"; }