4 files changed, 24 insertions, 28 deletions
diff --git a/config/zsh/aliases/dir.zsh b/config/zsh/aliases/dir.zsh
index 508634e..14dda2e 100644
--- a/config/zsh/aliases/dir.zsh
+++ b/config/zsh/aliases/dir.zsh
@@ -9,19 +9,17 @@ alias gpic='cd ~/Pictures';
 alias gdl='cd ~/Downloads/dl';
 alias gm='cd ~/Downloads/music';
 
-alias gnotes='cd ~/.config/vimwiki';
-alias gqute='cd ~/.config/qutebrowser';
+NIXCONF=$HOME/nixos;
 
-alias gvim='cd ~/.config/nvim';
-alias gcmd='cd ~/scripts/commands';
-alias gzsh='cd ~/.config/zshconf';
+alias gnotes="cd $NIXCONF/extras/notes";
+alias gqute="cd $NIXCONF/config/qutebrowser";
 
-alias gsuck='cd ~/.config/suckless';
-alias gdwm='cd ~/.config/suckless/dwm';
-alias gbar='cd ~/.config/suckless/dwmblocks';
+alias gnix="cd $NIXCONF";
+alias gvim="cd $NIXCONF/config/nvim";
+alias gcmd="cd $NIXCONF/scripts/commands";
+alias gzsh="cd $NIXCONF/config/zsh";
 
-alias gkey='cd ~/.config/suckless/shotkey';
-
-alias gmutt='cd ~/.config/neomutt';
-alias gmuttp='cd ~/.work-config/neomutt';
+alias gdwm="cd $NIXCONF/packages/dwm/source";
+alias gbar="cd $NIXCONF/packages/dwmblocks/source";
+alias gkey="cd $NIXCONF/packages/shotkey/source";
 
diff --git a/config/zsh/aliases/edit.zsh b/config/zsh/aliases/edit.zsh
index fa5e1b6..f1a6144 100644
--- a/config/zsh/aliases/edit.zsh
+++ b/config/zsh/aliases/edit.zsh
@@ -1,17 +1,14 @@
 # Config editors
+alias enix='gnix && sensible-editor configuration.nix';
 alias eorg='gnotes && sensible-editor index.md';
-alias ezsh='gzsh && sensible-editor ~/.zshrc';
-alias edot='sensible-editor ~/scripts/dotfiles.sh';
+alias ezsh='gzsh && sensible-editor zshrc';
+alias edot='sensible-editor ~/nixos/scripts/dotfiles.sh';
 alias evim='gvim && sensible-editor init.lua';
 
 alias edwm='gdwm && sensible-editor config.def.h';
 alias ebar='gbar && sensible-editor blocks.h';
 alias ekey='gkey && sensible-editor config.h';
 alias equte='gqute && sensible-editor config.py';
-alias eas='sensible-editor ~/.config/autostart.sh';
-alias emime="sensible-editor ~/.bin/open";
-
-alias ehosts='sudo nvim /etc/hosts';
-
-alias emutt='gmuttp && sensible-editor ~/.config/neomutt/neomuttrc';
+alias eas='sensible-editor ~/nixos/packages/dwm/autostart.sh';
+alias emime="sensible-editor ~/nixos/scripts/bin/open";
 
diff --git a/config/zsh/aliases/system.zsh b/config/zsh/aliases/system.zsh
index 48951a9..000629c 100644
--- a/config/zsh/aliases/system.zsh
+++ b/config/zsh/aliases/system.zsh
@@ -1,13 +1,14 @@
 
 # Pacman aliases
-alias auto-remove="yay -Rcs \$(yay -Qdtq)";
-alias update="yay -Syu";
-alias mirrorlist-refresh="sudo reflector --latest 200 --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist-arch"
+
+alias auto-remove="sudo nix-collect-garbage -d && nix-store --optimize";
+
+#alias mirrorlist-refresh="sudo reflector --latest 200 --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist-arch"
 
 # Sandbox
-alias sandbox="sudo ~/scripts/host-file-elb-update.sh";
+#alias sandbox="sudo ~/scripts/host-file-elb-update.sh";
 
 # Runit helpers
-sv_enable() { [[ -f "/etc/runit/sv/$1" ]] && sudo ln -s /etc/runit/sv/$1 /run/runit/service; }
-sv_disable() { sudo unlink /run/runit/service/$1; }
+#sv_enable() { [[ -f "/etc/runit/sv/$1" ]] && sudo ln -s /etc/runit/sv/$1 /run/runit/service; }
+#sv_disable() { sudo unlink /run/runit/service/$1; }
 
diff --git a/config/zsh/theme.zsh b/config/zsh/theme.zsh
index 9fc4fac..baeae3e 100644
--- a/config/zsh/theme.zsh
+++ b/config/zsh/theme.zsh
@@ -22,7 +22,7 @@ p_dir() {
 
 # Prompt terminal status
 p_status() {
-  [[ ! -z "$WITH_NIX_PREFIX" ]] && echo -n "$(segment "[NIX:$WITH_NIX_PREFIX] " black $COL_STATUS_ERROR)";
+  [[ ! -z "$WITH_NIX_PREFIX" ]] && echo -n "$(segment "[NIX:$WITH_NIX_PREFIX] " black $COL_ACCENT)";
   echo -n "%(?..$(segment 'x' black $COL_STATUS_ERROR))"
   echo -n "%(1j.$(segment '(jobs: %j)' black $COL_STATUS_BG).)"
 }
@@ -47,7 +47,7 @@ prompt() {
   p_status;
   p_dir;
   echo -n '$(p_git)';
-  segment "$" black white;
+  segment "λ" black white;
 }
 
 export PROMPT="$(prompt) ";