diff --git a/system_files/shared/usr/share/ublue-os/bling/bling.fish b/system_files/shared/usr/share/ublue-os/bling/bling.fish
index 3588b83..1eef03a 100644
--- a/system_files/shared/usr/share/ublue-os/bling/bling.fish
+++ b/system_files/shared/usr/share/ublue-os/bling/bling.fish
@@ -1,35 +1,45 @@
 #!/usr/bin/env fish
 
-# FIXME: add no-source-twice fix
-
-# ls aliases
-if [ "$(command -v eza)" ]
-    alias ll='eza -l --icons=auto --group-directories-first'
-    alias l.='eza -d .*'
-    alias ls='eza'
-    alias l1='eza -1'
-end
+if status is-interactive
+    test "$BLING_SOURCED" = 1; and return; or set -g BLING_SOURCED 1
 
-# ugrep for grep
-if [ "$(command -v ug)" ]
-    alias grep='ug'
-    alias egrep='ug -E'
-    alias fgrep='ug -F'
-    alias xzgrep='ug -z'
-    alias xzegrep='ug -zE'
-    alias xzfgrep='ug -zF'
-end
+    function __bling_abbr -d "Create an abbreviation or alias"
+        test "$BLING_USE_ABBR" != 0; and abbr -a $argv; or alias $argv
+    end
 
-# bat for cat
-alias cat='bat --style=plain --pager=never' 2>/dev/null
+    # ls aliases
+    if type -q eza
+        __bling_abbr ll 'eza -l --icons=auto --group-directories-first'
+        __bling_abbr l. 'eza -d .*'
+        __bling_abbr ls 'eza'
+        __bling_abbr l1 'eza -1'
+    end
+
+    # ugrep for grep
+    if type -q ug
+        __bling_abbr grep 'ug'
+        __bling_abbr egrep 'ug -E'
+        __bling_abbr fgrep 'ug -F'
+        __bling_abbr xzgrep 'ug -z'
+        __bling_abbr xzegrep 'ug -zE'
+        __bling_abbr xzfgrep 'ug -zF'
+    end
+
+    # bat for cat
+    if type -q bat
+        __bling_abbr cat 'bat --style=plain --pager=never'
+    end
+
+    type -q direnv; and direnv hook fish | source    
 
-if status is-interactive
     # Atuin shell integration is disabled by default
     # The atuin binary is still installed and available for manual use
     # To enable shell integration, uncomment the following line or add it to your config.fish:
-    # [ "$(command -v atuin)" ] && eval "$(atuin init fish $ATUIN_INIT_FLAGS)"
+    # type -q atuin; and atuin init fish $ATUIN_INIT_FLAGS | source
+
+    type -q starship; and starship init fish | source 
 
-    [ "$(command -v starship)" ] && eval "$(starship init fish)"
+    type -q zoxide; and zoxide init fish | source 
 
-    [ "$(command -v zoxide)" ] && eval "$(zoxide init fish)"
+    type -q mise; and test "$MISE_FISH_AUTO_ACTIVATE" != 0; and mise activate fish | source
 end