diff --git a/nix/home/opdavies/hosts/t490.nix b/nix/home/opdavies/hosts/t490.nix
index e02cca2..f9125ce 100644
--- a/nix/home/opdavies/hosts/t490.nix
+++ b/nix/home/opdavies/hosts/t490.nix
@@ -5,6 +5,7 @@
     cli = {
       bluetuith.enable = true;
       direnv.enable = true;
+      neovim.enable = true;
 
       notes = {
         enable = true;
@@ -13,6 +14,7 @@
       };
 
       syncthing.enable = true;
+      tmux.enable = true;
       tmux-sessionizer.enable = true;
     };
 
diff --git a/nix/lib/shared/home-manager.nix b/nix/lib/shared/home-manager.nix
index 0a5e79f..1c1be62 100644
--- a/nix/lib/shared/home-manager.nix
+++ b/nix/lib/shared/home-manager.nix
@@ -1,4 +1,4 @@
-{ lib, username, ... }:
+{ username, ... }:
 
 {
   home.username = "${username}";
@@ -21,13 +21,4 @@
   home.stateVersion = "22.05";
 
   programs.home-manager.enable = true;
-
-  features = lib.mkMerge [
-    {
-      cli = {
-        neovim.enable = lib.mkDefault true;
-        tmux.enable = lib.mkDefault true;
-      };
-    }
-  ];
 }