diff --git a/home/default.nix b/home/default.nix
index 313ddc8..859d17c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -68,7 +68,8 @@ in {
     ansible
   ];
 
-  programs.fish = {
+  programs.starship.enable = true;
+  programs.zsh = {
     enable = true;
   };
 
diff --git a/home/programs/neovim/config.lua b/home/programs/neovim/config.lua
index 9c24da4..b74d21e 100644
--- a/home/programs/neovim/config.lua
+++ b/home/programs/neovim/config.lua
@@ -10,7 +10,7 @@ vim.o.smartindent = true
 vim.o.hlsearch = false
 vim.o.scrolloff = 4
 vim.o.undofile = true
-vim.o.undodir = "~/.local/share/nvim/undo"
+vim.o.undodir = vim.fn.expand("$HOME/.local/share/nvim/undo")
 
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
diff --git a/nixos/default.nix b/nixos/default.nix
index 89a91af..0973b12 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -123,9 +123,9 @@ user: {
     isNormalUser = true;
     extraGroups = ["wheel" "video" "networkmanager"];
     initialPassword = "pass";
-    shell = pkgs.fish;
+    shell = pkgs.zsh;
   };
-  programs.fish.enable = true;
+  programs.zsh.enable = true;
 
   environment.variables = {
     EDITOR = "nvim";