fix some stuff

4 files changed, 16 insertions, 10 deletions

diff --git a/home.nix b/home.nix
index 872c5fb..4e6dcad 100644
--- a/home.nix
+++ b/home.nix
@@ -59,6 +59,8 @@
       bind-key -T copy-mode-vi v send -X begin-selection
       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-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/home/kakoune.nix b/home/kakoune.nix
index 20567fa..13bb267 100644
--- a/home/kakoune.nix
+++ b/home/kakoune.nix
@@ -31,6 +31,7 @@
         require-module tmux
         require-module tmux-repl
         alias global terminal tmux-terminal-vertical
+        alias global sp new
     '';
   };
 }
diff --git a/home/st.nix b/home/st.nix
index 1d3a504..6603337 100644
--- a/home/st.nix
+++ b/home/st.nix
@@ -5,17 +5,17 @@
   home-manager,
   ...
 }: let
-  st-luke-smith = with pkgs; (st.overrideAttrs (oldAttrs: rec {
+  st-fork = with pkgs; (st.overrideAttrs (oldAttrs: rec {
     src = fetchFromGitHub {
-      owner = "LukeSmithxyz";
+      owner = "mvinkio";
       repo = "st";
-      rev = "36d225d71d448bfe307075580f0d8ef81eeb5a87";
-      sha256 = "sha256-u8E8/aqbL3T4Sz0olazg7VYxq30haRdSB1SRy7MiZiA=";
+      rev = "67b580fc4f0bbe1862caf5e71f14b768036904c2";
+      sha256 = "sha256-60ougrGKYL7uwfxePi/YhkHCihlLiwAomh0hpVAcRtg=";
     };
     buildInputs = oldAttrs.buildInputs ++ [harfbuzz];
   }));
 in {
   home.packages = [
-    st-luke-smith
+    st-fork
   ];
 }
diff --git a/shell-scripts/kakup b/shell-scripts/kakup
index 5061a8a..3b4e992 100755
--- a/shell-scripts/kakup
+++ b/shell-scripts/kakup
@@ -1,13 +1,16 @@
 session-or-client() {
         {
-            pushd $(cat -)
-	    DIRSTACK
+            project="$(cat -)"
+            if [[ -z $project ]]; then
+                return
+            fi
+            pushd $project
             export servers=kakoune-servers-${USER}
             export name=${PWD#$HOME/}
             export name=${name//\//-}
             export client=kakoune@$name
 
-            tmux has-session -t $servers || tmux new -d -s $servers kak -s $name -d\; rename-window $name
+            tmux has-session -t $servers || tmux new -d -s $servers -n $name kak -s $name -d
             tmux list-windows -t $servers -F "#{window_name}" | grep $name || tmux new-window -t $servers -n $name -d kak -s $name -d
 	    if [[ -z $TMUX ]]; then
                 tmux has-session -t $client || tmux new -d -s $client -n $name kak -c $name
@@ -19,6 +22,6 @@ session-or-client() {
         echo $client
 }
 
-client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf | session-or-client)"
+client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf -1 | session-or-client)"
 echo "client: $client"
-tmux attach -t "$client"
+[[ $client ]] && tmux attach -t "$client"