feat: pull config from /etc

simonwjackson · Apr 13, 2024 · 4a33e63 · 4a33e63
1 parent 5d592ca
commit 4a33e63
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/nix/module.nix b/nix/module.nix
@@ -26,10 +26,24 @@ in {
       default = package;
       description = "The package to use for ${pname}.";
     };
+
+    tmeshServerTmuxConfig = lib.mkOption {
+      type = lib.types.lines;
+      default = "";
+      description = "Tmux configuration for tmesh server.";
+    };
+
+    tmeshTmuxConfig = lib.mkOption {
+      type = lib.types.lines;
+      default = "";
+      description = "Tmux configuration for tmesh.";
+    };
   };
 
   config = lib.mkIf cfg.enable {
     environment.etc."${pname}/config.json".source = jsonConfigFile;
+    environment.etc."${pname}/tmesh.tmux.conf".source = cfg.tmeshTmuxConfig;
+    environment.etc."${pname}/tmesh-server.tmux.conf".source = cfg.tmeshServerTmuxConfig;
 
     environment.systemPackages = [
       (pkgs.writeScriptBin "${pname}" ''

diff --git a/src/bin/tmesh b/src/bin/tmesh
@@ -22,34 +22,19 @@ TMUX="${TMUX:-}"
 TERM="${TERM:-}"
 SERVER="${SERVER:=$(hostname)}"
 SCRIPT_DIR="$(dirname "$0")"
-
-TMESH_USER_CONFIG=${TMESH_USER_CONFIG:-}
+TMUX_CONFIG=${TMUX_CONFIG:="/etc/tmesh/tmesh.tmux.conf"}
 export TMESH_SOCKET=${TMESH_SOCKET:-"tmesh"}
 
 read -r -d '' tmesh_default_config <<EOM
-# INFO: https://github.com/tmux/tmux/wiki/Clipboard#terminal-support---tmux-inside-tmux
-set -s set-clipboard on
-set -as terminal-features ',@TERM:clipboard'
-
-# Don't block inner tmux session, reassign the prefix
-set -g prefix C-a
-unbind-key C-b
-bind-key C-a send-prefix
-
 # Server Switcher
 bind-key -n 'M-A' display-popup -E -w 80% -h 80% "${SCRIPT_DIR@Q}/choose-nest.sh"
-
-# Local Mahine term
-bind-key -n 'M-i' display-popup -E -w 80% -h 80%
-
-set -g status off
 EOM
 
 tmesh_default_config=${tmesh_default_config/@TERM/$TERM}
 
 tmux_config=(
   "${tmesh_default_config[@]}"
-  "${TMESH_USER_CONFIG[@]}"
+  "${TMUX_CONFIG[@]}"
 )
 
 tryStartTmesh() {

diff --git a/src/bin/tmesh-server b/src/bin/tmesh-server
@@ -2,23 +2,19 @@
 
 SCRIPT_DIR="$(dirname "$0")"
 TMESH_SERVER_SOCKET=${TMESH_SERVER_SOCKET:-"tmesh-server"}
-TMUX_CONFIG=${TMUX_CONFIG:="${SCRIPT_DIR}/../etc/tmesh/tmesh-server.tmux.conf"}
+TMUX_CONFIG=${TMUX_CONFIG:="/etc/tmesh/tmesh-server.tmux.conf"}
 TMESH_CONFIG=${TMESH_CONFIG:="/etc/tmesh/config.json"}
 
-COMMAND="$(yq -e -oy '.local-tmesh-server.command' "${TMESH_CONFIG}" 2>/dev/null || echo "${SHELL}")"
+command="$(yq -e -oy '.local-tmesh-server.command' "${TMESH_CONFIG}" 2>/dev/null || echo "${SHELL}")"
 
-read -r -d '' tmesh_default_config <<EOM
+read -r -d '' tmesh_server_default_config <<EOM
 # Project switcher
 bind-key -n 'M-a' display-popup -E -w 80% -h 80% "${SCRIPT_DIR@Q}/choose-session.sh"
-
-set -g status off
 EOM
 
-tmesh_server_default_config=${tmesh_default_config/@TERM/$TERM}
-
 tmux_config=(
   "${tmesh_server_default_config[@]}"
-  "${TMESH_USER_CONFIG[@]}"
+  "${TMESH_CONFIG[@]}"
 )
 
 tmux \
@@ -30,4 +26,4 @@ tmux \
     -f <(printf "%s\n" "${tmux_config[@]}") \
     new-session \
     -s terminals \
-    "${COMMAND}" >/dev/null 2>&1
+    "${command}" >/dev/null 2>&1