Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

.config/shell/bin/ned

@@ -77,7 +77,9 @@ new() {
    fi
 
    # Note dir
-   NEW_NOTE_DIR="$BASE_DIR/$(cd "$BASE_DIR" && fd -d 1 | sed 's-\./--g' | $FZF_SEARCH "$2")" || exit
+   NEW_NOTE_DIR="$BASE_DIR/$(cd "$BASE_DIR" && fd -d 1 | sed 's-\./--g' | $FZF_SEARCH "$2")/notes" || exit
+
+   [ -d "${NEW_NOTE_DIR%/*}" ] || mkdir "${NEW_NOTE_DIR%/*}"
 
    if [ -f "$NEW_NOTE_DIR/$NEW_NOTE_NAME" ]; then
       open_file "$NEW_NOTE_DIR/$NEW_NOTE_NAME"
@@ -85,7 +87,7 @@ new() {
       cd "$NEW_NOTE_DIR" || exit
       # apply a template for notes
 		cat <<-EOF >> "$NEW_NOTE_DIR/$NEW_NOTE_NAME"
-			# ${NEW_NOTE_NAME%%$DEFAULT_NEW_NOTE_EXT}
+			# ${NEW_NOTE_NAME%%"$DEFAULT_NEW_NOTE_EXT"}
 
 			<!-- vim: wrap nonu nornu
 			-->

.config/shell/bin/pandoc-make

@@ -7,11 +7,16 @@
 usage() {
    cat <<-EOF
 		Usage:
-			$0 [output_type] [input_files]
+		   $0 [output_type] [pandoc_args for file 1] [pandoc_args for file 1] [input_files]
 
 		Examples:
-			$0 pdf *.md
-			$0 .docx *.md  # leading .'s are automatically removed from the output name
+		   $0 pdf *.md
+		   $0 .docx *.md  # leading .'s are automatically removed from the output format
+
+		Note:
+		   To put a file in pandoc arguments without having it be compiled to its own document, put a './' at the start of the path to it
+		   You can have as many arg/file combinations you want
+		   The argument array is cleared between input files
 	EOF
 }
 
@@ -27,13 +32,17 @@ if [[ -z "$2" ]]; then
    echo "error: no files specified"
    usage && exit 1
 fi
-FORMAT="$1"
-SKIP_FIRST=true
+
+OUTPUT_FORMAT="$1"
+SKIP_FIRST=true  # don't process the first argument, it is the output format
 
 for FILE in "$@";do
    $SKIP_FIRST && SKIP_FIRST=false && continue
-   if [[ -f "$FILE" ]]; then
-      pandoc -s "$FILE" -o "${FILE%.*}.${FORMAT##.}"
+   if [[ -f "$FILE" ]] && [[ "${FILE:0:2}" != "./" ]]; then
+      pandoc -s "$FILE" "${PANDOC_ARGS[@]}" -o "${FILE%.*}.${OUTPUT_FORMAT##.}"
+      PANDOC_ARGS=()
+   else
+      PANDOC_ARGS+=("$FILE")
    fi
 done
 

.config/shell/env

@@ -71,5 +71,6 @@ export P10K_CONFIG_LOCATION="${P10K_CONFIG_LOCATION:-"$SHELL_CONFIG_DIR/p10k/cur
 ###########################################
 S="$SHELL_CONFIG_DIR"
 DD="$DOCS_DIR"
+C=~/code/spu/ds2/src
 
 # vim:fdm=marker:fmr=>>>,<<<:et:ft=sh:sw=3:ts=3