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

.config/nvim/lua/blake/settings.lua

@@ -98,7 +98,7 @@ vim.cmd 'nnoremap <C-l> <C-w>l'
 vim.cmd "vnoremap J :m '>+1<CR>gv=gv"
 vim.cmd "vnoremap K :m '<-2<CR>gv=gv"
 
--- Correct words with Q, rather than z=
+-- Spell correct with Q, rather than z=
 vim.cmd 'nnoremap Q z='
 
 ----------------------------------------------

.config/shell/bin/ned

@@ -74,7 +74,7 @@ new() {
    if [ -z "$NOTE_PATH" ]; then
       echo "No directories found for '$2'."
       echo "All possible directories:"
-      (cd "$NOTES_DIR" && fd -d 1 -t d "$NOTES_DIR")
+      (cd "$NOTES_DIR" && fd -d 1 -t d)
       exit
 
    # if there was more than one result
@@ -114,6 +114,7 @@ new() {
 }
 
 subshell() {
+   echo
    echo 'entering subshell'
    $SHELL
 }

.config/shell/bin/pandoc-md

@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ -f "$1.md" ]; then
+   pandoc -s "$1.md" -o "$1.html"
+else
+   echo "Please specify a file name (without the .md extension)"
+fi

.config/shell/functions/log

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# edit the system log located in the docs repo, but also find the docs repo based on what ~/todo points to
+log() {
+   $EDITOR "$(git -C "$(dirname "$(realpath ~/todo)")" rev-parse --show-toplevel)/system-log"
+}

.config/termux/termux.properties

@@ -9,6 +9,7 @@ extra-keys = [ \
 
 # remove home and end, move control and alt to the left
 
+allow-external-apps = true
 
 ###############
 # Extra keys

.gitconfig

@@ -17,6 +17,7 @@
 	ca = commit -a
 	caam = commit -a --amend
 	cam = commit --amend
+	caps = !git commit -a && git push
 	ch = checkout
 	d = diff
 	lg = log

.zshrc

@@ -144,7 +144,7 @@
       dupd='docker-compose up -d' \
       ddwn='docker-compose down' \
       dc='docker-compose' \
-      occ='docker exec -it nextcloud occ' \
+      occ='docker exec -u www-data nextcloud php occ' \
 
    # file copying with a progress bar
    alias cpv="rsync -ah --info=progress2"
@@ -563,7 +563,7 @@ add-zsh-hook chpwd save_working_dir
 load_working_dir && cd - > /dev/null
 
 # Case insensitive globbing (fix for termux)
-[ -n "$TERMUX_VERSION" ] && setopt nocaseglob
+[ -n "$TERMUX_VERSION" ] && (setopt nocaseglob; zstyle ':completion:*' path-completion true)
 
 # <<<
 # <<<