diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix
index 3e29317..521cc84 100644
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -18,6 +18,11 @@
     ../../modules/home-manager/bitwarden.nix
     ../../modules/home-manager/latex.nix
     ../../modules/home-manager/ghostty.nix
+    ../../modules/home-manager/jq.nix
+    ../../modules/home-manager/lazygit.nix
+    ../../modules/home-manager/man.nix
+    ../../modules/home-manager/direnv.nix
+    ../../modules/home-manager/spotify-player.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/Users/mthomson";
@@ -28,11 +33,6 @@
   };
 
   programs = {
-    direnv = {
-      enable = true;
-      enableZshIntegration = true;
-      nix-direnv.enable = true;
-    };
     zk = {
       enable = true;
       settings = {
@@ -41,29 +41,6 @@
         };
       };
     };
-    jq = {
-      enable = true;
-    };
-    lazygit = {
-      enable = true;
-    };
-    man = {
-      enable = true;
-    };
-    tealdeer = {
-      enable = true;
-      settings.updates.auto_update = true;
-    };
-    helix = {
-      enable = true;
-    };
-    neovide = {
-      enable = true;
-      settings = {};
-    };
-    spotify-player = {
-      enable = true;
-    };
   };
 
   home.packages = with pkgs; [
@@ -81,7 +58,6 @@
     ]))
     bitwarden-cli
     nodejs
-    ladybird
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/home-manager/spotify-player.nix b/modules/home-manager/spotify-player.nix
new file mode 100644
index 0000000..f90691b
--- /dev/null
+++ b/modules/home-manager/spotify-player.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs = {
+    spotify-player = {
+      enable = true;
+    };
+  };
+}
diff --git a/modules/home-manager/tealdeer.nix b/modules/home-manager/tealdeer.nix
new file mode 100644
index 0000000..067dc4a
--- /dev/null
+++ b/modules/home-manager/tealdeer.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs = {
+    tealdeer = {
+      enable = true;
+      settings.updates.auto_update = true;
+    };
+  };
+}