ftpd/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ZSH modules are now separate.

Browse Source
This commit is contained in:
Bartek Stalewski 2022-03-30 11:58:54 +02:00
parent cf3420bfcf
commit 8f3f9f3226
6 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitmodules vendored
View File

@ -1,9 +0,0 @@
[submodule "zsh/modules/powerlevel10k"]
path = zsh/modules/powerlevel10k
url = https://github.com/romkatv/powerlevel10k.git
[submodule "zsh/modules/wd"]
path = zsh/modules/wd
url = https://github.com/mfaerevaag/wd.git
[submodule "zsh/modules/fast-syntax-highlighting"]
path = zsh/modules/fast-syntax-highlighting
url = https://github.com/zdharma-continuum/fast-syntax-highlighting

7
install.sh
View File

@ -45,6 +45,13 @@ for i in ~$XDG_DATA_HOME/repos/dotfiles/_scripts/*; do
done
## zsh
### modules
mkdir -p $XDG_DATA_HOME/repos/zsh_modules
rm -rf $XDG_DATA_HOME/repos/zsh_modules/*
for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do
git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/}
done
### config
rm -rf ~/.config/zsh
ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh ~/.config/
touch ~/.local/config/zsh

26
zsh/.zshrc
View File

@ -19,33 +19,29 @@ mkdir -p $XDG_CACHE_HOME/zsh
zstyle ':completion:*' menu select
zstyle ':completion:*' list-colors ''
# keys
source $ZDOTDIR/keys.zsh
# aliases
source $ZDOTDIR/aliases.zsh
# ssh
source $ZDOTDIR/keys.zsh
source $ZDOTDIR/ssh.zsh
# plugins & addons
# modules
[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && source $ZDOTDIR/fzf.zsh
source $ZDOTDIR/modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
source $XDG_DATA_HOME/repos/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
wd () {
. $XDG_DATA_HOME/repos/zsh_modules/wd/wd.sh
}
fpath=($ZDOTDIR/modules/wd $fpath)
# theme
source $ZDOTDIR/p10k.zsh
source $ZDOTDIR/modules/powerlevel10k/powerlevel10k.zsh-theme
source $XDG_DATA_HOME/repos/zsh_modules/powerlevel10k/powerlevel10k.zsh-theme
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
wd () {
. $ZDOTDIR/modules/wd/wd.sh
}
fpath=($ZDOTDIR/modules/wd $fpath)
# local settings
source ~/.local/config/zsh
# compinit at the very end to avoid duplicates
[ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ] && autoload -U zrecompile && zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump
autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump

1
zsh/modules/fast-syntax-highlighting

@ -1 +0,0 @@
Subproject commit ef8ba84c3a76c768f49a0bdd2a620b2f53c2478a

1
zsh/modules/powerlevel10k

@ -1 +0,0 @@
Subproject commit 30bd9461b3f013bc4c529de0a123db89a92a87c7

1
zsh/modules/wd

@ -1 +0,0 @@
Subproject commit 38afa73ca85a557aef89438ad9fd60b5b41cdbc7