Updated config

.config/fish/conf.d/cd-ls.fish

@@ -1,3 +1,3 @@
 function cdls --on-variable PWD
 	ls
-end
+end

.config/fish/config.fish

@@ -1,8 +1,4 @@
-if status is-interactive
-	# Aliases
-	source $HOME/.config/fish/alias.fish
-
-	# Set environment variables from .env
+if test -f ~/.env
 	while read -la line
 		set -l keyval (string split -m1 "=" $line)
 		set -l key (string trim $keyval[1])
@@ -10,4 +6,8 @@ if status is-interactive
 		set -l value (eval echo $value)
 		set -xg $key $value
 	end < ~/.env
+end
+
+if status is-interactive
+	source $HOME/.config/fish/alias.fish
 end

.config/fish/functions/config.fish

@@ -1,3 +1,3 @@
 function config
 	f $HOME/.config/$argv
-end
+end

.config/fish/functions/fish_greeting.fish

@@ -1,2 +1,2 @@
 function fish_greeting
-end
+end

.config/fish/functions/fish_prompt.fish

@@ -3,4 +3,4 @@ function fish_prompt
     echo -n (prompt_pwd)
     set_color normal
     printf " "
-end
+end

.config/fish/functions/ls.fish

@@ -4,4 +4,4 @@ function ls --wraps eza
 	else
 		command ls $argv
 	end
-end
+end

.config/fish/themes/my.theme

@@ -35,4 +35,4 @@ fish_pager_color_secondary_prefix
 fish_pager_color_selected_background --background=FFCC66
 fish_pager_color_selected_completion
 fish_pager_color_selected_description
-fish_pager_color_selected_prefix
+fish_pager_color_selected_prefix