diff --git a/flake.nix b/flake.nix
index 7334e26..436ea56 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,7 +117,10 @@
             {
               home-manager.extraSpecialArgs = { inherit system inputs; };
               home-manager.users.srid = { pkgs, ... }: {
-                imports = [ ./home/neovim.nix ];
+                imports = [
+                  ./home/tmux.nix
+                  ./home/neovim.nix
+                ];
                 home.stateVersion = "21.11";
               };
             }
diff --git a/home.nix b/home.nix
index 2014a92..5474dbd 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,9 @@
 { pkgs, inputs, system, ... }:
 rec {
-  imports = [ inputs.nix-doom-emacs.hmModule ];
+  imports = [
+    inputs.nix-doom-emacs.hmModule
+    ./home/tmux.nix
+  ];
 
   home.packages = with pkgs; [
     gnumake
@@ -46,8 +49,6 @@ rec {
   programs = {
     git = import ./home/git.nix;
 
-    tmux = import ./home/tmux.nix;
-
     # Leaving this disabled, as it doesn't look like nix-doom-emacs is being
     # maintained or kept up to date anymore.
     doom-emacs = {
diff --git a/home/tmux.nix b/home/tmux.nix
index 9c66caa..16e3188 100644
--- a/home/tmux.nix
+++ b/home/tmux.nix
@@ -1,20 +1,22 @@
 {
-  enable = true;
-  shortcut = "a";
-  # aggressiveResize = true; -- Disabled to be iTerm-friendly
-  baseIndex = 1;
-  newSession = true;
-  # Stop tmux+escape craziness.
-  escapeTime = 0;
-  # Force tmux to use /tmp for sockets (WSL2 compat)
-  secureSocket = false;
+  programs.tmux = {
+    enable = true;
+    shortcut = "a";
+    # aggressiveResize = true; -- Disabled to be iTerm-friendly
+    baseIndex = 1;
+    newSession = true;
+    # Stop tmux+escape craziness.
+    escapeTime = 0;
+    # Force tmux to use /tmp for sockets (WSL2 compat)
+    secureSocket = false;
 
-  extraConfig = ''
-    # Mouse works as expected
-    set-option -g mouse on
-    # easy-to-remember split pane commands
-    bind | split-window -h -c "#{pane_current_path}"
-    bind - split-window -v -c "#{pane_current_path}"
-    bind c new-window -c "#{pane_current_path}"
-  '';
+    extraConfig = ''
+      # Mouse works as expected
+      set-option -g mouse on
+      # easy-to-remember split pane commands
+      bind | split-window -h -c "#{pane_current_path}"
+      bind - split-window -v -c "#{pane_current_path}"
+      bind c new-window -c "#{pane_current_path}"
+    '';
+  };
 }
diff --git a/hosts/darwin.nix b/hosts/darwin.nix
index 76c02b6..47add03 100644
--- a/hosts/darwin.nix
+++ b/hosts/darwin.nix
@@ -9,7 +9,6 @@
     ripgrep
     sd
     tig
-    tmux
     pass
     pandoc
     neovim-nightly