From 5457718f21d0b30fa54d84908f7e44d3925d2b2c Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Tue, 14 Dec 2021 20:31:06 +0100 Subject: [PATCH] config/zsh: split zprofile into zshenv and zlogin --- .config/nwg-wrapper/style.css | 18 ++++++++++++++++++ .config/zsh/.zlogin | 8 ++++++++ .config/zsh/.zshrc | 21 +++++++++++++++------ .zprofile => .zshenv | 9 --------- 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 .config/nwg-wrapper/style.css create mode 100644 .config/zsh/.zlogin rename .zprofile => .zshenv (95%) diff --git a/.config/nwg-wrapper/style.css b/.config/nwg-wrapper/style.css new file mode 100644 index 0000000..d717975 --- /dev/null +++ b/.config/nwg-wrapper/style.css @@ -0,0 +1,18 @@ +window { + background-color: rgba (0, 0, 0, 0.0); + font-size: large; +} + +#box-outer { + /* Define attributes of the box surrounding icons here */ + background-color: rgba (255, 255, 255, 0.0) +} + +#box-inner { + background-color: rgba (23, 53, 63, 0.0); + border-radius: 5px; + border-style: dotted; + border-width: 1px; + border-color: rgba (156, 142, 122, 0.0); + padding: 10px; +} diff --git a/.config/zsh/.zlogin b/.config/zsh/.zlogin new file mode 100644 index 0000000..ae4e98f --- /dev/null +++ b/.config/zsh/.zlogin @@ -0,0 +1,8 @@ +if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && test -e "$JOURNAL"; then + echo "What do you want to do? Check your planner!" + while test $(echo "$intention" | wc -c) -lt 6 + do read intention + done + jrnl intentions "$intention" + exec startx +fi diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 1784116..142f82b 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -161,7 +161,7 @@ unsetopt case_glob setopt pipefail -# Enable zmv (see ZSHCONTRIB(1)) +# Empower zmv (see ZSHCONTRIB(1)) alias szmv='sudo zsh -c autoload zmv && zmv' autoload zmv alias zmv='noglob zmv' @@ -170,22 +170,31 @@ alias zcp='noglob zmv -C' alias zln='noglob zmv -L' alias zsy='noglob zmv -Ls' -for file in $CONFIG_SHELLS/*; do source $file; done +for file in $CONFIG_SHELLS/* +do source $file +done # GENERATED SHIT +test -e /usr/share/zsh/manjaro-zsh-config && + source /usr/share/zsh/manjaro-zsh-config + export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion # To customize prompt, run `p10k configure` or edit .p10k.zsh. -test -s $CONFIG_ZSH/.p10k.zsh && source $CONFIG_ZSH/.p10k.zsh +test -s $CONFIG_ZSH/.p10k.zsh && + source $CONFIG_ZSH/.p10k.zsh -test -d /usr/share/fzf && source /usr/share/fzf/key-bindings.zsh && source /usr/share/fzf/completion.zsh +test -d /usr/share/fzf && + source /usr/share/fzf/key-bindings.zsh && source /usr/share/fzf/completion.zsh -which zoxide >/dev/null && eval "$(zoxide init zsh)" +which zoxide >/dev/null && + eval "$(zoxide init zsh)" -test -f $XDG_CONFIG_HOME/broot/launcher/bash/br && source $XDG_CONFIG_HOME/broot/launcher/bash/br +test -f $XDG_CONFIG_HOME/broot/launcher/bash/br && + source $XDG_CONFIG_HOME/broot/launcher/bash/br # Nix test -e /home/janek/.nix-profile/etc/profile.d/nix.sh && source /home/janek/.nix-profile/etc/profile.d/nix.sh diff --git a/.zprofile b/.zshenv similarity index 95% rename from .zprofile rename to .zshenv index d34e9f3..66af6bf 100644 --- a/.zprofile +++ b/.zshenv @@ -112,12 +112,3 @@ export FZF_CTRL_T_COMMAND="$FD_BASE -d 7" export CTEST_PROGRESS_OUTPUT=1 export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_PARALLEL_LEVEL=3 - -if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && test -e "$JOURNAL"; then - echo "What do you want to do? Check your planner!" - while test $(echo "$intention" | wc -c) -lt 6 - do read intention - done - jrnl intentions "$intention" - exec startx -fi