Add project bind to select ~/Projects

2025-08-19 15:28:03 +01:00
15 changed files with 94 additions and 238 deletions
--- a/agent-cmd.sh
+++ b/agent-cmd.sh
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# Wrapper that runs an agent command, then detaches if all panes in window are dead
-
-# Run the agent command (don't use set -e, agent may exit non-zero)
-"$@" || true
-
-# Brief delay to let tmux update pane status
-sleep 0.1
-
-# Count panes still running (pane_dead=0)
-# Note: our own pane counts as running since this script is executing
-running=$(tmux list-panes -F '#{pane_dead}' | grep -c '^0$' || true)
-
-# If we're the only pane still running, all others are dead - detach
-[ "$running" -le 1 ] && tmux detach-client
--- a/agent.sh
+++ b/agent.sh
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Check which agent commands are available
-agents=()
-command -v claude &>/dev/null && agents+=(claude)
-command -v opencode &>/dev/null && agents+=(opencode)
-command -v gemini &>/dev/null && agents+=(gemini)
-
-if [ ${#agents[@]} -eq 0 ]; then
-  echo "No agent commands found (claude, gemini)"
-  exit 1
-fi
-
-# Use the current directory (set via display-popup -d)
-dir="${PWD:-$HOME}"
-# Use the directory basename as window name
-window_name=$dir
-
-# Create the agent session if it doesn't exist
-if ! tmux has-session -t agent; then
-  tmux new-session -ds agent -c "$dir" -n "$window_name" "$script_dir/agent-cmd.sh" "${agents[0]}"
-  [ ${#agents[@]} -gt 1 ] && tmux split-window -h -t agent:0 "$script_dir/agent-cmd.sh" "${agents[1]}"
-  # Store the directory in a window option for later matching
-  tmux set-window-option -t agent @agent_dir "$dir"
-  tmux set-option -t agent status off
-  tmux set-option -t agent remain-on-exit on
-  tmux attach-session -t agent
-  exit 0
-fi
-
-# Search for an existing window with matching directory
-target_window=""
-for window_id in $(tmux list-windows -t agent -F '#{window_id}'); do
-  window_dir=$(tmux show-window-option -t "$window_id" -v @agent_dir 2>/dev/null || true)
-  if [ "$window_dir" = "$dir" ]; then
-    target_window="$window_id"
-    break
-  fi
-done
-
-if [ -n "$target_window" ]; then
-  # Select the existing window
-  tmux select-window -t "$target_window"
-else
-  # Create a new window with agents
-  tmux new-window -t agent -c "$dir" -n "$window_name" "$script_dir/agent-cmd.sh" "${agents[0]}"
-  [ ${#agents[@]} -gt 1 ] && tmux split-window -h -t agent -c "$dir" "$script_dir/agent-cmd.sh" "${agents[1]}"
-  # Store the directory in a window option for later matching
-  tmux set-window-option -t agent @agent_dir "$dir"
-fi
-
-# Attach to the session
-tmux attach-session -t agent
--- a/check-version.sh
+++ b/check-version.sh
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-# Compare the current tmux version against a given version.
-# Exit: 0 if comparison is true, 1 if false
-
-set -euo pipefail
-
-usage() {
-  echo "usage: $0 <operator> <version>" >&2
-  echo "operators: < <= == >= >" >&2
-}
-
-if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
-  usage
-  exit 0
-fi
-
-if [[ $# -ne 2 ]]; then
-  usage
-  exit 1
-fi
-
-operator="$1"
-target_version="$2"
-
-# Extract tmux version (e.g., "tmux 3.3a" -> "3.3a")
-current_version=$(tmux -V | sed 's/^tmux //')
-
-# Compare two version strings
-# Returns: -1 if v1 < v2, 0 if v1 == v2, 1 if v1 > v2
-compare_versions() {
-  local v1="$1"
-  local v2="$2"
-
-  # Strip trailing letters (e.g., "3.3a" -> "3.3") and save them
-  local v1_suffix="${v1##*[0-9]}"
-  local v2_suffix="${v2##*[0-9]}"
-  v1="${v1%[a-zA-Z]*}"
-  v2="${v2%[a-zA-Z]*}"
-
-  # Split into components
-  IFS='.' read -ra v1_parts <<< "$v1"
-  IFS='.' read -ra v2_parts <<< "$v2"
-
-  # Compare numeric parts
-  local max_len=$(( ${#v1_parts[@]} > ${#v2_parts[@]} ? ${#v1_parts[@]} : ${#v2_parts[@]} ))
-  for ((i = 0; i < max_len; i++)); do
-    local p1="${v1_parts[i]:-0}"
-    local p2="${v2_parts[i]:-0}"
-    if ((p1 < p2)); then
-      echo -1
-      return
-    elif ((p1 > p2)); then
-      echo 1
-      return
-    fi
-  done
-
-  # Numeric parts equal, compare suffixes (no suffix < a < b < ...)
-  # A letter suffix indicates a patch release, so 3.6a > 3.6
-  if [[ -z "$v1_suffix" && -n "$v2_suffix" ]]; then
-    echo -1
-    return
-  elif [[ -n "$v1_suffix" && -z "$v2_suffix" ]]; then
-    echo 1
-    return
-  elif [[ "$v1_suffix" < "$v2_suffix" ]]; then
-    echo -1
-    return
-  elif [[ "$v1_suffix" > "$v2_suffix" ]]; then
-    echo 1
-    return
-  fi
-
-  echo 0
-}
-
-result=$(compare_versions "$current_version" "$target_version")
-
-case "$operator" in
-  '<')
-    [[ "$result" -eq -1 ]] && exit 0 || exit 1 ;;
-  '<=')
-    [[ "$result" -le 0 ]] && exit 0 || exit 1 ;;
-  '==')
-    [[ "$result" -eq 0 ]] && exit 0 || exit 1 ;;
-  '>=')
-    [[ "$result" -ge 0 ]] && exit 0 || exit 1 ;;
-  '>')
-    [[ "$result" -eq 1 ]] && exit 0 || exit 1 ;;
-  *)
-    echo "error: invalid operator: $operator" >&2
-    usage
-    exit 1
-    ;;
-esac
--- a/hooks/session-create.sh
+++ b/hooks/session-create.sh
@@ -4,6 +4,6 @@ session_name=$(tmux display-message -p '#S')
 session_layout=~/.local/share/tmux/layouts/session-$session_name
 if [ -f $session_layout ]; then
  $session_layout
-elif [ "$session_name" != "agent" ]; then
+else
  tmux rename-window home
 fi
--- a/install.sh
+++ b/install.sh
@@ -33,8 +33,6 @@ symlink $HOME/.config/tmux/layouts/session-main \
        $HOME/.local/share/tmux/layouts/session-main
 symlink $HOME/.config/tmux/layouts/session-visor \
        $HOME/.local/share/tmux/layouts/session-visor
-symlink $HOME/.config/tmux/layouts/session-work \
-        $HOME/.local/share/tmux/layouts/session-work
 symlink $HOME/.config/tmux/layouts/window-auto \
        $HOME/.local/share/tmux/layouts/window-auto
 symlink $HOME/.config/tmux/layouts/window-tall \
--- a/layouts/session-work
+++ b/layouts/session-work
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-tmux rename-window work
-tmux rename-window home
-$(dirname $0)/window-auto
-
-tmux new-window -c ~/Projects/modularml/modular
-tmux rename-window modularml/modular
-$(dirname $0)/window-auto
--- a/layouts/window-auto
+++ b/layouts/window-auto
@@ -2,7 +2,7 @@

 cols=`tmux display -p "#{pane_width}"`
 lines=`tmux display -p "#{pane_height}"`
-width=$(( $cols / 2.5 ))
+width=$(( $cols / 2 )).0
 height=$lines.0
 ratio=$(( ($width / $height) * 100 ))

--- a/layouts/window-wide-left
+++ b/layouts/window-wide-left
@@ -1,11 +1,6 @@
-#!/usr/bin/env bash
+#!/usr/bin/env -S tmux source-file

-cols=`tmux display -p "#{pane_width}"`
+split-window -h -l 43% -c '#{pane_current_path}'
+select-pane -t 1

-if [ "$LAYOUT_FULLSCREEN" = "1" ]; then
-  tmux split-window -h -l 37% -c '#{pane_current_path}'
-  tmux select-pane -t 1
-else
-  tmux split-window -h -l 43% -c '#{pane_current_path}'
-  tmux select-pane -t 1
-fi
+# vim: ft=tmux
--- a/layouts/window-wide-right
+++ b/layouts/window-wide-right
@@ -1,11 +1,6 @@
-#!/usr/bin/env bash
+#!/usr/bin/env -S tmux source-file

-cols=`tmux display -p "#{pane_width}"`
+split-window -h -l 57% -c '#{pane_current_path}'
+select-pane -t 1

-if [ "$TMUX_LAYOUT_FULLSCREEN" = "1" ]; then
-  tmux split-window -h -l 63% -c '#{pane_current_path}'
-  tmux select-pane -t 1
-else
-  tmux split-window -h -l 57% -c '#{pane_current_path}'
-  tmux select-pane -t 1
-fi
+# vim: ft=tmux
--- a/project.sh
+++ b/project.sh
@@ -16,5 +16,5 @@ project=$(
  fzf --layout=reverse --info=hidden --border=rounded --cycle
 )

-tmux new-window -n $project -c ~/Projects/$project
+tmux new-window -n $project -c "~/Projects/$project"
 ~/.local/share/tmux/layouts/window-auto
--- a/system-info/system-info-Linux.sh
+++ b/system-info/system-info-Linux.sh
@@ -35,11 +35,11 @@ if upower -e | grep 'BAT' 2> /dev/null; then
    local percentage=$(echo $output | awk '{ print $4 }')
    if [ "$charging" = "Charging," ];then
      echo $percentage | awk '$battery ~ /.*/ {
-        printf " %d%% %s\n", $battery, substr("󰢟󰢜󰂆󰂇󰂈󰢝󰂉󰢞󰂊󰂋󰂅", int($battery / 100 * 11), 1)
+        printf " %d%% %s\n", $battery, substr("󰢟󰢜󰂆󰂇󰂈󰢝󰂉󰢞󰂊󰂋󰂅", int($battery / 9), 1)
      }'
    else
      echo $percentage | awk '$battery ~ /.*/ {
-        printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 100 * 11), 1)
+        printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 9), 1)
      }'
    fi
  }
@@ -57,7 +57,7 @@ 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 / 100 * 9), 1) }'`"
+    awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 11), 1) }'`"

  # Parse the current CPU package temperature.
  cpu_temp=$(get_cpu_temp)
--- a/system-info/system-info-WSL.sh
+++ b/system-info/system-info-WSL.sh
@@ -32,14 +32,14 @@ while true; do

  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 / 100 * 9), 1) }'`"
+    awk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 11), 1) }'`"

  raw_battery=$($powershell -NoProfile \
    "(Get-WmiObject win32_battery).EstimatedChargeRemaining" \
    | sed 's/\r//')
  if [ "" != "$raw_battery" ]; then
    battery="$(echo $raw_battery | awk '$battery ~ /.*/ {
-      printf " %d%% %s\n", $battery, substr("", int($battery / 100 * 11), 1)
+      printf " %d%% %s\n", $battery, substr("", int($battery / 9), 1)
    }')"
  fi

--- a/system-info/system-info-macOS.sh
+++ b/system-info/system-info-macOS.sh
@@ -8,7 +8,68 @@ if [ ! -d $cache_dir ]; then
  mkdir -p $cache_dir
 fi

-[ -f $cache_dir/cpu-temp ] && rm $cache_dir/cpu-temp
+if [ ! -f $cache_dir/cpu-temp ]; then
+  clang -x objective-c -Wall -O2 -g -c -o $cache_dir/cpu-temp.o - << EOF
+#import <Foundation/Foundation.h>
+#import <IOKit/hidsystem/IOHIDEventSystemClient.h>
+#include <unistd.h>
+
+#define IOHIDEventFieldBase(type) (type << 16)
+#define kIOHIDEventTypeTemperature 15
+
+typedef struct __IOHIDEvent *IOHIDEventRef;
+typedef struct __IOHIDServiceClient *IOHIDServiceClientRef;
+typedef double IOHIDFloat;
+
+IOHIDEventSystemClientRef
+IOHIDEventSystemClientCreate(CFAllocatorRef allocator);
+int IOHIDEventSystemClientSetMatching(IOHIDEventSystemClientRef client,
+                                      CFDictionaryRef match);
+IOHIDEventRef IOHIDServiceClientCopyEvent(IOHIDServiceClientRef, int64_t,
+                                          int32_t, int64_t);
+CFStringRef IOHIDServiceClientCopyProperty(IOHIDServiceClientRef service,
+                                           CFStringRef property);
+IOHIDFloat IOHIDEventGetFloatValue(IOHIDEventRef event, int32_t field);
+
+int main(int argc, char *argv[]) {
+  NSDictionary *thermalSensors = @{
+    @"PrimaryUsagePage" : [NSNumber numberWithInt:0xFF00],
+    @"PrimaryUsage" : [NSNumber numberWithInt:5],
+  };
+  IOHIDEventSystemClientRef system =
+      IOHIDEventSystemClientCreate(kCFAllocatorDefault);
+  IOHIDEventSystemClientSetMatching(system,
+                                    (__bridge CFDictionaryRef)thermalSensors);
+  NSArray *serviceClients =
+      (__bridge NSArray *)IOHIDEventSystemClientCopyServices(system);
+
+  long count = [serviceClients count];
+  for (NSUInteger i = 0; i < count; i++) {
+    IOHIDServiceClientRef serviceClient =
+        (IOHIDServiceClientRef)serviceClients[i];
+    NSString *name = (NSString *)IOHIDServiceClientCopyProperty(
+        serviceClient, (__bridge CFStringRef) @"Product");
+    if ([name isEqualToString:[NSString stringWithUTF8String:argv[1]]]) {
+      IOHIDEventRef event = IOHIDServiceClientCopyEvent(
+          serviceClient, kIOHIDEventTypeTemperature, 0, 0);
+      NSNumber *value;
+      double temp = 0.0;
+      if (event != 0) {
+        temp = IOHIDEventGetFloatValue(
+            event, IOHIDEventFieldBase(kIOHIDEventTypeTemperature));
+      }
+      value = [NSNumber numberWithDouble:temp];
+      printf("%.1lf°C\n", [value doubleValue]);
+      break;
+    }
+  }
+
+  return 0;
+}
+EOF
+  clang -o $cache_dir/cpu-temp $cache_dir/cpu-temp.o -framework Foundation -framework IOKit
+  rm $cache_dir/cpu-temp.o
+fi

 # Cleanup cache file when interrupted.
 trap '[ -f $cache_file ] && rm $cache_file; exit' INT
@@ -20,15 +81,13 @@ ioreg -w0 -l | grep BatteryInstalled &> /dev/null && \

 while true; do
  # Get the current CPU temperature.
-  cpu_temp=$(
-    ~/.local/bin/iSMC -o json temp | jq '."PMU tdie1".quantity' | xargs printf "%.1f°C "
-  )
+  cpu_temp="`$cache_dir/cpu-temp 'PMU tdie0'` "

  cpu_load=$(sudo powermetrics --format text \
      --sample-rate 1200 --sample-count 1 --samplers cpu_power |
-    grep --color=never -E 'CPU \d active residency:' |
-    gawk '{print $5}' |
-    gawk '$idle ~ /[-.0-9]*/ { printf "%s", substr(" ▁▂▃▄▅▆▇█", int($idle / 100 * 9), 1) }'
+    grep --color=never -E 'CPU \d idle residency:' |
+    grep --color=never -Eo '\d+\.\d+' |
+    gawk '$idle ~ /[-.0-9]*/ { printf "%s", substr("█▇▆▅▄▃▂▁ ", int($idle / 10), 1) }'
  )

  # Parse the current battery charge percentage.
@@ -38,7 +97,7 @@ while true; do
      grep --color=never -Eo '\d+%' | \
      grep --color=never -Eo '\d+')"
    battery="$(echo $raw_battery | gawk '$battery ~ /.*/ {
-      printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 100 * 11), 1)
+      printf " %d%% %s\n", $battery, substr("󰂎󰁺󰁻󰁼󰁽󰁾󰁿󰂀󰂁󰂂󰁹", int($battery / 9), 1)
    }')"
  fi

--- a/theme.tmux
+++ b/theme.tmux
@@ -11,8 +11,7 @@ setw -g status-style fg=colour240,bg=colour233
 # Right status style shows system info, date, and time.
 setw -g status-right "#[fg=colour240]#(cat ~/.cache/tmux/system-info)#[fg=white] %a %d-%m-%y %H:%M "
 setw -g status-right-style fg=white,bg=colour233
-if -b '[ "`uname`" = "Darwin" ]' \
-  'run "tmux setw -g status-right-length $((`sysctl -n hw.ncpu` + 48))"' \
+if -b '[ "`uname`" != "Darwin" ]' \
  'run "tmux setw -g status-right-length $((`nproc --all` + 48))"'

 # Active window status style
--- a/tmux.conf
+++ b/tmux.conf
@@ -28,7 +28,7 @@ set -g status-interval 2
 set -g default-terminal "tmux-256color"

 # Enable true-color
-if '~/.config/tmux/check-version.sh "<" 3.2' \
+if '[[ "$TMUX_VERSION" < "3.2" ]]' \
  'set-option -as terminal-features ",xterm*:Tc"' \
  'set-option -as terminal-features ",xterm*:RGB"'

@@ -49,7 +49,7 @@ unbind -T copy-mode-vi MouseDragEnd1Pane
 # 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 ] && ~/.config/tmux/check-version.sh "<" 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 ]' \
@@ -58,36 +58,23 @@ if '[ ! -n $ITERM_PROFILE ]' \
 # Enable strikethrough on VTE compatible terminals.
 set -ga terminal-overrides 'xterm*:smxx=\E[9m'

-# Binding to create window-auto layout
-bind a run-shell ~/.local/share/tmux/layouts/window-auto
-# TODO: bind A run-shell ~/.local/share/tmux/layouts/window-auto --refresh
-
 # Set only on macOS where it's required
 if -b '[ "`uname`" = "Darwin" ]' \
  'set -g default-command "reattach-to-user-namespace -l $SHELL"'

-if -b '~/.config/tmux/check-version.sh ">=" 3.2 && ~/.config/tmux/check-version.sh "<" 3.3' {
-  bind A display-popup -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
-  bind I display-popup -d '#{pane_current_path}' -E '$SHELL -i ~/.config/tmux/interpreter.sh'
-  bind P display-popup -w 60 -h 10 -E '~/.config/tmux/project.sh'
-  bind S display-popup -w 60 -h 10 -E '~/.config/tmux/session.sh'
-  bind T display-popup -d '#{pane_current_path}' -E $SHELL
-}
-if -b '~/.config/tmux/check-version.sh ">=" 3.3' {
-  bind A display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
-  bind I display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E '$SHELL -i ~/.config/tmux/interpreter.sh'
-  bind P display-popup -B -w 60 -h 10 -E '~/.config/tmux/project.sh'
-  bind S display-popup -B -w 60 -h 10 -E '~/.config/tmux/session.sh'
-  bind T display-popup -S fg=#54546D -d '#{pane_current_path}' -E $SHELL
-}
+# Open a popup with running the default shell
+bind T display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E $SHELL
+# Open a popup with session creator/switcher
+bind S display-popup -B -w 60 -h 10 -E '~/.config/tmux/session.sh'
+# Open a popup with project selector
+bind P display-popup -B -w 60 -h 10 -E '~/.config/tmux/project.sh'
+# Open a popup to pick an interpreter then launch it
+bind I display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E '$SHELL -i ~/.config/tmux/interpreter.sh'

 # Restore old next/previous window bindings
 bind C-n next-window
 bind C-p previous-window

-# Kill current window
-bind W kill-window
-
 # Make new splits open in current directory
 bind '"' split-window -c '#{pane_current_path}'
 bind '%' split-window -h -c '#{pane_current_path}'