From 94dfb7612e8610f7cb118ae273e5d71ac12c7d4c Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Thu, 15 Aug 2024 08:06:43 -0400 Subject: [PATCH] Switch from bash tmux-sessionizer to rust tmux-sessionizer --- home/default.nix | 2 +- overlays/default.nix | 1 - overlays/tmux-sessionizer/default.nix | 20 -------------- overlays/tmux-sessionizer/tmux-sessionizer | 31 ---------------------- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 overlays/tmux-sessionizer/default.nix delete mode 100755 overlays/tmux-sessionizer/tmux-sessionizer diff --git a/home/default.nix b/home/default.nix index 0c99b49..73447be 100644 --- a/home/default.nix +++ b/home/default.nix @@ -195,7 +195,7 @@ in { m = "make"; nix-install = "nix-env -iA"; ps = "procs"; - t = "tmux-sessionizer"; + t = "tms"; tf = "terraform"; tree = "eza --tree"; v = "nvim"; diff --git a/overlays/default.nix b/overlays/default.nix index d67cd76..f633440 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,4 @@ final: prev: { sbx-h6-rgb = prev.callPackage ./sbx-h6-rgb { }; - tmux-sessionizer = prev.callPackage ./tmux-sessionizer { }; vpngate = prev.callPackage ./vpngate { }; } diff --git a/overlays/tmux-sessionizer/default.nix b/overlays/tmux-sessionizer/default.nix deleted file mode 100644 index d164742..0000000 --- a/overlays/tmux-sessionizer/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, lib, fetchurl, }: -stdenv.mkDerivation rec { - pname = "tmux-sessionizer"; - version = "0.0.0"; - - executable = ./tmux-sessionizer; - - phases = [ "unpackPhase" ]; # Remove all other phases - - unpackPhase = '' - mkdir -p $out/bin - cp ${executable} $out/bin/tmux-sessionizer - ''; - - meta = with lib; { - description = - "\n Tmux sessionizer adapted from https://sourcegraph.com/github.com/ThePrimeagen/.dotfiles@5cd09f06d6683b91c26822a73b40e3d7fb9af57a/-/blob/bin/.local/bin/tmux-sessionizer"; - platforms = platforms.unix; - }; -} diff --git a/overlays/tmux-sessionizer/tmux-sessionizer b/overlays/tmux-sessionizer/tmux-sessionizer deleted file mode 100755 index 6da7d25..0000000 --- a/overlays/tmux-sessionizer/tmux-sessionizer +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -# Credit to ThePrimeagen for this: -# https://sourcegraph.com/github.com/ThePrimeagen/.dotfiles@5cd09f06d6683b91c26822a73b40e3d7fb9af57a/-/blob/bin/.local/bin/tmux-sessionizer - - -readarray -t directories < ~/.config/tmux-sessionizer - -if [[ $# -eq 1 ]]; then - selected=$1 -else - selected=$(find "${directories[@]}" -mindepth 1 -maxdepth 1 -type d | fzf --exact) -fi - -if [[ -z $selected ]]; then - exit 0 -fi - -selected_name=$(basename "$selected" | tr . _) -tmux_running=$(pgrep tmux) - -if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then - tmux new-session -s "$selected_name" -c "$selected" - exit 0 -fi - -if ! tmux has-session -t "$selected_name" 2> /dev/null; then - tmux new-session -ds "$selected_name" -c "$selected" -fi - -tmux switch-client -t "$selected_name"