mirror of
https://github.com/Lissy93/dotfiles.git
synced 2025-06-26 12:01:21 +02:00
Sets ZSH as default Tmux shell
This commit is contained in:
parent
9ee0b17c20
commit
80a385ad14
@ -11,6 +11,9 @@ set -g @plugin 'tmux-plugins/tmux-open'
|
|||||||
set -g @plugin 'jimeh/tmux-themepack'
|
set -g @plugin 'jimeh/tmux-themepack'
|
||||||
set -g @plugin 'thewtex/tmux-mem-cpu-load'
|
set -g @plugin 'thewtex/tmux-mem-cpu-load'
|
||||||
|
|
||||||
|
# Set Shell
|
||||||
|
set -g default-shell /bin/zsh
|
||||||
|
|
||||||
# Set Theme
|
# Set Theme
|
||||||
set -g @themepack 'powerline/default/cyan'
|
set -g @themepack 'powerline/default/cyan'
|
||||||
|
|
||||||
|
@ -49,9 +49,6 @@ fi
|
|||||||
# Set the correct local config file to use.
|
# Set the correct local config file to use.
|
||||||
if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$ZSH_TMUX_CONFIG" ]]; then
|
if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$ZSH_TMUX_CONFIG" ]]; then
|
||||||
export ZSH_TMUX_CONFIG
|
export ZSH_TMUX_CONFIG
|
||||||
export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.extra.conf"
|
|
||||||
else
|
|
||||||
export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.only.conf"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Wrapper function for tmux.
|
# Wrapper function for tmux.
|
||||||
@ -71,9 +68,7 @@ function _zsh_tmux_plugin_run() {
|
|||||||
|
|
||||||
# If failed, just run tmux, fixing the TERM variable if requested.
|
# If failed, just run tmux, fixing the TERM variable if requested.
|
||||||
if [[ $? -ne 0 ]]; then
|
if [[ $? -ne 0 ]]; then
|
||||||
if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]; then
|
if [[ -e "$ZSH_TMUX_CONFIG" ]]; then
|
||||||
tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG")
|
|
||||||
elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
|
|
||||||
tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
|
tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
|
||||||
fi
|
fi
|
||||||
$tmux_cmd new-session
|
$tmux_cmd new-session
|
||||||
|
2057
zsh/antigen.zsh
Normal file
2057
zsh/antigen.zsh
Normal file
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Specify directory for Antigen bundles
|
# Specify directory for Antigen bundles
|
||||||
ADOTDIR=$HOME/.zsh/antigen-bundles
|
ADOTDIR=$HOME/.zsh/antigen-bundles
|
||||||
|
|
||||||
@ -16,8 +15,8 @@ antigen use oh-my-zsh
|
|||||||
# Import local plugins
|
# Import local plugins
|
||||||
source $HOME/.zsh/plugins/colored-man-pages.zsh
|
source $HOME/.zsh/plugins/colored-man-pages.zsh
|
||||||
source $HOME/.zsh/plugins/colorize.zsh
|
source $HOME/.zsh/plugins/colorize.zsh
|
||||||
source $HOME/.zsh/plugins/docker-auto-complete.zsh
|
|
||||||
source $HOME/.zsh/plugins/interactive-cd.zsh
|
source $HOME/.zsh/plugins/interactive-cd.zsh
|
||||||
|
#source $HOME/.zsh/plugins/docker-auto-complete.zsh # Requires Docker
|
||||||
|
|
||||||
# Import local aliases
|
# Import local aliases
|
||||||
source $HOME/.zsh/aliases/ansible-aliases.zsh
|
source $HOME/.zsh/aliases/ansible-aliases.zsh
|
||||||
@ -27,7 +26,6 @@ source $HOME/.zsh/aliases/lol-aliases.zsh
|
|||||||
source $HOME/.zsh/aliases/npm-aliases.zsh
|
source $HOME/.zsh/aliases/npm-aliases.zsh
|
||||||
source $HOME/.zsh/aliases/tmux-aliases.zsh
|
source $HOME/.zsh/aliases/tmux-aliases.zsh
|
||||||
|
|
||||||
|
|
||||||
# Add plugins to bundle
|
# Add plugins to bundle
|
||||||
antigen bundles <<EOBUNDLES
|
antigen bundles <<EOBUNDLES
|
||||||
command-not-found
|
command-not-found
|
||||||
@ -36,11 +34,13 @@ antigen bundles <<EOBUNDLES
|
|||||||
psprint/zsh-navigation-tools
|
psprint/zsh-navigation-tools
|
||||||
EOBUNDLES
|
EOBUNDLES
|
||||||
|
|
||||||
|
# Enable autocomplete
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
|
||||||
# Load the theme.
|
# Load the theme.
|
||||||
antigen theme romkatv/powerlevel10k
|
antigen theme romkatv/powerlevel10k
|
||||||
|
|
||||||
|
|
||||||
# I'm done- let's go
|
# I'm done- let's go
|
||||||
antigen apply
|
antigen apply
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user