From f8867e1f8288c7de3a8b0260c492db5bc5f647e8 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sat, 9 Jan 2021 21:02:20 -0500
Subject: [PATCH] nix: remove .tmux.conf for nix

---
 .config/nixpkgs/home.nix     | 50 ++++++++++++++++++++++++++++++++++++
 .config/nixpkgs/packages.nix |  1 -
 .tmux.conf                   | 43 -------------------------------
 3 files changed, 50 insertions(+), 44 deletions(-)
 delete mode 100644 .tmux.conf

diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix
index e2fad68..7cde837 100644
--- a/.config/nixpkgs/home.nix
+++ b/.config/nixpkgs/home.nix
@@ -146,6 +146,56 @@
         };
     };
 
+    tmux = {
+        enable = true;
+        clock24 = true;
+        terminal = "screen-256color";
+        customPaneNavigationAndResize = true;
+        extraConfig = ''
+          set-window-option -g automatic-rename on
+          set-option -g set-titles on
+
+          set -g mouse on
+
+          # Length of tmux status line
+          set -g status-left-length 30
+          set -g status-right-length 150
+
+          set -g status-interval 5
+
+          set -g default-terminal "screen-256color" # colors!
+          setw -g xterm-keys on
+
+          set -g set-titles on          # set terminal title
+          set -g display-panes-time 800 # slightly longer pane indicators display time
+          set -g display-time 2000      # slightly longer status messages display time
+
+          # Lots of scrollback.
+          setw -g history-limit 50000000
+
+          setw -q -g utf8 on
+
+          # activity
+          set -g monitor-activity on
+          set -g visual-activity off
+
+          set -g status-right '#(gitmux #{pane_current_path})'
+
+          set -g @plugin 'tmux-plugins/tmux-pain-control'
+          set -g @plugin 'tmux-plugins/tmux-sensible'
+          set -g @plugin 'tmux-plugins/tmux-sessionist'
+          set -g @plugin 'tmux-plugins/tmux-yank'
+          set -g @plugin 'tmux-plugins/tpm'
+
+          # Theme
+          set -g @plugin 'seebi/tmux-colors-solarized'
+          set -g @colors-solarized 'dark'
+
+          # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+          run -b '~/.tmux/plugins/tpm/tpm'
+        '';
+      };
+
     neovim = {
       enable = true;
       viAlias = true;
diff --git a/.config/nixpkgs/packages.nix b/.config/nixpkgs/packages.nix
index 75ae352..44aadbb 100644
--- a/.config/nixpkgs/packages.nix
+++ b/.config/nixpkgs/packages.nix
@@ -136,7 +136,6 @@ with pkgs; [
   shellcheck
   shfmt
   starship
-  tmux
   xclip
   xdg_utils
   zathura
diff --git a/.tmux.conf b/.tmux.conf
deleted file mode 100644
index ee8de5d..0000000
--- a/.tmux.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Automatically set window title
-set-window-option -g automatic-rename on
-set-option -g set-titles on
-
-set -g mouse on
-
-# Length of tmux status line
-set -g status-left-length 30
-set -g status-right-length 150
-
-set -g status-interval 5
-
-set -g default-terminal "screen-256color" # colors!
-setw -g xterm-keys on
-
-set -g set-titles on          # set terminal title
-set -g display-panes-time 800 # slightly longer pane indicators display time
-set -g display-time 2000      # slightly longer status messages display time
-
-# Lots of scrollback.
-setw -g history-limit 50000000
-
-setw -q -g utf8 on
-
-# activity
-set -g monitor-activity on
-set -g visual-activity off
-
-set -g status-right '#(gitmux #{pane_current_path})'
-
-set -g @plugin 'tmux-plugins/tmux-pain-control'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'tmux-plugins/tmux-sessionist'
-set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'tmux-plugins/tpm'
-
-# Theme
-set -g @plugin 'seebi/tmux-colors-solarized'
-set -g @colors-solarized 'dark'
-
-# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run -b '~/.tmux/plugins/tpm/tpm'
-