Update .conduit.yaml to build from source

.conduit.yaml

@@ -1,34 +1,15 @@
 ---
 - location: ~/.config/tmux
 - apt:
-    - tmux
-    - xclip
-    - urlview
-    - sysstat
-    - jq
-- brew:
-    - tmux
-    - urlview
-    - reattach-to-user-namespace
-- pacman:
-    - tmux
-    - xclip
-    - urlscan
-- dnf:
-    - tmux
-    - xclip
-    - urlscan
+    - libevent-dev
+    - ncurses-dev
+    - xsel
+- repo:
+    - url: 'https://github.com/tmux/tmux.git'
+      location: ~/.local/src/tmux
+      branch: 2.6
+      actions:
+          - command: ./configure --prefix=$HOME/.local
+          - command: {install: make -j8 install, remove: make uninstall}
 - symlink:
-    - src: tmux.conf
-      dst: ~/.tmux.conf
-    - src: layouts/session-main
-      dst: ~/.local/share/tmux/layouts/session-main
-    - src: layouts/window-tall
-      dst: ~/.local/share/tmux/layouts/window-tall
-    - src: layouts/window-wide-left
-      dst: ~/.local/share/tmux/layouts/window-wide-left
-    - src: layouts/window-wide-right
-      dst: ~/.local/share/tmux/layouts/window-wide-right
-- command:
-    - install: system-info/install.sh
-    - remove: system-info/remove.sh
+    - {src: tmux.conf, dst: ~/.tmux.conf}

layouts/2vt

@@ -1,3 +1,4 @@
 # vim: ft=tmux
+select-pane -t 0
 split-window -v -p 34
 select-pane -t 1

layouts/session-main

@@ -1,4 +0,0 @@
-rename-session main
-rename-window home
-
-# vim: filetype=tmux

layouts/window-wide-left

@@ -1,3 +0,0 @@
-# vim: ft=tmux
-split-window -h -p 43
-select-pane -t 1

layouts/window-wide-right

@@ -1,3 +0,0 @@
-# vim: ft=tmux
-split-window -h -p 57
-select-pane -t 1

system-info/install.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-script_dir=`dirname $0`
-
-if [ `uname` = Darwin ]; then
-  cp $script_dir/system-info.plist ~/Library/LaunchAgents/system-info.plist
-  launchctl load -w ~/Library/LaunchAgents/system-info.plist
-else
-  cp $script_dir/system-info.service ~/.config/systemd/user/system-info.service
-  systemctl --user enable system-info
-  systemctl --user start system-info
-fi

system-info/remove.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-if [ `uname` = Darwin ]; then
-  launchctl unload ~/Library/LaunchAgents/system-info.plist
-  rm ~/Library/LaunchAgents/system-info.plist
-else
-  systemctl --user stop system-info
-  systemctl --user disable system-info
-fi

system-info/system-info-Linux.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-cache_dir=~/.cache/tmux
-cache_file=$cache_dir/system-info
-
-# Make sure the output directory exists.
-if [ ! -d $cache_dir ]; then
-  mkdir -p $cache_dir
-fi
-
-# Cleanup cache file when interrupted.
-trap '[ -f $cache_file ] && rm $cache_file; exit' INT
-trap '[ -f $cache_file ] && rm $cache_file; exit' TERM
-
-while true; do
-  # Parse the current CPU load on all cores/threads.
-  cpu_load=`mpstat -P ALL -n 1 -u 1 -o JSON | \
-    jq '.sysstat.hosts[0].statistics[0]["cpu-load"][1:]|.[].idle' | \
-    awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 11), 1) }'`
-  # Parse the current CPU package temperature.
-  cpu_temp=`sensors coretemp-isa-0000 | awk 'NR == 3 { print substr($4, 2) }'`
-  # Write to the cache file.
-  echo "$cpu_temp $cpu_load" > $cache_file
-done

system-info/system-info-macOS.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-cache_dir=~/.cache/tmux
-cache_file=$cache_dir/system-info
-
-# Make sure the output directory exists.
-if [ ! -d $cache_dir ]; then
-  mkdir -p $cache_dir
-fi
-
-# Cleanup cache file when interrupted.
-trap '[ -f $cache_file ] && rm $cache_file; exit' INT
-trap '[ -f $cache_file ] && rm $cache_file; exit' TERM
-
-while true; do
-  battery="`pmset -g batt | grep --color=never -Eo '\d+%'` ↯"
-  echo "$battery" > $cache_file
-  sleep 2
-done

system-info/system-info.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>Label</key>
-    <string>system-info</string>
-    <key>ProgramArguments</key>
-    <array>
-      <string>/Users/benie/.config/tmux/system-info/system-info-macOS.sh</string>
-    </array>
-    <key>KeepAlive</key>
-    <true/>
-  </dict>
-</plist>

system-info/system-info.service

@@ -1,8 +0,0 @@
-[Unit]
-Description=System Info
-
-[Service]
-ExecStart=/home/benie/.config/tmux/system-info/system-info-Linux.sh
-
-[Install]
-WantedBy=default.target

tmux.conf

@@ -1,6 +1,3 @@
-# Set the tmux version to check for command support
-run 'tmux setenv -g TMUX_VERSION $(tmux -V | cut -c 6-8)'
-
 # Use vim keybindings in copy mode
 set -g mode-keys vi
 
@@ -13,13 +10,13 @@ bind Space send-prefix
 set -s escape-time 0
 
 # Increase scrollback buffer size
-set -g history-limit 1000000
+set -g history-limit 50000
 
 # Set tmux messages display time to 4 seconds
 set -g display-time 4000
 
 # Refresh 'status-left' and 'status-right' more often
-set -g status-interval 2
+set -g status-interval 5
 
 # Upgrade $TERM
 set -g default-terminal "tmux-256color"
@@ -37,109 +34,78 @@ set -g pane-base-index 1
 # Enable mouse support
 set-option -g mouse on
 
-# Enable changing cursor shape per pane, vim or zsh should emit escape
-# sequences to change cursor shape.
-# iTerm2 only requires this before tmux 2.9
-if '[ -n $ITERM_PROFILE ] && [[ "$TMUX_VERSION" < "2.9" ]]' \
-  'set -ga terminal-overrides "*:Ss=\E]1337;CursorShape=%p1%d\7"'
-# VTE compatible terminals.
-if '[ ! -n $ITERM_PROFILE ]' \
-  'set -ga terminal-overrides "*:Ss=\E[%p1%d q:Se=\E[2 q"'
+# Enable changing cursor shape per pane in iTerm2 or VTE compatible terminals,
+# vim or zsh should emit VTE compatible escape sequences to change cursor shape
+if -b '[ -n $ITERM_PROFILE ]' \
+  "set -ga terminal-overrides '*:Ss=\E]1337;CursorShape=%p1%d\7'" \
+  "set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[2 q'"
 
 # Enable strikethrough on VTE compatible terminals.
 set -ga terminal-overrides 'xterm*:smxx=\E[9m'
 
-# Set only on macOS where it's required
+# Set only on OS X where it's required
 if -b '[ "`uname`" = "Darwin" ]' \
-  'set -g default-command "reattach-to-user-namespace -l $SHELL"'
+  "set -g default-command 'reattach-to-user-namespace -l $SHELL'"
 
 # Restore old next/previous window bindings
 bind C-n next-window
 bind C-p previous-window
 
 # Make new splits open in current directory
-bind '"' split-window -c '#{pane_current_path}'
-bind '%' split-window -h -c '#{pane_current_path}'
-
-# Change word separators to better match Vim.
-set -g word-separators "<>(){}[]/'\";@*+,.-_=!£$%^&:#~?`¬|\\ "
+bind "\"" split-window -c "#{pane_current_path}"
+bind "%" split-window -h -c "#{pane_current_path}"
 
 # Integrate pane selection with vim
-in_vim='tmux show-window-options | grep -q "@vim#{pane_id}"'
-bind -n C-h if $in_vim 'send-keys C-h' 'select-pane -L'
-bind -n C-j if $in_vim 'send-keys C-j' 'select-pane -D'
-bind -n C-k if $in_vim 'send-keys C-k' 'select-pane -U'
-bind -n C-l if $in_vim 'send-keys C-l' 'select-pane -R'
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
+bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
+bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
+bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 
-# Integrate urlscan or fallback to urlview
-if -b 'which urlscan' \
-  'bind u capture-pane \; split-window "tmux show-buffer | urlscan"' \
-  'bind u capture-pane \; split-window "tmux show-buffer | urlview -"'
+# Integrate urlview
+bind-key u capture-pane \; split-window "tmux show-buffer | urlview -"
 
-# Unbind copy mode defaults so pane selection works
-unbind -T copy-mode-vi C-h
-unbind -T copy-mode-vi C-j
 # Enter copy mode with C-U
-bind C-u copy-mode -u
+bind-key C-u copy-mode -u
 # Begin selection in copy mode with v not Space
-bind -T copy-mode-vi v send-keys -X begin-selection
-
-# Enable mouse scrolling up in alternate buffers.
-# If #{mouse_any_flag} is 1 the pane is running with mouse support, e.g. vim.
-# If #{alternate_on} is 1 the terminal is in alternate buffer mode, e.g. less.
-# If #{pane_in_mode} is 1 the pane is in copy-mode.
-bind -n WheelUpPane \
-  if -Ft= "#{mouse_any_flag}" \
-    "send-keys -M" \
-    "if -Ft= \"#{alternate_on}\" \
-      \"send-keys -t= Up ; \
-        send-keys -t= Up ; \
-        send-keys -t= Up ; \" \
-      \"select-pane -t= ; \
-        if -Ft= '#{pane_in_mode}' \
-          'send-keys -M' \
-          'copy-mode -e ; send-keys -M' \" "
-# Emulate mouse scrolling down in alternate buffers.
-bind -n WheelDownPane \
-  if -Ft= "#{mouse_any_flag}" \
-    "send-keys -M" \
-    "if -Ft= \"#{alternate_on}\" \
-      \"send-keys -t= Down ; \
-        send-keys -t= Down ; \
-        send-keys -t= Down ; \" \
-      \"select-pane -t= ; \
-        send-keys -M\" "
-
+bind-key -T copy-mode-vi v send-keys -X begin-selection
 # Yank to the system clipboard in copy mode
-if -b '[ "`uname`" = "Darwin" ]' \
-  'bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel \
-    "reattach-to-user-namespace pbcopy"' \
-  'bind -T copy-mode-vi y send -X copy-pipe-and-cancel \
-    "xclip -i -sel p -f | xclip -i -sel c"'
+if -b '[ "`uname`" = "Linux" ]' \
+  "bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xsel -i -p && xsel -o -p | xsel -i -b'"
 
 # Left status style
-setw -g status-left " #{session_name}"
-setw -g status-left-style fg=colour240,bg=colour233
+set-window-option -g status-left " #S"
+set-window-option -g status-left-fg colour240
+set-window-option -g status-left-bg colour233
 
 # Centre status style
-setw -g status-style fg=colour240,bg=colour233
+set-window-option -g status-fg colour240
+set-window-option -g status-bg colour233
 
-# Right status style shows system info, date, and time.
-setw -g status-right "#(cat ~/.cache/tmux/system-info) %a %d-%m-%y %H:%M "
-setw -g status-right-style fg=white,bg=colour233
+# Right status style
+set-window-option -g status-right "%a %d-%m-%y %H:%M "
+set-window-option -g status-right-fg white
+set-window-option -g status-right-bg colour233
 
 # Active window status style
-setw -g window-status-current-format " #{window_index}: #{window_name}"
-setw -g window-status-current-style fg=white,bg=colour233
+set-window-option -g window-status-current-format " #I: #W"
+set-window-option -g window-status-current-fg white
+set-window-option -g window-status-current-bg colour233
 
 # Inactive window status style
-setw -g window-status-format " #{window_index}: #{window_name}"
-setw -g window-status-style fg=colour240,bg=colour233
+set-window-option -g window-status-format " #I: #W"
+set-window-option -g window-status-fg colour240
+set-window-option -g window-status-bg colour233
 
-# Pane border style
-set -g pane-border-style fg=colour233,bg=colour233
-set -g pane-active-border-style fg=colour235,bg=colour235
+# Active pane border
+set-option -g pane-active-border-fg colour235
+set-option -g pane-active-border-bg colour235
+
+# Inactive pane border
+set-option -g pane-border-fg colour233
+set-option -g pane-border-bg colour233
 
 # Command line window list selection
-set-window-option -g mode-style fg=white,bg=colour237
-set-option -g message-style fg=white,bg=colour237
+set-window-option -g mode-style fg=colour233,bg=colour30
+set-option -g message-style fg=colour233,bg=colour30

visor.zsh

@@ -1,6 +0,0 @@
-if ! tmux list-sessions -F '#{session_name}' | grep 'visor' > /dev/null; then
-  tmux new-session -d -s visor
-  tmux rename-window -t visor:0 home
-fi
-tmux attach-session -t visor
-exit