diff --git a/.config/sheldon/plugins.toml b/.config/sheldon/plugins.toml
new file mode 100644
index 0000000..c8899bb
--- /dev/null
+++ b/.config/sheldon/plugins.toml
@@ -0,0 +1,18 @@
+# `sheldon` configuration file
+# ----------------------------
+# See the documentation for more https://github.com/rossmacarthur/sheldon#readme
+
+shell = "zsh"
+[plugins]
+
+[plugins.zsh-autosuggestions]
+github = 'zsh-users/zsh-autosuggestions'
+
+[plugins.zsh-history-substring-search]
+github = 'zsh-users/zsh-history-substring-search'
+
+[plugins.alias-tips]
+github = 'djui/alias-tips'
+
+[plugins.fast-syntax-highlighting]
+github = 'zdharma-continuum/fast-syntax-highlighting'
diff --git a/.zshrc b/.zshrc
index 938ca5e..0d6454a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,28 +1,16 @@
 [ ! -d ~/.oh-my-zsh ] && sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
-
- ZSH_DISABLE_COMPFIX=true
  ZSH=$HOME/.oh-my-zsh
  ZSH_CACHE_DIR="$ZSH/cache"
 
- source ~/.zplug/init.zsh
- zplug "zsh-users/zsh-autosuggestions", defer:2
- zplug "zsh-users/zsh-history-substring-search", defer:2
- zplug "plugins/git",   from:oh-my-zsh, defer:2
- zplug "plugins/gitignore",   from:oh-my-zsh, defer:2
- zplug "plugins/systemd",   from:oh-my-zsh, defer:2
- zplug "plugins/dnf",   from:oh-my-zsh, defer:2
- zplug "djui/alias-tips", defer:2
- zplug "zdharma-continuum/fast-syntax-highlighting", defer:2
- zplug 'zplug/zplug', hook-build:'zplug --self-manage'
+ # necessary to include "/usr/share/zsh/"$(zsh --version| cut -d ' ' -f2)/functions"
+ # due to a breakage on fedora zsh version 5.8.1 (zsh.x86_64 5.8.1-1.fc35 @updates)
+ fpath=(
+	 ~/.local/share/zsh/site-functions
+	 /usr/share/zsh/"$(zsh --version| cut -d ' ' -f2)/functions"
+	 $fpath
+ )
 
- # Install plugins if there are plugins that have not been installed
- if ! zplug check --verbose; then
-     printf "Install? [y/N]: "
-     if read -q; then
-         echo; zplug install
-     fi
- fi
- zplug load
+ eval "$(sheldon source)"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -75,7 +63,7 @@
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
- plugins=(asdf safe-paste docker firewalld fzf golang terraform torrent vagrant sudo lol)
+ plugins=(asdf docker firewalld fzf git gitignore golang safe-paste systemd terraform torrent vagrant lol)
 
  source $ZSH/oh-my-zsh.sh
  ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)