From ce104e4922fbfd0df430ba525d6d5e550b067945 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 13 Apr 2022 01:36:06 -0700 Subject: [PATCH 1/4] ned: fixed notes not being put in the notes dir --- .config/shell/bin/ned | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/shell/bin/ned b/.config/shell/bin/ned index 634b3ab..2a5798b 100755 --- a/.config/shell/bin/ned +++ b/.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"} From c7623a05bd3dede6cafde3dbe9e835402ba75fde Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 13 Apr 2022 01:37:22 -0700 Subject: [PATCH 2/4] pandoc-make: allow for pandoc arguments --- .config/shell/bin/pandoc-make | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.config/shell/bin/pandoc-make b/.config/shell/bin/pandoc-make index 6f056ba..c77adb9 100755 --- a/.config/shell/bin/pandoc-make +++ b/.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 From 3cc0516351182472a8db5100ed3dcac9adeb1d39 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 13 Apr 2022 01:37:49 -0700 Subject: [PATCH 3/4] env: new directory shortcut --- .config/shell/env | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/shell/env b/.config/shell/env index 64da3fe..04da922 100644 --- a/.config/shell/env +++ b/.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 From 7acbbb10cf1b02b00288fc1b467ed255aaf1a68d Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Wed, 13 Apr 2022 17:03:39 -0700 Subject: [PATCH 4/4] termux: improve termux escape macro --- .config/termux/termux.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/termux/termux.properties b/.config/termux/termux.properties index 1308931..efb8333 100644 --- a/.config/termux/termux.properties +++ b/.config/termux/termux.properties @@ -3,7 +3,7 @@ ### wiki: https://wiki.termux.com/wiki/Touch_Keyboard extra-keys = [ \ - [{key: 'ESC', popup: {macro: "ESC S", display: ""}},{key: '-', popup: '_'},{key: '/', popup: '\\\\'},{key: '|', popup: '_'},{key: 'HOME', popup: '['},{key: 'UP', popup: 'KEYBOARD'},{key: 'END', popup: ']'},'BKSP',{key: 'DEL', popup: 'ESC'}], \ + [{key: 'ESC', popup: {macro: "iiii ESC : zvm_vi_substitute_whole_line ENTER", display: ""}},{key: '-', popup: '_'},{key: '/', popup: '\\\\'},{key: '|', popup: '_'},{key: 'HOME', popup: '['},{key: 'UP', popup: 'KEYBOARD'},{key: 'END', popup: ']'},'BKSP',{key: 'DEL', popup: 'ESC'}], \ ['TAB',{key: ':', popup: {macro: "ESC : w q ENTER", display: "vim exit"}},{key: 'CTRL', popup: {macro: 'CTRL c', display: ''}},{key: '=', popup: {key: '~'}},{key: 'LEFT', popup: '{'},{key: 'DOWN', popup: 'TAB'},{key: 'RIGHT', popup: '}'},{key: "'", popup: '"'},{key: 'ENTER', popup: {macro: 'ESC S todo ENTER', popup: 'todo'}}] \ ]