diff --git a/eshu/etc/nixos/configuration.nix b/eshu/etc/nixos/configuration.nix
index c9d8dde..382df17 100644
--- a/eshu/etc/nixos/configuration.nix
+++ b/eshu/etc/nixos/configuration.nix
@@ -71,12 +71,15 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    chezmoi
+    fish
     git
     neovim
     python3
     tmux
     wget
   ];
+  environment.variables.EDITOR = "nvim";
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.