diff --git a/home/alex/programs/neovim/default.nix b/home/alex/programs/neovim/default.nix
deleted file mode 100644
index e455b33..0000000
--- a/home/alex/programs/neovim/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-    vimAlias = true;
-
-    extraConfig = ''
-      set nowrap
-    '';
-
-    plugins = with pkgs.vimPlugins; [
-      vim-nix
-
-      indentLine
-      indent-blankline-nvim
-      neoformat
-    ];
-  };
-}
diff --git a/home/cli.nix b/home/cli.nix
index 4ab3dd3..5e9fef0 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -3,17 +3,22 @@
 # minimal config, suitable for servers
 let
   user = {
-    name = config.home.username;
+    name = "alex";
     fullName = "Alexander Kobjolke";
     mail = "me@failco.de";
   };
 
   myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
-  imports = [ ./alex/programs/neovim/default.nix ];
+  imports = [
+    # shell config
+    #./modules/shell
+  ];
 
   programs.home-manager.enable = true;
   home = {
+    username = user.name;
+    homeDirectory = "/home/${config.home.username}";
     stateVersion = "21.05";
     sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ];
     shellAliases = { e = "emacsclient -c $@"; };
@@ -177,6 +182,8 @@ in {
 
     ssh.enable = true;
 
+    neovim = import ./modules/nvim.nix pkgs;
+
     texlive.enable = true;
   };
 
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 551b066..ebc6176 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -131,7 +131,6 @@ in {
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.alex = {
-    description = "Alexander Kobjolke";
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;
diff --git a/modules/iohk.nix b/modules/iohk.nix
index 69d1cb3..b4215c9 100644
--- a/modules/iohk.nix
+++ b/modules/iohk.nix
@@ -3,7 +3,7 @@
 {
   # Binary Cache for Haskell.nix
   nix.settings.trusted-public-keys =
-    [ "cache.iog.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
+    [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
 
-  nix.settings.substituters = lib.mkAfter [ "https://cache.iog.io" ];
+  nix.settings.substituters = lib.mkAfter [ "https://hydra.iohk.io" ];
 }