diff --git a/flake.nix b/flake.nix
index 343d62b..20b570e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,8 @@
 	homeConfigurations = {
 		biscuit = home-manager.lib.homeManagerConfiguration {
 			inherit pkgs;
-			modules = [ ./home-manager/home.nix ];
+			modules = [ ./home-manager/home.nix 
+			];
 		};
 	};
     };
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 904eae2..aa81c7c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,13 +1,9 @@
 {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
+  inputs, outputs, lib, config, pkgs, ...
 }: {
   imports = [
-	# ../packages/nvim/default.nix
+	  ../packages/nvim/default.nix
+    ../packages/zsh/default.nix
   ];
 
   home = {
@@ -16,25 +12,19 @@
   };
 
   home.packages = [
-	# pkgs.neovim
   ];
   home.sessionVariables = {
-    # EDITOR = "nvim";
-    };
-
-  #home.file.".config/nvim" = {
-#	source = ./nvchad;
-#	recursive = true;
-#	force = true;	
- # };	
+  
+  };
 
   programs.git.enable = true;
-  programs.neovim.enable = true;
   programs.bash.shellAliases = {
-	enable = true;
-	ll = "ls -l";
+	  enable = true;
+	  ll = "ls -l";
   };
 
+  programs.neovim.enable = true;
+
   systemd.user.startServices = "sd-switch";
 
   programs.home-manager.enable = true;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6e061c5..b20aead 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -28,8 +28,7 @@
     LC_NAME = "en_US.UTF-8";
     LC_NUMERIC = "en_US.UTF-8";
     LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
   };
 
   # Configure keymap in X11
@@ -39,12 +38,15 @@
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.biscuit = {
-    isNormalUser = true;
-    description = "Biscuit";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; 
-    [];
+  users = {
+    defaultUserShell = pkgs.bash;
+    users.biscuit = {
+      isNormalUser = true;
+      description = "Biscuit";
+      extraGroups = [ "networkmanager" "wheel" ];
+      shell = pkgs.zsh;
+      packages = with pkgs; [];
+      };
   };
 
   # List packages installed in system profile.
@@ -53,12 +55,15 @@
     wget
     git
     home-manager
-    # neovim
+    zsh
   ];
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
+  # Enable non-bash shell 
+  programs.zsh.enable = true;
+
   # Enable experimental features
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 #nixpkgs = {
diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix
index ca35464..171a896 100644
--- a/packages/nvim/default.nix
+++ b/packages/nvim/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }: {
-
+{ ... }: {
 
   home.file.".config/nvim" = {
-	source = ./nvchad;
-	recursive = true;
-	force = true;	
+    # BUG requires --impure
+    source = /home/biscuit/Nixos/packages/nvim/nvchad;
+    recursive = true;
+    force = true;	
   };	
 }
diff --git a/home-manager/nvchad b/packages/nvim/nvchad
similarity index 100%
rename from home-manager/nvchad
rename to packages/nvim/nvchad
diff --git a/packages/zsh/default.nix b/packages/zsh/default.nix
index e69de29..5c870c7 100644
--- a/packages/zsh/default.nix
+++ b/packages/zsh/default.nix
@@ -0,0 +1,18 @@
+{ ... }: {
+  programs.zsh = {
+    enable = true; 
+    enableCompletion = true;
+    # autosuggestions.enable = true; 
+    syntaxHighlighting.enable = true;
+    shellAliases = {
+      ll = "ls -l";
+      upd = "sudo nixos-rebuild switch --flake /home/biscuit/Nixos/#biscuit";
+      hupd = "home-manager switch --flake /home/biscuit/Nixos/#biscuit --impure";
+    };
+    history.size = 10000;
+    oh-my-zsh = {
+      enable = true; 
+      theme = "robbyrussell";
+    };
+  };
+}