diff --git a/home/alex/programs/neovim/default.nix b/home/alex/programs/neovim/default.nix
new file mode 100644
index 0000000..e455b33
--- /dev/null
+++ b/home/alex/programs/neovim/default.nix
@@ -0,0 +1,20 @@
+{ 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 5e9fef0..4ab3dd3 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -3,22 +3,17 @@
 # minimal config, suitable for servers
 let
   user = {
-    name = "alex";
+    name = config.home.username;
     fullName = "Alexander Kobjolke";
     mail = "me@failco.de";
   };
 
   myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
-  imports = [
-    # shell config
-    #./modules/shell
-  ];
+  imports = [ ./alex/programs/neovim/default.nix ];
 
   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 $@"; };
@@ -182,8 +177,6 @@ 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 ebc6176..551b066 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -131,6 +131,7 @@ 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 b4215c9..69d1cb3 100644
--- a/modules/iohk.nix
+++ b/modules/iohk.nix
@@ -3,7 +3,7 @@
 {
   # Binary Cache for Haskell.nix
   nix.settings.trusted-public-keys =
-    [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
+    [ "cache.iog.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
 
-  nix.settings.substituters = lib.mkAfter [ "https://hydra.iohk.io" ];
+  nix.settings.substituters = lib.mkAfter [ "https://cache.iog.io" ];
 }