eeleater/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated stuff

Browse source
This commit is contained in:
Nikolas Weger 2020-01-30 14:45:00 +01:00
parent eb728aedff
commit 9427e2f476
4 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zsh/.zshrc
View file

@ -1,18 +1,11 @@
if [[ -r "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then if [[ -r "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then source "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh"; fi
source "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh"
fi
source $ZDOTDIR/exports.zsh source $ZDOTDIR/exports.zsh
source $ZDOTDIR/dircolor.zsh source $ZDOTDIR/dircolor.zsh
source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
if [[ $os == "arch" ]]; then if [[ $os == "arch" ]]; then source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme; else source $HOME/.config/p10k/powerlevel10k.zsh-theme; fi
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
else
source $HOME/.config/p10k/powerlevel10k.zsh-theme
fi
autoload -Uz compinit bashcompinit autoload -Uz compinit bashcompinit
compinit -d $HOME/.cache/zsh/compdump compinit -d $HOME/.cache/zsh/compdump
@ -21,9 +14,7 @@ bashcompinit
for file in $ZDOTDIR/libs/*.zsh; do source "$file"; done for file in $ZDOTDIR/libs/*.zsh; do source "$file"; done
for file in $ZDOTDIR/plgs/*.zsh; do source "$file"; done for file in $ZDOTDIR/plgs/*.zsh; do source "$file"; done
source $ZDOTDIR/tmux/tmux.zsh [[ -f $ZDOTDIR/.p10k.zsh ]] && source $ZDOTDIR/.p10k.zsh
[[ ! -f $ZDOTDIR/.p10k.zsh ]] || source $ZDOTDIR/.p10k.zsh
source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

8
zsh/tmux/tmux.zsh → zsh/libs/tmux.zsh
View file

@ -24,8 +24,6 @@ alias tkss='tmux kill-session -t'
: ${ZSH_TMUX_AUTOQUIT:=$ZSH_TMUX_AUTOSTART} : ${ZSH_TMUX_AUTOQUIT:=$ZSH_TMUX_AUTOSTART}
# Set term to screen or screen-256color based on current terminal support # Set term to screen or screen-256color based on current terminal support
: ${ZSH_TMUX_FIXTERM:=true} : ${ZSH_TMUX_FIXTERM:=true}
# Set '-CC' option for iTerm2 tmux integration
: ${ZSH_TMUX_ITERM2:=false}
# The TERM to use for non-256 color terminals. # The TERM to use for non-256 color terminals.
# Tmux states this should be screen, but you may need to change it on # Tmux states this should be screen, but you may need to change it on
# systems without the proper terminfo # systems without the proper terminfo
@ -47,11 +45,9 @@ else
fi 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 [[ -e "$ZSH_TMUX_CONFIG" ]]; then
export ZSH_TMUX_CONFIG export ZSH_TMUX_CONFIG
export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.extra.conf" export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux/tmux.conf"
else
export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.only.conf"
fi fi
# Wrapper function for tmux. # Wrapper function for tmux.

0
zsh/tmux/tmux-extra.conf → zsh/libs/tmux/tmux.conf
View file

1
zsh/tmux/tmux.conf
View file

@ -1 +0,0 @@
set -g default-terminal $ZSH_TMUX_TERM