diff --git a/.gitignore b/.gitignore index 7944bb4..09504f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .config/zinit -.config/tmux/plugins .config/btop .config/neofetch .aider* diff --git a/New file: lk-installers/install-zellij b/New file: lk-installers/install-zellij new file mode 100644 index 0000000..1047423 --- /dev/null +++ b/New file: lk-installers/install-zellij @@ -0,0 +1,7 @@ +#!/bin/bash + +echo "Installing Zellij via cargo..." +cargo install zellij || { + echo "Cargo failed - trying apt instead" + sudo apt update && sudo apt install -y zellij +} diff --git a/home_config/tmux/tmux.conf (DELETED) b/home_config/tmux/tmux.conf (DELETED) new file mode 100644 index 0000000..3eec83b --- /dev/null +++ b/home_config/tmux/tmux.conf (DELETED) @@ -0,0 +1 @@ +# This file has been removed as part of replacing tmux with zellij diff --git a/home_root/.tmux.conf (DELETED) b/home_root/.tmux.conf (DELETED) new file mode 100644 index 0000000..3eec83b --- /dev/null +++ b/home_root/.tmux.conf (DELETED) @@ -0,0 +1 @@ +# This file has been removed as part of replacing tmux with zellij diff --git a/home_root/.zshrc b/home_root/.zshrc index 328edb8..8b5b6c5 100644 --- a/home_root/.zshrc +++ b/home_root/.zshrc @@ -11,19 +11,6 @@ if [ ! -f "${ZINIT_HOME}/zinit.zsh" ]; then git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME" fi -# Download Tmux Plugin Manager -TMUX_HOME="${HOME}/.config/tmux" - -# Download Tmux plugin manager -if [ ! -d "${TMUX_HOME}/plugins/tpm" ]; then - mkdir -p "${TMUX_HOME}/plugins" - git clone https://github.com/tmux-plugins/tpm $TMUX_HOME/plugins/tpm -fi - -if { [ "$TERM" = "screen" ] && [ -n "$TMUX" ]; } then - tmux source ${TMUX_HOME}/tmux.conf -fi - #extend path path=(~/bin $path) path=(~/.local/bin $path) @@ -79,8 +66,6 @@ alias tree='eza --tree' export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git" - _fzf_compgen_path() { fd --hidden --exclude .git . "$1" } @@ -113,13 +98,4 @@ eval $(thefuck --alias fk) zinit light Aloxaf/fzf-tab -if [[ -z "$TMUX" ]]; then - tmux has-session &> /dev/null - if [ $? -eq 1 ]; then - exec tmux new -s ssh_session - exit - else - exec tmux attach -t ssh_session - exit - fi -fi +# Removed Tmux auto-start block and related code diff --git a/lk-installers/install-tmux-plugins (DELETED) b/lk-installers/install-tmux-plugins (DELETED) new file mode 100644 index 0000000..3eec83b --- /dev/null +++ b/lk-installers/install-tmux-plugins (DELETED) @@ -0,0 +1 @@ +# This file has been removed as part of replacing tmux with zellij