diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 14716e3..9e59e20 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -15,6 +15,8 @@
     ../../modules/home-manager/bat
     ../../modules/home-manager/irssi
     ../../modules/home-manager/syncthing
+    ../../modules/home-manager/email
+    ../../modules/home-manager/password-store
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";
@@ -38,7 +40,7 @@
     lutris
     pavucontrol
     pasystray
-    networkmanagerapplet 
+    networkmanagerapplet
     mangohud
     kubectl
     k9s
diff --git a/modules/home-manager/neovim/default.nix b/modules/home-manager/neovim/default.nix
index 7164e00..c6d0336 100644
--- a/modules/home-manager/neovim/default.nix
+++ b/modules/home-manager/neovim/default.nix
@@ -8,6 +8,7 @@
     luajit
     lua-language-server
     nil
+    (nerdfonts.override { fonts = [ "Iosevka" ]; })
   ];
 
   programs.neovim = {
diff --git a/modules/home-manager/password-store/default.nix b/modules/home-manager/password-store/default.nix
index 1fa7b7d..652b487 100644
--- a/modules/home-manager/password-store/default.nix
+++ b/modules/home-manager/password-store/default.nix
@@ -1,6 +1,10 @@
 { pkgs, config, ... }:
 
 {
+  home.packages = with pkgs; [
+    pinentry-curses
+  ];
+
   programs = {
     gpg = {
       enable = true;
@@ -17,9 +21,10 @@
     };
   };
 
-  # services = {
-  #   gpg-agent = {
-  #     enable = true;
-  #   };
-  # };
+  services = {
+    gpg-agent = {
+      enable = true;
+      pinentryPackage = pkgs.pinentry-curses;
+    };
+  };
 }
diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix
index bca3640..8449410 100644
--- a/modules/nixos/nvidia.nix
+++ b/modules/nixos/nvidia.nix
@@ -3,12 +3,11 @@
 {
   hardware.opengl = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
   };
 
   hardware.nvidia.modesetting.enable = true;
   hardware.nvidia.nvidiaSettings = true;
+  hardware.nvidia.open = false;
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
 
   services.xserver.videoDrivers = [ "nvidia" ];
diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix
index 4d1b0f6..e48ac51 100644
--- a/modules/nixos/user.nix
+++ b/modules/nixos/user.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  #programs.zsh.enable = true;
+  programs.zsh.enable = true;
 
   nix.settings = {
     trusted-users = ["mthomson"];
@@ -18,7 +18,7 @@
 
 
   users.users.mthomson = {
-    #shell = pkgs.zsh;
+    shell = pkgs.zsh;
     isNormalUser = true;
     description = "Michael Thomson";
     extraGroups = [ "networkmanager" "wheel" ];