Eibhear: extend .gitignore, fix in ~sc/shortcuts

2 files changed, 63 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index a5c9efc..792da4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,60 @@
+.ssh/
+Downloads/
+agh/
+projects/
+suveniry/
+work/
+
+# Generated by us
 .config/shell/shortcutrc
 .config/shell/shortcutenvrc
 .config/shell/zshnameddirrc
 .config/lf/shortcutrc
 .config/nvim/shortcuts.vim
+.local/share/moonphase
+
+# Ignored for now
+.config/abook/
+.config/nvchad/
+.config/nvim/
+.local/share/nvchad/
+.local/share/nvim/
+# Generated by system or programs
+.Xauthority
+.cache/
+.config/htop/
+.config/zsh/.zcompdump
+.local/state/
+# App configs that we don't care about
+.config/BraveSoftware/
+.config/GIMP/
+.config/MongoDB Compass Isolated Edition/
+.config/QtProject.conf
+.config/Signal/
+.config/VSCodium/
+.config/chromium/
+.config/dconf/
+.config/gtk-2.0/gtkfilechooser.ini
+.config/libreoffice/
+.config/menus/
+.config/neofetch/
+.config/pulse/cookie
+.config/transmission-daemon/
+.dbus/
+.eclipse/
+.local/share/DBeaverData/
+.local/share/Trash/
+.local/share/bg
+.local/share/cargo/
+.local/share/delta/
+.local/share/eibhear-merging/
+.local/share/gem/
+.local/share/newsboat/
+.local/share/nodenv/
+.local/share/pnpm/
+.local/share/sqlite_history
+.local/share/xorg/
+.local/share/zathura/
+.local/src/
+.pki/
+.swt/
diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts
index 3311349..9b9feb7 100755
--- a/.local/bin/shortcuts
+++ b/.local/bin/shortcuts
@@ -23,9 +23,9 @@ printf "# vim: filetype=sh\\n" > "$shell_env_shortcuts"
 printf "\" vim: filetype=vim\\n" > "$vifm_shortcuts"
 
 # Enable nesting
-eval "echo \"$(cat "$bmdirs" "$bmdirs_eibhear"")\"" | \
+eval "echo \"$(cat "$bmdirs" "$bmdirs_eibhear")\"" | \
 awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
-	printf(\"[ -n \42%s\42 ] && export %s=\42%s\42 \n\",\$1,\$1,\$2)   >> \"$shell_env_shortcuts\" ;"
+	printf(\"[ -n \42%s\42 ] && export %s=\42%s\42 \n\",\$1,\$1,\$2)   >> \"$shell_env_shortcuts\" }"
 source "$shell_env_shortcuts"
 
 # Format the `directories` file in the correct syntax and sent it to all three configs.
@@ -40,6 +40,12 @@ awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
 	printf(\"map C%s cd \42%s\42 \n\",\$1,\$2)           >> \"$lf_shortcuts\" ;
 	printf(\"cmap ;%s %s\n\",\$1,\$2)                    >> \"$vim_shortcuts\" }"
 
+# Enable nesting
+eval "echo \"$(cat "$bmfiles" "$bmfiles_eibhear")\"" | \
+awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
+	printf(\"[ -n \42%s\42 ] && export %s=\42%s\42 \n\",\$1,\$1,\$2)   >> \"$shell_env_shortcuts\" }"
+source "$shell_env_shortcuts"
+
 # Format the `files` file in the correct syntax and sent it to both configs.
 eval "echo \"$(cat "$bmfiles" "$bmfiles_eibhear")\"" | \
 awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");