diff options
| -rw-r--r-- | debug | 3 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | home.nix | 2 | ||||
| -rwxr-xr-x | shell-scripts/kakup | 20 |
4 files changed, 17 insertions, 20 deletions
@@ -0,0 +1,3 @@ +~/kakoune ~/flake +can't find session: kaks@kakoune +~/flake @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1684596126, - "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=", + "lastModified": 1684741999, + "narHash": "sha256-KZLKsFZ6cLjCdCNKZoT8bc1y+rYBuFgKatmIB38zqy4=", "owner": "nix-community", "repo": "home-manager", - "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", + "rev": "ba006d7cca2cb871c6a31bdbc130c05cde5ca8e8", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", + "lastModified": 1684662198, + "narHash": "sha256-lmGDGuFONWSoGBKDDhU/6fOhhmFoZQ8rPf+kS7/e/Gs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "50a183182d7ae39133555414d48d5d609a28a57d", "type": "github" }, "original": { @@ -62,7 +62,7 @@ bind-key -T copy-mode-vi V send -X select-line bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard' bind-key -T copy-mode-vi : command-prompt - set -s command-alias[0] sp='splitw "kak -c \"$(tmux display-message -p \"#{window_name}\")\" || ${pkgs.bashInteractive}/bin/bash"' + set -s command-alias[0] sp='run-shell "[[ \"$(tmux display-message -p #{pane_in_mode})\" -eq 0 ]] || tmux send-keys -X cancel; tmux splitw \"kak -c \"$(tmux display-message -p \"#{window_name}\" | sed \"s/kakc@//\")\" || /nix/store/kbcrs84s1x8yd5bp1nq6q6ihda8nd2lp-bash-interactive-5.2-p15/bin/bash\""' set-hook -g pane-focus-in 'run-shell "[[ \"$(tmux display-message -p #{pane_in_mode})\" -eq 0 ]] || tmux send-keys -X cancel"' bind-key -T copy-mode-vi C-w switch-client -T splits diff --git a/shell-scripts/kakup b/shell-scripts/kakup index e9ae3d7..c015d95 100755 --- a/shell-scripts/kakup +++ b/shell-scripts/kakup @@ -5,25 +5,19 @@ session-or-client() { return fi pushd $project - export servers=kakoune-servers-${USER} export name=${PWD#$HOME/} export name=${name//\//-} - export client=kakoune@$name - export KAKUP_TMUX=$TMUX - echo "KAKUP_TMUX=$KAKUP_TMUX" + export server=kaks@$name + export client=kakc@$name - tmux has-session -t $servers || { - tmux new -d -s $servers -n $name bash -c "[[ -f .envrc ]] && eval \"$(direnv export bash)\"; { kak -s $name -d & }; tmux wait -S $name; wait" + tmux has-session -t $server || { + tmux new -d -s $server -n $server bash -c "[[ -f .envrc ]] && eval \"$(direnv export bash)\"; { kak -s $name -d & }; tmux wait -S $name; wait" tmux wait $name } - tmux list-windows -t $servers -F "#{window_name}" | grep $name || { - tmux new-window -t $servers -n $name -d bash -c "[[ -f .envrc ]] && eval \"$(direnv export bash)\"; { kak -s $name -d & }; tmux wait -S $name; wait" - tmux wait $name - } - if [[ -z $KAKUP_TMUX ]]; then - TMUX=$KAKUP_TMUX tmux has-session -t $client || tmux new -d -s $client -n $name kak -c $name + if [[ -z $TMUX ]]; then + tmux has-session -t $client || tmux new -d -s $client -n $client kak -c $name else - TMUX=$KAKUP_TMUX tmux new-window -n $name kak -c $name + tmux new-window -n $client kak -c $name fi popd } </dev/stdin >debug 2>&1 |