diff --git a/home-manager/admin.nix b/home-manager/admin.nix
index c879ace..2a239f3 100644
--- a/home-manager/admin.nix
+++ b/home-manager/admin.nix
@@ -12,8 +12,12 @@
 
     # You can also split up your configuration and import pieces of it here:
 
+    # Configurations
+    "${inputs.neovim-jsm}/default.nix"
+
     # Programs
     ./programs/git.nix
+    ./programs/zsh.nix
   ];
 
   nixpkgs = {
@@ -51,7 +55,7 @@
     username = "admin";
     homeDirectory = "/home/admin";
     sessionVariables = {
-      EDITOR = "vim";
+      EDITOR = "nvim";
     };
   
     # Install some packages
diff --git a/nixos/lavender/configuration.nix b/nixos/lavender/configuration.nix
index 593fbd4..9e00a3c 100644
--- a/nixos/lavender/configuration.nix
+++ b/nixos/lavender/configuration.nix
@@ -116,11 +116,12 @@
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-   users.users.admin = {
-     isNormalUser = true;
-     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-     openssh.authorizedKeys.keyFiles = [ ../fuchsia/id_ed25519_sk.pub ];
-   };
+  users.users.admin = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    shell = pkgs.zsh;
+    openssh.authorizedKeys.keyFiles = [ ../fuchsia/id_ed25519_sk.pub ];
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -131,9 +132,12 @@
     home-manager
   ];
 
+  environment.pathsToLink = [ "/share/zsh" ];
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
+  programs.zsh.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;