diff --git a/home/felschr-rpi4.nix b/home/felschr-rpi4.nix
index bf73caa..a99d60e 100644
--- a/home/felschr-rpi4.nix
+++ b/home/felschr-rpi4.nix
@@ -20,6 +20,13 @@
 
   programs.gpg.enable = true;
 
+  home.sessionVariables = with pkgs; {
+    EDITOR = "nvim";
+  };
+  programs.neovim.enable = true;
+  programs.neovim.viAlias = true;
+  programs.neovim.vimAlias = true;
+
   programs.git.defaultProfile = "private";
 
   xdg.configFile."nixpkgs/config.nix".text = ''