From 5a73a7a9a28586bf900456f1f8d7de2a85940b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C4=83t=C4=83lin?= <catalin@roboces.dev>
Date: Mon, 24 Apr 2023 17:42:43 +0200
Subject: [PATCH] feat(fish/envsource): filter out empty lines and vars that
 don't comply with the standard `VAR=VALUE` format

---
 fish/conf.d/aliases.fish   | 2 +-
 fish/conf.d/envsource.fish | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish
index ceb5ba7..e7e523f 100644
--- a/fish/conf.d/aliases.fish
+++ b/fish/conf.d/aliases.fish
@@ -1,7 +1,7 @@
 alias ls 'exa -alh'
 alias g 'git'
 alias copy 'xclip -selection clipboard'
-alias cat 'bat'
+alias cat 'bat --theme Catppuccin-frappe'
 alias k 'kubectl'
 alias rm 'trash'
 alias future-commit 'git commit --date (echo (date -d +7hours))' 
diff --git a/fish/conf.d/envsource.fish b/fish/conf.d/envsource.fish
index af570e4..cd98370 100644
--- a/fish/conf.d/envsource.fish
+++ b/fish/conf.d/envsource.fish
@@ -1,5 +1,11 @@
 function envsource
-  for line in (cat $argv | grep -v '^#')
+  if not set -q argv[1]
+    set argv[1] ".env"
+  end
+
+  echo "Using $argv[1] as input file"
+
+  for line in (grep -v '^\s*\(#\|$\)' $argv[1] | grep -E '^[A-Za-z_]+=[^#\n]+')
     set item (string split -m 1 '=' $line)
     set -gx $item[1] $item[2]
     echo "Exported key $item[1]"