diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml index 8319c98..f14fe7f 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -1,9 +1,5 @@ shell = "zsh" -[templates] -defer = """{% for file in files %} zsh-defer source "{{ file }}" {% endfor %}""" -defer-more = """{% for file in files %} zsh-defer -t 0.5 source "{{ file }}" {% endfor %}""" - # own files [plugins.disableflow] inline = 'stty -ixon' @@ -29,9 +25,6 @@ github = "zsh-users/zsh-completions" github = "trapd00r/LS_COLORS" # plugins -[plugins.zshdefer] -github = "romkatv/zsh-defer" - [plugins.omzlib] github = "ohmyzsh/ohmyzsh" dir = "lib" diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 0235917..80a93d8 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -46,7 +46,7 @@ export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates # other programs export LESSHISTFILE="$XDG_STATE_HOME"/less/history export EDITOR=nvim -export VISUAL=kate +#export VISUAL=kate export ZSH_WAKATIME_BIN=/usr/bin/wakatime export PYTHONSTARTUP=/etc/python/pythonrc @@ -61,4 +61,5 @@ export HISTSIZE=$(( 1.2 * SAVEHIST )) export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" +export DIFFPROG='meld' export AUTO_NTFY_DONE_IGNORE="ntfy emacs htop info less mail man meld most mutt nano screen ssh tail tmux top vi vim watch bat cat kate topgrade" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index d1b3373..e2cc8ec 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -1,8 +1,8 @@ -if test -v DISTROBOX_HOST_HOME; then unset ZDOTDIR; exec zsh; fi # fix distrobox -if test "x$TERMINALNAME" = "xalacritty"; then eval "$(zellij setup --generate-auto-start zsh)"; fi # autostart zellij only in alacritty +test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh } # fix distrobox +test "x$TERMINALNAME" = "xalacritty" && eval "$(zellij setup --generate-auto-start zsh)" # autostart zellij only in alacritty # startup banner -potentialBanner=('bofh' 'hackerquotes' 'colorscript random' 'fastfetch') +potentialBanner=('bofh' 'hackerquotes' 'dadjoke' 'colorscript random' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # and source plugins diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh index 95e4139..6e1df30 100644 --- a/dot_config/zsh/files/evalstuff.zsh +++ b/dot_config/zsh/files/evalstuff.zsh @@ -8,7 +8,7 @@ if (( ${+commands[brew]} )); then else export POSH_THEME="/usr/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]" fi -eval "$(ohmyposh init zsh)" +eval "$(oh-my-posh init zsh)" # evalstuff _evalcache zoxide init --cmd cd zsh diff --git a/dot_local/bin/executable_dadjoke b/dot_local/bin/executable_dadjoke new file mode 100644 index 0000000..dc5f1d0 --- /dev/null +++ b/dot_local/bin/executable_dadjoke @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +joke=$(curl -sH "Accept: text/plain" 'https://icanhazdadjoke.com/') +echo "Daily Dadjoke: $joke" +