diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
index 6a0f9024..c1faa65e 100644
--- a/home/opdavies/hosts/t480.nix
+++ b/home/opdavies/hosts/t480.nix
@@ -2,8 +2,6 @@
 
 {
   homeManagerModules = {
-    newsboat.enable = true;
-
     notes = {
       enable = true;
       directory = "$HOME/Documents/wiki/notes";
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 8ff36709..33a90715 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -25,6 +25,8 @@
 
     ../common
     ../../users/opdavies
+
+    ./modules/newsboat
   ];
 
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
diff --git a/hosts/t480/modules/newsboat/default.nix b/hosts/t480/modules/newsboat/default.nix
new file mode 100644
index 00000000..e99f78e9
--- /dev/null
+++ b/hosts/t480/modules/newsboat/default.nix
@@ -0,0 +1,30 @@
+{
+  home-manager.users.opdavies.programs.newsboat = {
+    enable = true;
+
+    extraConfig = ''
+      bind-key j down
+      bind-key k up
+
+      bind-key j next articlelist
+      bind-key k prev articlelist
+      bind-key J next-feed articlelist
+      bind-key K prev-feed articlelist
+
+      bind-key g home
+      bind-key G end
+
+      bind-key d pagedown
+      bind-key u pageup
+
+      bind-key a toggle-article-read
+      bind-key n next-unread
+      bind-key N prev-unread
+      bind-key x pb-delete
+
+      color info white black bold
+    '';
+
+    urls = import ./urls.nix;
+  };
+}
diff --git a/modules/home-manager/cli/newsboat/urls.nix b/hosts/t480/modules/newsboat/urls.nix
similarity index 100%
rename from modules/home-manager/cli/newsboat/urls.nix
rename to hosts/t480/modules/newsboat/urls.nix
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 06e2f918..b4ccb1f8 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./bin
     ./git.nix
-    ./newsboat
     ./notes.nix
     ./starship.nix
     ./tmux.nix
diff --git a/modules/home-manager/cli/newsboat/default.nix b/modules/home-manager/cli/newsboat/default.nix
deleted file mode 100644
index e29aa01c..00000000
--- a/modules/home-manager/cli/newsboat/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-with lib;
-
-{
-  options.homeManagerModules.newsboat.enable = mkEnableOption "Enable newsboat";
-
-  config = mkIf config.homeManagerModules.newsboat.enable {
-    programs.newsboat = {
-      enable = true;
-
-      extraConfig = ''
-        bind-key j down
-        bind-key k up
-
-        bind-key j next articlelist
-        bind-key k prev articlelist
-        bind-key J next-feed articlelist
-        bind-key K prev-feed articlelist
-
-        bind-key g home
-        bind-key G end
-
-        bind-key d pagedown
-        bind-key u pageup
-
-        bind-key a toggle-article-read
-        bind-key n next-unread
-        bind-key N prev-unread
-        bind-key x pb-delete
-
-        color info white black bold
-      '';
-
-      urls = import ./urls.nix;
-    };
-  };
-}