about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--nix-conf/home/includes/dev-common.nix11
-rw-r--r--nix-conf/home/includes/linux-dev.nix1
-rw-r--r--nix-conf/home/includes/linux-server.nix3
3 files changed, 13 insertions, 2 deletions
diff --git a/nix-conf/home/includes/dev-common.nix b/nix-conf/home/includes/dev-common.nix
index d569566..904b4f8 100644
--- a/nix-conf/home/includes/dev-common.nix
+++ b/nix-conf/home/includes/dev-common.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
 
   imports = [
@@ -19,12 +19,19 @@
     enable = true;
     terminal = "screen-256color";
     prefix = "C-x";
-    #tmuxp.enable = true;
     extraConfig = ''
+     tmux bind-key R run-shell ' \
+       tmux source-file ~/.config/tmux/tmux.conf > /dev/null; \
+       tmux display-message "Sourced .config/tmux/tmux.conf!"'
+      bind-key £ split-window -h
       set-option -g status-bg '#666666'
       set-option -g status-fg '#aaaaaa'
       set-option -g status-left-length 50
       set-option -g status-right " %a, %b %d - %H:%M "
+      ${lib.optionalString pkgs.stdenv.isLinux ''
+        bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "xsel -i -p && xsel -o -p | xsel -i -b"
+        bind-key C-y run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
+      ''}
     '';
   };
 
diff --git a/nix-conf/home/includes/linux-dev.nix b/nix-conf/home/includes/linux-dev.nix
index b03b0a0..e8981b7 100644
--- a/nix-conf/home/includes/linux-dev.nix
+++ b/nix-conf/home/includes/linux-dev.nix
@@ -27,6 +27,7 @@
     notmuch
     nix
     protonvpn-cli
+    xsel
     youtube-dl
   ];
 
diff --git a/nix-conf/home/includes/linux-server.nix b/nix-conf/home/includes/linux-server.nix
index 6ad82fb..b4d7d1e 100644
--- a/nix-conf/home/includes/linux-server.nix
+++ b/nix-conf/home/includes/linux-server.nix
@@ -26,6 +26,9 @@
     prefix = "C-a";
     #tmuxp.enable = true;
     extraConfig = ''
+      tmux bind-key R run-shell ' \
+        tmux source-file ~/.config/tmux/tmux.conf > /dev/null; \
+        tmux display-message "Sourced .config/tmux/tmux.conf!"'
       bind-key C-a last-window
       bind-key a send-prefix