chore: adds secrets

.gitignore

@@ -1,5 +1,9 @@
 config/ssh/config.d/*
 !config/ssh/config.d/*.gpg
 logs/*
-secrets/*
+
+# Don't include secrets in the repository but do include encrypted secrets
+secrets/wp/*.*
+!secrets/wp/*.gpg
+secrets/*.*
 !secrets/*.gpg

bin/actions/git/pre-commit

@@ -1,22 +1,9 @@
 #!/bin/sh
 
-# Check for unencrypted files in .ssh/config.d/
-unencrypted_files=$(find config/ssh/config.d/ -type f ! -name "*.gpg")
-
-if [ -n "$unencrypted_files" ]; then
-    staged_files=$(git diff --cached --name-only)
-    unencrypted_staged_files=""
-    for file in $unencrypted_files; do
-        if [[ $staged_files == *"$file"* ]]; then
-            unencrypted_staged_files="$unencrypted_staged_files $file"
-        fi
-    done
-
-    # If any unencrypted files are staged, exit with a non-zero status
-    if [ -n "$unencrypted_staged_files" ]; then
-        echo ""
-        echo "Error: Unencrypted files are staged for commit!"
-        echo "Use 'dotf secrets encrypt' to encrypt them before committing."
-        exit 1
-    fi
+# Check if there are files under secrets/ directory that don't end with .gpg that are staged
+if git diff --cached --name-only | grep -q 'secrets/'; then
+  if git diff --cached --name-only | grep -v '\.gpg$' | grep -q 'secrets/'; then
+    echo "ERROR: You have unencrypted files under secrets/ directory. Please encrypt them before committing."
+    exit 1
+  fi
 fi

bin/actions/secrets.sh

@@ -56,6 +56,30 @@ else
     exit 1
 fi
 
+encrypt_folder() {
+    for file in $1/*; do
+        # Skip if current file is a .gpg file
+        if [[ $file == *.gpg ]]; then
+            continue
+        fi
+
+        # If file is actually a folder, call this function recursively
+        if [[ -d $file ]]; then
+            printfe "%s\n" "cyan" "Encrypting folder $file..."
+            encrypt_folder $file
+            continue
+        fi
+
+        # If the file has a accompanying .gpg file, remove it
+        if [[ -f $file.gpg ]]; then
+            rm $file.gpg
+        fi
+
+        printfe "%s\n" "cyan" "Encrypting $file..."
+        gpg --quiet --batch --yes --symmetric --cipher-algo AES256 --armor --passphrase="$password" --output $file.gpg $file
+    done
+}
+
 
 # Do the same for files under $HOME/dotfiles/secrets/ (These can be any file type, not just .conf so keep the extension)
 if [[ "$2" == "decrypt" ]]; then
@@ -71,17 +95,5 @@ elif [[ "$2" == "encrypt" ]]; then
     printfe "%s\n" "cyan" "Encrypting secrets..."
     echo -en '\r'
 
-    for file in $HOME/dotfiles/secrets/*; do
-        # Skip if current file is a .gpg file
-        if [[ $file == *.gpg ]]; then
-            continue
-        fi
-
-        # If the file has a accompanying .gpg file, remove it
-        if [[ -f $file.gpg ]]; then
-            rm $file.gpg
-        fi
-
-        gpg --quiet --batch --yes --symmetric --cipher-algo AES256 --armor --passphrase="$password" --output $file.gpg $file
-    done
+    encrypt_folder $HOME/dotfiles/secrets
 fi

bin/helpers/welcome.py

@@ -36,7 +36,7 @@ def main():
     PROMPT_FILE_PATH = home_directory + "/dotfiles/bin/resources/welcome_prompt.txt"
 
     # Load api key from disk
-    with open(home_directory + "/dotfiles/secrets/openai_api_key", 'r') as file:
+    with open(home_directory + "/dotfiles/secrets/openai_api_key.secret", 'r') as file:
         OPENAI_API_KEY = file.read().strip()
     
     weather = get_weather()

config/flatpaks/com.redis.RedisInsight.flatpakref

@@ -0,0 +1,10 @@
+[Flatpak Ref]
+Name=com.redis.RedisInsight
+Branch=stable
+Title=com.redis.RedisInsight from flathub
+IsRuntime=false
+Url=https://dl.flathub.org/repo/
+SuggestRemoteName=flathub
+GPGKey=mQINBFlD2sABEADsiUZUOYBg1UdDaWkEdJYkTSZD68214m8Q1fbrP5AptaUfCl8KYKFMNoAJRBXn9FbE6q6VBzghHXj/rSnA8WPnkbaEWR7xltOqzB1yHpCQ1l8xSfH5N02DMUBSRtD/rOYsBKbaJcOgW0K21sX+BecMY/AI2yADvCJEjhVKrjR9yfRX+NQEhDcbXUFRGt9ZT+TI5yT4xcwbvvTu7aFUR/dH7+wjrQ7lzoGlZGFFrQXSs2WI0WaYHWDeCwymtohXryF8lcWQkhH8UhfNJVBJFgCY8Q6UHkZG0FxMu8xnIDBMjBmSZKwKQn0nwzwM2afskZEnmNPYDI8nuNsSZBZSAw+ThhkdCZHZZRwzmjzyRuLLVFpOj3XryXwZcSefNMPDkZAuWWzPYjxS80cm2hG1WfqrG0Gl8+iX69cbQchb7gbEb0RtqNskTo9DDmO0bNKNnMbzmIJ3/rTbSahKSwtewklqSP/01o0WKZiy+n/RAkUKOFBprjJtWOZkc8SPXV/rnoS2dWsJWQZhuPPtv3tefdDiEyp7ePrfgfKxuHpZES0IZRiFI4J/nAUP5bix+srcIxOVqAam68CbAlPvWTivRUMRVbKjJiGXIOJ78wAMjqPg3QIC0GQ0EPAWwAOzzpdgbnG7TCQetaVV8rSYCuirlPYN+bJIwBtkOC9SWLoPMVZTwQARAQABtC5GbGF0aHViIFJlcG8gU2lnbmluZyBLZXkgPGZsYXRodWJAZmxhdGh1Yi5vcmc+iQJUBBMBCAA+FiEEblwF2XnHba+TwIE1QYTdTZB6fK4FAllD2sACGwMFCRLMAwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQQYTdTZB6fK5RJQ/+Ptd4sWxaiAW91FFk7+wmYOkEe1NY2UDNJjEEz34PNP/1RoxveHDt43kYJQ23OWaPJuZAbu+fWtjRYcMBzOsMCaFcRSHFiDIC9aTp4ux/mo+IEeyarYt/oyKb5t5lta6xaAqg7rwt65jW5/aQjnS4h7eFZ+dAKta7Y/fljNrOznUp81/SMcx4QA5G2Pw0hs4Xrxg59oONOTFGBgA6FF8WQghrpR7SnEe0FSEOVsAjwQ13Cfkfa7b70omXSWp7GWfUzgBKyoWxKTqzMN3RQHjjhPJcsQnrqH5enUu4Pcb2LcMFpzimHnUgb9ft72DP5wxfzHGAWOUiUXHbAekfq5iFks8cha/RST6wkxG3Rf44Zn09aOxh1btMcGL+5xb1G0BuCQnA0fP/kDYIPwh9z22EqwRQOspIcvGeLVkFeIfubxpcMdOfQqQnZtHMCabV5Q/Rk9K1ZGc8M2hlg8gHbXMFch2xJ0Wu72eXbA/UY5MskEeBgawTQnQOK/vNm7t0AJMpWK26Qg6178UmRghmeZDj9uNRc3EI1nSbgvmGlpDmCxaAGqaGL1zW4KPW5yN25/qeqXcgCvUjZLI9PNq3Kvizp1lUrbx7heRiSoazCucvHQ1VHUzcPVLUKKTkoTP8okThnRRRsBcZ1+jI4yMWIDLOCT7IW3FePr+3xyuy5eEo9a25Ag0EWUPa7AEQALT/CmSyZ8LWlRYQZKYw417p7Z2hxqd6TjwkwM3IQ1irumkWcTZBZIbBgrSOg6CcXD2oWydCQHWi9qaxhuhEl2bJL5LskmBcMxVdQeD0LLHd8QUnbnnIby8ocvWN1alPfvJFjCUTrmD22U1ycOzRw2lIe4kiQONbOZtdWrVImQQSndjFlisitbmlWHvHm2lOOYy8+GJB7YffVV193hmnBSJffCy4bvkuLxsI+n1DhOzc7MPV3z6HGk4HiEcF0yyt9tCYhpsxHFdBoq2h771HfAcS0s98EVAqYMFnf9em+4cnYpdI6mhIfS1FQiKl6DBAYA8tT3ggla00DurPo0JwX/zN+PaO5h/6O9aCZwV7G6rbkgMuqMergXaf8oP38gr0z+MqWnkfM63Bodq68GP4l4hd02BoFBbDf38TMuGQB14+twJMdfbAxo2MbgluvQgfwHfZ2ca6gyEY+9s/YD1gugLjV+S6CB51WkFNe1z4tAPgJZNxUcKCbeaHNbthl8Hks/pY9RCEseX/EdfzF18epbSjJMPh4DPQXbUoFwmyuYcoBOPmvZHNl9hK7B/1RP8w1ZrXk8qdupC0SNbafX7270B7lMMVImzZetGsM9ypXJ6llhp3FwW09iseNyGJGPsr/dvTMGDXqOPfU/9SAS1LSTY4K9PbRtdrBE318YX8mIk5ABEBAAGJBHIEGAEIACYWIQRuXAXZecdtr5PAgTVBhN1NkHp8rgUCWUPa7AIbAgUJEswDAAJACRBBhN1NkHp8rsF0IAQZAQgAHRYhBFSmzd2JGfsgQgDYrFYnAunj7X7oBQJZQ9rsAAoJEFYnAunj7X7oR6AP/0KYmiAFeqx14Z43/6s2gt3VhxlSd8bmcVV7oJFbMhdHBIeWBp2BvsUf00I0Zl14ZkwCKfLwbbORC2eIxvzJ+QWjGfPhDmS4XUSmhlXxWnYEveSek5Tde+fmu6lqKM8CHg5BNx4GWIX/vdLi1wWJZyhrUwwICAxkuhKxuP2Z1An48930eslTD2GGcjByc27+9cIZjHKa07I/aLffo04V+oMT9/tgzoquzgpVV4jwekADo2MJjhkkPveSNI420bgT+Q7Fi1l0X1aFUniBvQMsaBa27PngWm6xE2ZYvh7nWCdd5g0c0eLIHxWwzV1lZ4Ryx4ITO/VL25ItECcjhTRdYa64sA62MYSaB0x3eR+SihpgP3wSNPFu3MJo6FKTFdi4CBAEmpWHFW7FcRmd+cQXeFrHLN3iNVWryy0HK/CUEJmiZEmpNiXecl4vPIIuyF0zgSCztQtKoMr+injpmQGC/rF/ELBVZTUSLNB350S0Ztvw0FKWDAJSxFmoxt3xycqvvt47rxTrhi78nkk6jATKGyvP55sO+K7Q7Wh0DXA69hvPrYW2eu8jGCdVGxi6HX7L1qcfEd0378S71dZ3g9o6KKl1OsDWWQ6MJ6FGBZedl/ibRfs8p5+sbCX3lQSjEFy3rx6n0rUrXx8U2qb+RCLzJlmC5MNBOTDJwHPcX6gKsUcXZrEQALmRHoo3SrewO41RCr+5nUlqiqV3AohBMhnQbGzyHf2+drutIaoh7Rj80XRh2bkkuPLwlNPf+bTXwNVGse4bej7B3oV6Ae1N7lTNVF4Qh+1OowtGjmfJPWo0z1s6HFJVxoIof9z58Msvgao0zrKGqaMWaNQ6LUeC9g9Aj/9Uqjbo8X54aLiYs8Z1WNc06jKP+gv8AWLtv6CR+l2kLez1YMDucjm7v6iuCMVAmZdmxhg5I/X2+OM3vBsqPDdQpr2TPDLX3rCrSBiS0gOQ6DwN5N5QeTkxmY/7QO8bgLo/Wzu1iilH4vMKW6LBKCaRx5UEJxKpL4wkgITsYKneIt3NTHo5EOuaYk+y2+Dvt6EQFiuMsdbfUjs3seIHsghX/cbPJa4YUqZAL8C4OtVHaijwGo0ymt9MWvS9yNKMyT0JhN2/BdeOVWrHk7wXXJn/ZjpXilicXKPx4udCF76meE+6N2u/T+RYZ7fP1QMEtNZNmYDOfA6sViuPDfQSHLNbauJBo/n1sRYAsL5mcG22UDchJrlKvmK3EOADCQg+myrm8006LltubNB4wWNzHDJ0Ls2JGzQZCd/xGyVmUiidCBUrD537WdknOYE4FD7P0cHaM9brKJ/M8LkEH0zUlo73bY4XagbnCqve6PvQb5G2Z55qhWphd6f4B6DGed86zJEa/RhS
+RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
+

config/ssh/config.d/dev.conf.gpg

@@ -1,12 +1,12 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKxk8SkSYOUYP/0sCSAfR4DlCAIf591iIUABK8dGsVuOfromBUgjNIn+7q
-wDH2poPnUS1FMQlbehu/m7Q5vTgnCGnNlott6DGmCQfjmmA4lcekp+RLl5rG87wu
-2n7VqMJFEyfNp7xBRzofsL/fIaBiYHqZmo52MMH5T876HKmeLtiFFpFKnPyFjTV0
-nBKZBj68bf6uhPvexzxfYY6IpIsRH1GwkL4ZCd0AgfmykbiphOZWsieBIXE/EE82
-JsLOKAgfOVnmgqRVmg7ed5zryc+zWv1LB8EupVjEvoBvYufBzK1MhUGbi9t8Vh2Y
-q5GNVwW7qs2iBEFgrIYffqP8vqPil5QeG+sCpagTid1ZysAYKgm28Eq70yq58Sqv
-iFgY9fk9STzOWDmrTGOvbj24VKihmgRhCz5sojmvNJRR0RbNa2PMgLeYdpLG5SYG
-7RUxVA6ImFmDMd5S3WKCuBHgDG4=
-=yWXK
+jA0ECQMCv+vwCCWxO+P/0sCSAc6+j3Tte/HrWzu/3yqBJ5Uon2GGemNkjWeK1gJE
+mY7h/wRfnQklFs2yFPcCfPtZ6Mzajg4P/IMynavTUvpt9nzy+NSjaicgjzalyupC
+ntyje+qNDwteHVHKvMnXMQNaj0qe2zo5qSrOGCcJwiAZ9kUFh3eOkRV71CF1oWXl
+I5Na5f9ymKReVsBJ2zoRJMN+wBbTh8LNyi2cBM6uvXuiCev0tplKOPSvPKVLosdl
+faN7ml7EzkuOtZq0jzNS2AlhR2bgM7WrAn6VnMPXuDIXE+8QunB5Y5CJAODqy1dK
+9kNfppniKEzcRmYgTUpOcUOgI97oukYCrzF6nYun2QtV9IzDXY+I9uHK861AWncY
+fd7TRmtKF1qrTUtZxPntl+QBO8elzLkqW4wg3uYdmMGRlivHtZu3yMTGu/rLKT2x
+dA/PS59jt3hUhxQu2IYR+Qn0wKw=
+=aHoH
 -----END PGP MESSAGE-----

config/ssh/config.d/personal.conf.gpg

@@ -1,7 +1,7 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKs1ivC8K7ZgD/0msB/7WM3LbosmKfL0sfh4++mLcJMmjbiHAlYEin/i8n
-JoeN6wd3O1WWyzhKTzn2Juyx9ix0T/ld4qSn9UuPfNkE//ImxQ+6A1HSLwZDOxXE
-V5zDADgkN/wfxUpXhfusI1plRwZWG1WadXQ2bg==
-=UIj7
+jA0ECQMCn+YJveJAhur/0msB3aCRFIzzl4VJXldqgQ0qocgO1IltG7Gi8k9mrRET
+KImolVkSSb909LuuhuR1XARo8qCZKsqB1OAYiMQOK3xnb9idVqc8Vyqpws0zxE1z
+oakXKNtsSRr4KMC8S1WJwULVED25vTMPsaCjzw==
+=S3tw
 -----END PGP MESSAGE-----

config/ssh/config.d/prod.conf.gpg

@@ -1,12 +1,11 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMKnyS8b4A3LKj/0sB/ATXNRScUB1C7VF6gGFuIfgWS2aGXhDdNS2zG540P
-b7CgoaWH0XLIYBY0RAXd6CbCXglgyIlF3Rz2e2T1Vtag/ME5VJzEZwtv0XYwvBka
-BcJ5DQw11xkGp81VV5i1qAOIVFqV81sTrOhku+49DmY8h4KLJC43rAN1sysQyVvs
-hgD39xKSgn9FyqvPtKHB7qH1heb/l5tjUWObOJ5pLT/y1onQMp8zaKK1tElvo34v
-fMNZ6W3v7eNLEQFYJVD+W975CyR036O6TGUeKGINPQSgQWDcNYtjqE0be+BN/5Ps
-C+dj4mWhN3Fdlgl7h55BPwVRNfRBP4bctV6OvqaDvMLR+dSPiuxUxQWNG3z6mNjZ
-6EplPSApB2X1MVn72T7ob6R/NAWFL5V6fuekNsGvgyaju4gRuIfrfNjVN7EtKKR+
-tg==
-=/+Ic
+jA0ECQMCAYm0dwToCej/0sB+AQpY8EfHJMAI/dnfQvQBMYFMy+ZcecBJiJlSoYXF
+1oo3v3W+om9zDtHrZ0dX/Q1zbZlOilaMFOqAcqb36TADZXxtmE8/IF2ZWCnZFB7m
+u6FgDdhM9slLbC6OdzAf6OeF2o13tRZXwXAscqkGdU2Bkaq9q0f2S+hmO+BIxZGf
+0CHWlk7oxNKUHuM5njX+QI0HrPLDeqWLj1FVqiq/Q4WZ1iGMO9XGQYpwtrI83lwd
+IY0rU2sNe9GiMat8IIRR46m92QtIfzjiaHkxm9q6XpOxgXlJjsZaUVsp2bNsGNCG
+a3PheG+UGJdL+3R43CguCSXl9PENu8ASbicKtodvICgiTfKT7d7n+aCXiziF0GC2
+ehChyYH6RrJfwru64orcXn5adE5EYFju4WwPMXFcNt/jYP8/eF4cTMtHewpipeQB
+=Ykiq
 -----END PGP MESSAGE-----

secrets/openai_api_key.gpg

@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-jA0ECQMC0bXPusSXNbv/0sADARKkLT5V2vgHy84nrHw/oZRfduZXXVF2fexBcgj8
-Q45bAtlEKkh6uE3SCLPys4RnZVlCUT3nfKcxkj18uL/U4nbMWiijdnRwCL70SGVn
-x+ZqGO5kUZIW+6tzEjcnWw+ES2jEy6v0+MHUau47ShgtSINjH8jCYyt/zLbVeh4S
-LBKORh15pkoPCA3on1Tefsn5pjDZ6HxqbqBkYZxcmylmcs4CjgmGc5SA+3yHyXIb
-BRIGVSa/HCOuUKtznVvEr79HfbTT
-=7tLO
------END PGP MESSAGE-----

secrets/openai_api_key.secret.gpg

@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0ECQMCK5MrjBtBICn/0sAHAd4oP1xMyE8y5i1AXek2PjwThBzj44TyU8EP1KJo
+FIgIFLs8d0I9C1rLMHl1rDoNvJWQTo8p/x/5Wo/6euGlpHVIn8GlAPZUNXbeuKRy
+qwQBgn/CEJneSMS7IYAXyV/DbFKoJ8GSq6XKRD2kuSdsNB+8cWJMUCI0LB7Yk5kS
+kUq/oa6kwWS8a7zmj8BtJW6VtEJq8Gv1I+n1sH1ULaW3EgJh76fJ+eHqC0iibUhY
+fO7h1ZHkO1OueYQNH/tWPyebUWMqDQnWvw==
+=Vc96
+-----END PGP MESSAGE-----