Merge branch 'dev' into vhs

Makefile

@@ -40,6 +40,8 @@ $(databases): .dbs/%.rec: %/ | .dbs/
 db.rec: $(databases)
 	printf '%s\n' '%rec: guide' > $@
 	printf '%s\n' '%key: title' >> $@
+	printf '%s\n' '%type: requires rec guide' >> $@
+	printf '%s\n' '%type: provides rec guide' >> $@
 	printf '%s\n' '%type: wordcount int' >> $@
 	printf '%s\n\n' '%sort: wordcount' >> $@
 	cat $^ >> $@

README.md

@@ -4,23 +4,29 @@ title: "Linux Knowledge Base"
 
 The Linux Knowledge-Base provides quick-start guides for working with terminal programs.
 
+If you like this style of short articles with a miniature database, then join me in my quest to remove the nausea of poorly-written documentation.
+
 # Setup
 
 Install `make`, `recutils`, and any fuzzy-finder (i.e. `sk`, `fzy`, or `fzf`).
 
 ## Usage
 
+Set up the database and try a few queries:
 
 ```sh
 make
 make database
 
+recsel db.rec -m 3
 recsel db.rec -q database
-recsel db.rec -q gpg
 recsel db.rec -e "title = 'ssh'"
 recsel db.rec -e "title ~ 'ssh'"
 recsel db.rec -e "title ~ 'bash'" -R title,wordcount
-recsel db.rec -m 1 -P content | less -R
+
+recsel db.rec -t guide -j provides -G title \
+    -e "title = 'ssh'" \
+    -p 'sum(provides_wordcount)'
 ```
 
 # Style
@@ -30,6 +36,16 @@ recsel db.rec -m 1 -P content | less -R
 - Nobody cares about how the project started.
 - Nobody wants to read what `ffmpeg` is, because anyone who wants to use it already knows what it is.
 
+## State Knowledge Dependencies
+
+Articles should state what you need to understand in order to read them *at the start*.
+They should not assume the reader knows much beyond common terminal commands, and should not provide a link to some other resource half-way through an article.
+
+People should be able to read an article from the beginning, then keep going until the end, and then stop.
+Articles should not take a detour through a chain of other articles of unknown size.
+
+[Do not Jaquays documentation](https://splint.rs/posts/no_links)
+
 ## Be Opinionated
 
 - Guides should not ask the reader to select options half-way through.
@@ -74,6 +90,11 @@ grep ls --color=always $HISTFILE | $PAGER
 
 Now we can see what can be changed.
 
+## Assume People Follow the Instructions
+
+Articles should say what to type, not the output.
+If the command is `ls`, users will see files once they try the command, but the article does not need to provide an example list of files unless an important point has to be made about output.
+
 # What's Wrong with Everything Else?
 
 ## Man pages

basics/time.md

@@ -56,7 +56,7 @@ Then set that language, with:
 LANG=pl_PL.UTF-8
 ```
 
-... then reboot.
+...then reboot.
 
 # Network Time Protocol
 

chat/profanity.md

@@ -142,4 +142,3 @@ You can ensure omemo automatcally turns on:
 ```
 ---
 
-'OTR' encryption is mostly dead, but you can find the old instructions [here](profanity-otr).

data/git/basics.md

@@ -6,41 +6,40 @@ tags: [ "data" ]
 
 ## New Machines
 
-```bash
+```sh
 git config --global user.email "$YOUR_EMAIL"
 ```
 
-```bash
+```sh
 git config --global user.name "$YOUR_NAME"
 ```
 
 # New Git
 
-Start a git in directory `$DIR`:
+Decide on algorithm:
 
-```bash
-mkdir $DIR && cd $DIR
+- If you're scared of insecure hash-sums, go with `hash=sha256`.
+- If you don't know what a hash sum is, go with `hash=sha1`.
+
+## Init the Git
+
+Start a git in directory `${DIR}`:
+
+```sh
+git init --object-format=${hash} ${DIR}
+cd ${DIR}
 ```
 
-```bash
-git init
-```
+Make a file explaining what the project does, and tell `git` to track it:
 
-Make a file explaining what the project does:
-
-```bash
-vim README.md
-```
-
-Add this to the git:
-
-```bash
+```sh
+echo "I hereby solemnly swear never to commit a binary file." > README.md
 git add README.md
 ```
 
 Then make the initial commit, explaining the change you just made:
 
-```bash
+```sh
 git commit
 ```
 
@@ -48,17 +47,17 @@ git commit
 
 Once you make a change to some file, add it and make a commit explaining it.
 
-```bash
+```sh
 git add $FILE
 ```
 
-```bash
+```sh
 git commit -m"change $FILE"
 ```
 
 Check your history:
 
-```bash
+```sh
 git log
 ```
 
@@ -69,20 +68,20 @@ Give it the same name as the `$DIR` directory, above.
 
 Add this as a remote:
 
-```bash
+```sh
 REMOTE=gitlab
 git remote add $REMOTE  https://gitlab.com/$USERNAME/$DIR
 ```
 
 Tell git you're pushing the branch "master" to the remote repo "origin": 
 
-```bash
+```sh
 git push -u master origin
 ```
 
 If someone makes a change on the remote, pull it down with:
 
-```bash
+```sh
 git pull
 ```
 
@@ -91,31 +90,31 @@ git pull
 A branch is a full copy of the project to test additional ideas.
 You can make a new branch called 'featurez' like this:
 
-```bash
+```sh
 git branch $FEATURE_BRANCH
 ```
 
 Have a look at all your branches:
 
-```bash
+```sh
 git branch
 ```
 
 Switch to your new branch:
 
-```bash
+```sh
 git checkout $FEATURE_BRANCH
 ```
 
 And if your changes are rubbish, checkout the "master" branch again, then delete "featurez":
 
-```bash
+```sh
 git branch -D $FEATURE_BRANCH
 ```
 
 Or if it's a good branch, push it to the remote:
 
-```bash
+```sh
 remote=origin
 git push $remote $FEATURE_BRANCH
 ```
@@ -124,13 +123,13 @@ git push $remote $FEATURE_BRANCH
 
 Once you like the feature, merge it into the main branch.  Switch to master then merge it:
 
-```bash
+```sh
 git merge $FEATURE_BRANCH
 ```
 
 And delete the branch, as you've already merged it:
 
-```bash
+```sh
 git branch -d $FEATURE_BRANCH
 ```
 
@@ -138,7 +137,7 @@ git branch -d $FEATURE_BRANCH
 
 ## Pulling another git repo into a subtree
 
-```bash
+```sh
 git subtree add -P config git@gitlab.com:bindrpg/config.git master
 ```
 
@@ -146,27 +145,27 @@ git subtree add -P config git@gitlab.com:bindrpg/config.git master
 
 ## Delete All History
 
-```bash
+```sh
 git checkout --orphan temp
 ```
 
-```bash
+```sh
 git add -A
 ```
 
-```bash
+```sh
 git commit -am "release the commits!"
 ```
 
-```bash
+```sh
 git branch -D master
 ```
 
-```bash
+```sh
 git branch -m master
 ```
 
-```bash
+```sh
 git push -f origin master
 ```
 
@@ -174,21 +173,21 @@ Gitlab requires more changes, such as going to `settings > repository` and switc
 
 ## Clean up Bloated Repo
 
-```bash
+```sh
 git fsck --full
 ```
 
-```bash
+```sh
 git gc --prune=now --aggressive
 ```
 
-```bash
+```sh
 git repack
 ```
 
 ## Find Binary Blobs
 
-```bash
+```sh
 git rev-list --objects --all \
 | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' \
 | sed -n 's/^blob //p' \

data/git/commit_for_another.md

@@ -0,0 +1,22 @@
+---
+title: "Commit for Another"
+tags: [ "data", "git" ]
+---
+
+You can make Alice the author, while you are still the commiter:
+
+```sh
+name="Alice Bobinson"
+email="alice@email.com"
+
+git add ${file}
+git commit --author="${name} <${email}>"
+```
+
+Or, make Alice both the committer and the author:
+
+
+```sh
+git -c user.name="${name}" -c user.email="${email}" commit -m "${message}"
+```
+

data/interactive_string_substitution.md

@@ -0,0 +1,19 @@
+---
+title: "Interactive String Substitution"
+tags: [ "data", "vim", "substitution" ]
+---
+
+Want to find and replace, but also confirm each instance?
+
+```sh
+vim -c "%s/${pattern}/${replacement}/gc" -c 'wq' ${file}
+```
+
+Notice that double-quotes (`"`) in the first command (`-c`).
+
+Alternatively, check with an example string:
+
+
+```sh
+sed "s/${pattern}/ARGLEBARGLE/g" ${file} | grep 'ARGLEBARGLE'
+```

data/sc-im/convert_spreadsheets.md

@@ -0,0 +1,13 @@
+---
+title: "Convert Spreadsheets"
+tags: [ "data", "sc-im" ]
+---
+
+Convert between spreadsheet formats with `sc-im`.
+
+```sh
+sc-im --quiet --quit_afterload --nocurses --export_csv ${file}.xlsx
+sc-im --quiet --quit_afterload --nocurses --export_tab ${file}.sc
+sc-im --quiet --quit_afterload --nocurses --export_mkd ${file}.csv
+sc-im --quiet --quit_afterload --nocurses --export_txt ${file}.tsv
+```

data/task/contexts.md

@@ -0,0 +1,34 @@
+---
+title: "Taskwarrior Contexts"
+tags: [ "data", "task" ]
+requires: [ "Taskwarrior" ]
+---
+
+# Contexts
+
+Set three contexts by their tags:
+
+```sh
+task context define work +sa or +hr
+```
+
+```sh
+task context define study +ed or +void or +rat
+```
+
+```sh
+task context define home -sa -hr -ed -void -rat
+```
+
+Change to the first context.
+
+```sh
+task context work
+```
+
+Then stop.
+
+```sh
+task context none
+```
+

data/task/task.md

@@ -1,23 +1,35 @@
 ---
-title: "task"
-tags: [ "organization" ]
+title: "Taskwarrior"
+tags: [ "data", "organization" ]
 ---
 
 Set up the configuration file:
 
-```bash
+```sh
 task
 ```
 
+Taskwarrior published a new feature to synchronize tasks others, but the feature was not ready.
+The server's default installation instructions assume that users pay for hosting services.
+All listed providers run proprietary software and actively support genocide.
+
+
+To ignore the synchronization, tell the configuration file to use a local synchronization file.
+
+```
+task config sync.local.server_dir
+task config data.location ~/.local/state/
+```
+
 Add a task:
 
-```bash
+```sh
 task add update linux
 ```
 
 See which task is next:
 
-```bash
+```sh
 task next
 ```
 
@@ -25,13 +37,13 @@ Note the id number.
 
 Mark a task as started:
 
-```bash
+```sh
 task start 1
 ```
 
 Once finished:
 
-```bash
+```sh
 task 1 done
 ```
 
@@ -39,23 +51,21 @@ task 1 done
 
 Add a project:
 
-```bash
+```sh
 task add project:house buy potted plant
 task add proj:house.repair buy screwdriver
 task add proj:house.repair buy shelf brackets
 task add pro:house.paint buy white paint
-task add pro:house.paint buy red paint
-task add pro:house.paint buy black paint
-task add pro:house.paint buy brushes
+
+for t in "buy red paint" "buy black paint" "buy brushes" ; do
+  task add pro:house.paint $t
+done
 ```
 
 ## Summary
 
-```bash
+```sh
 task pro:house sum
-```
-
-```bash
 task burndown.daily pro:house
 ```
 
@@ -63,69 +73,33 @@ The summaries will show how fast a project is being completed, and when you can
 
 # Tags
 
-```bash
+
+```sh
 task add +buy toothbrush
-```
-
-You can then see only tasks which involve buying something with:
-
-```bash
 task +buy
 ```
 
-# Contexts
-
-Set three contexts by their tags:
-
-```bash
-task context define work +sa or +hr
-```
-
-```bash
-task context define study +ed or +void or +rat
-```
-
-```bash
-task context define home -sa -hr -ed -void -rat
-```
-
-Change to the first context.
-
-```bash
-task context work
-```
-
-Then stop.
-
-```bash
-task context none
-```
-
 # Review
 
 View list of tasks completed in the last week:
 
-```bash
+```sh
 task end.after:today-1wk completed
 ```
 
 # User Defined Attributes
 
-Make a UDA 'size'.
+Define a new attribute for tasks called 'size'.
+The 'user defined attribute' (UDA) needs a `type` and `label`.
 
-```bash
+```sh
 task config uda.size.type string
-```
-
-```bash
 task config uda.size.label Size
 ```
+You can also ensure task tasks can only be `large`, `medium`, or `small`, then set a default.
 
-```bash
+```sh
 task config uda.size.values large,medium,small
-```
-
-```bash
 uda.size.default=medium
 ```
 
@@ -133,7 +107,7 @@ uda.size.default=medium
 
 This command shows tasks I'm most interested in:
 
-```bash
+```sh
 task next +ACTIVE or +OVERDUE or due:today or scheduled:today or pri:H
 ```
 

data/task/taskwarrior_configuration.md

@@ -0,0 +1,20 @@
+---
+title: "Taskwarrior Configuration"
+tags: [ "data", "task" ]
+requires: [ "Taskwarrior" ]
+---
+
+Show your current config:
+
+
+```sh
+task show
+```
+
+Use machine-readable output to make a config file with all configuration keys shown, then make it your configuration file.
+
+```sh
+task _show > ${file}
+mv ${file} ~/.config/task/taskrc
+```
+

data/task/timew.md

@@ -6,13 +6,13 @@ tags: [ "data", "tracking", "time", "timew" ]
 
 Try:
 
-```bash
+```sh
 timew summary :yesterday
 ```
 
 You can also use :week, :lastweek, :month, :quarter, :year, or a range such as:
 
-```bash
+```sh
 timew summary today to tomorrow
 timew today - tomorrow
 2018-10-15T06:00 - 2018-10-17T06:00
@@ -22,7 +22,7 @@ Each of these can gain with the :ids tag.
 
 # Basics
 
-```bash
+```sh
 timew start
 timew stop
 timew continue
@@ -32,7 +32,7 @@ timew tags
 
 And add ids with:
 
-```bash
+```sh
 timew summary :ids
 timew track 10am - 1pm timewarrior
 timew track 1pm for 2h walk
@@ -42,50 +42,50 @@ timew track 1pm for 2h walk
 
 First get ids.
 
-```bash
+```sh
 timew summary :ids
 ```
 
 Then if we're looking at task @2:
 
-```bash
+```sh
 timew move @2 12:00
 timew lengthen @2 3mins
 ```
 
-```bash
+```sh
 time shorten @2 40mins
 ```
 
 # Forgetting
 
-```bash
+```sh
 timew start 1h ago @4
 ```
 
 Or if your action actually had a break:
 
-```bash
+```sh
 timew split @8
 ```
 
 Or maybe not?
 
-```bash
+```sh
 timew join @4 @8
 timew @8 delete
 ```
 
 Start at previous time
 
-```bash
+```sh
 timew start 3pm 'Read chapter 12'
 timew start 90mins ago 'Read chapter 12'
 ```
 
 Cancel currently tracked time.
 
-```bash
+```sh
 timew cancel
 ```
 
@@ -157,11 +157,11 @@ with:
 
 # Fixing Errors
 
-```bash
+```sh
 curl -O https://taskwarrior.org/download/timew-dbcorrection.py
 ```
 
-```bash
+```sh
 python timew-dbcorrections.py
 ```
 

data/view_torrents.md

@@ -0,0 +1,11 @@
+---
+title: "View Torrents"
+tags: [ "data", "transmission", "torrenting" ]
+---
+
+
+```sh
+transmission-show $file.torrent  | less
+```
+
+`TRACKERS` shows where transmission will ask who has the torrent, but will probably be out of date.

distros/void/void_basics.md

@@ -57,5 +57,5 @@ brightnessctl s 10%+
 
 - [autologin](autologin.md)
 - [services](sv.md)
-- [wifi](wpa_cli.md)
+- [wifi](../../networking/wpa_supplicant.md)
 

networking/bad_horse.md

@@ -0,0 +1,20 @@
+---
+title: "Mapping the Net"
+tags: [ "networking", "graph", "fun" ]
+---
+
+Find the path to a domain:
+
+```sh
+domain=bad.horse
+max_hops=50
+
+tracepath -m $maximum_hops $domain
+```
+
+If you're on Debian, you can use `graph-easy` and `dothost` to make an instant diagram:
+
+```sh
+domain=dice.camp
+dothost $domain | graph-easy --boxart
+```

networking/port_scan.md

@@ -0,0 +1,25 @@
+---
+title: "Port Scan"
+tags: [ "networking" ]
+repo: 'https://github.com/mrjackwills/havn/'
+---
+
+`havn` scans ports.
+It's not in many repos, but if you can `cargo install havn`.
+
+
+```sh
+havn -h
+havn -a
+domain=splint.rs
+havn -p 19-90 ${domain}
+```
+
+That last command doesn't work reliably, so increase the number of retries (`-r`), or decrease concurrent requests (`-c`).
+
+
+```sh
+havn -p 19-443 -r 6 ${domain}
+havn -p 1-1000 -c 500 -r 5 ${domain}
+```
+

system/Makefiles/patterns.md

@@ -1,4 +1,3 @@
-
 ---
 title: "Makefile Patterns"
 tags: [ "system", "make" ]

system/Makefiles/python_projects.md

@@ -0,0 +1,98 @@
+---
+title: "Python Projects with Makefiles"
+tags: [ "tutorial", "system", "makefiles", "graphviz", "python" ]
+requires: [ "Makefiles" ]
+---
+
+If you have a python script which requires a packages - e.g. `graphviz` - you can automate the setup with a `Makefile`.
+The `Makefile` will:
+
+1. Make three copies of an 8-line installer script.
+2. Use one of the installer script to install local packages.
+3. Install a symbolic link to python.
+3. Make a script called `activate`, which tells python to use 
+
+# Context
+
+Python coders don't like updating their projects, they just expect everyone to install the same version of everything that they have.
+Historically, people dealt with this by installing only half a dozen copies of `graphviz`; but now each python project uses a local environment, with a local copy of `graphviz`, which means everyone gets to install a new copy of `graphviz` every time they try out a project.
+
+Downloading 40MB of software for each 40-line script you write is called 'virtual environments' because it sounds cool.
+We can make it even cooler with `make`, but not yet, because python - like the fae of old - will not fetch anything until you know its true name.
+
+# Setup
+
+```sh
+command -v python
+realpath `!!`
+```
+
+You must reveal that true path, because `python` is always a relative symbolic link, to an absolute symbolic link, which leads to a shortcut.
+We can finally let `make` know how to invoke python, and where it will install `graphviz`.
+
+If your python's version is '3.14', then python needs its packages placed in `${somewhere}/lib/python3.14/site-packages/`.
+You must create a new, local, name for these packages, because - like the fey of old - python demands a private name in return for revealing its true name.
+
+I'll call mine `camelot`, because the path is long and arduous.
+Set up the Makefiles like this:
+
+```make
+py_link != command -v python
+py != realpath $(py_link)
+version != basename $(py)
+
+virtenv = camelot
+```
+
+Now you can ask for a local `pip` script, which can install the python packages:
+
+```make
+    [...]
+
+$(virtenv)/bin/pip:
+    $(py) -m venv $(virtenv)
+```
+
+Finally, list the packages you want in `requirements.txt`, and make `pip` install from it.
+
+
+```sh
+ppkg=graphviz
+echo ${ppkg} > requirements.txt
+```
+
+```make
+    [...]
+
+pkgs = $(virtenv)/lib/$(version)/site-packages/
+
+$(pkgs): $(virtenv)/bin/pip
+$(pkgs): requirements.txt
+    $(virtenv)/bin/pip install -r $<
+```
+
+The complete Makefile looks like this:
+
+
+```make
+all: .default
+
+py_link != command -v python
+py != realpath $(py_link)
+version != basename $(py)
+
+virtenv = camelot
+
+$(virtenv)/bin/pip:
+    $(py) -m venv $(virtenv)
+
+pkgs = $(virtenv)/lib/$(version)/site-packages/
+
+$(pkgs): $(virtenv)/bin/pip
+$(pkgs): requirements.txt
+    $(virtenv)/bin/pip install -r $<
+
+.PHONY: .default
+.default: $(pkgs)
+```
+

vim/navigate.md

@@ -1,48 +0,0 @@
----
-title: "vim navigation"
-tags: [ "vim" ]
----
-
-| Move | Command      |
-|:-----|:-------------|
-|Down page | C-f      |
-| Down half page | C-d |
-| Up page | C-b |
-| Up half page | C-u |
-
-## Scroll
-
-> C-e
-
-> C-y
-
-## Jumps
-
-Go through your last jumps:
-
-> C-I
-
-> C-O
-
-Go to the last and previous places you've changed:
-
-> g;
-
-> g,
-
-Go to a filename, and type `gf` (Go-to-File).
-For example, if you put your cursor over the `~/.vimrc` in this line, you can edit your vim configuration file.
-
-`source ~/.vimrc`
-
-# Project Structure
-
-Make a 20 character 'visual split' in the current working directory ('`.`').
-
-> :20vs .
-
-Change the view for this:
-
-> C-w x
-
-

vim/vim-windows.md

@@ -1,14 +0,0 @@
----
-title: "vim windows"
-tags: [ "vim" ]
----
-
-| Command | Keys |
-|:-----|:----:|
-| split window | C-w s |
-| split window vertically | C-w v |
-| close window | C-q |
-| change window | C-w w |
-| rotate windows | C-w r |
-| split open new file | :sf path/file |
-

vim/vim_tricks.md

@@ -1,9 +0,0 @@
----
-title: "Vim Tricks"
-tags: [ "vim" ]
----
-
-## Remote Editing
-
-> vim scp://*user*@*myserver*[:*port*]//*path/to/file.txt*
-

writing/tex/calendar.md

@@ -0,0 +1,12 @@
+---
+title: "Calendar"
+tags: [ "writing", "tex", "fun" ]
+requires: [ "LaTeX Packages" ]
+---
+
+```sh
+yplan $(date +%Y) > ${file}.tex
+pdflatex -output-directory=/tmp/ ${file}.tex
+mv /tmp/${file}.pdf .
+```
+

writing/tex/tex_packages.md

@@ -0,0 +1,78 @@
+---
+title: "LaTeX Packages"
+tags: [ "writing" ]
+---
+
+# Warm Up
+
+1. Deep breath.
+1. Cup of tea.
+1. Remove the old LaTeX junk you've installed.  Search for 'texlive' or 'latex' in your package manager's installed files.
+1. Find `tlmgr` in your package manager.
+
+# `tlmgr`
+
+The LaTeX Package manager is known as `tlmgr`, and often resides in `/opt/texlive/${YEAR}/bin/x86_64-linux/tlmgr`.
+Double-check the location:
+
+```sh
+ls -l /opt/texlive/${YEAR}/bin/x86_64-linux/tlmgr
+ls /opt/texlive/${YEAR}/texmf-dist/scripts/texlive/tlmgr.pl 
+```
+
+Double-check the year.
+It should *not* match the current year, it should match the `texlive`.
+
+## Problems along the Path
+
+You can't use `tlmgr` unless it's in the `$PATH`.
+
+Check if it *is* in the `$PATH` then if it *should* be in the path:
+
+```sh
+echo $PATH
+grep texlive -r /etc/profile*
+```
+
+If `tlmgr` is where it should be, but not in the path, you can add it temporarily:
+
+
+```sh
+export PATH=${PATH}:/opt/texlive/${YEAR}/bin/x86_64-linux
+```
+
+...or just reboot.
+
+## Usage
+
+Search packages:
+
+
+```sh
+tlmgr search --global epstopdf
+```
+
+Can't find what you need?
+Search for a specific file instead:
+
+```sh
+tlmgr search --global --file epstopdf-base.sty
+sudo tlmgr install epstopdf-pkg
+```
+
+## Recommended Packages
+
+
+```
+latexmk
+luatex
+titletoc
+titlesec
+multicol
+microtype
+graphicx
+fontspec
+makeindex
+imakeidx
+```
+

writing/vim.md

@@ -10,7 +10,8 @@ tags: [ "vim", "basic" ]
 
 ## Extras
 
-- [Navigation](navigate.md)
-- [Completion](vim-completion.md)
-- [Search](vim-search.md)
-- [Window Splits](vim-windows.md)
+- [Navigation](vim/navigate.md)
+- [Completion](vim/completion.md)
+- [Search](vim/search.md)
+- [Window Splits](vim/windows.md)
+- [Use vim bindings in bash](vim/vim_in_bash.md)

writing/vim/completion.md

@@ -1,16 +1,17 @@
 ---
 title: "vim completion"
-tags: [ "vim" ]
+tags: [ "vim", "completion" ]
+requires: [ "vim basics" ]
 ---
 
 Complete the word by searching for the *n*ext similar word:
 
-> C-n
+`C-n`
 
 Complete the word by searching for a *p*revious similar word:
 
-> C-p
+`C-p`
 
 Complete the full line:
 
-> C-x C-l
+`C-x C-l`

writing/vim/navigate.md

@@ -0,0 +1,36 @@
+---
+title: "vim navigation"
+tags: [ "vim", "navigation" ]
+requires: [ "vim basics" ]
+---
+
+| Move                    | Command      |
+|:------------------------|:-------------|
+| Down page               | Ctl-f        |
+| Down half page          | Ctl-d        |
+| Up page                 | Ctl-b        |
+| Up half page            | Ctl-u        |
+| Scroll down             | Ctl-e        |
+| Scroll up               | Ctl-y        |
+| Jump to previous place  | Ctl-i        |
+| Jump to back            | Ctl-o        |
+| Jump to last change     | g;           |
+| Jump to next change     | g,           |
+| Go to current filename  | gf           |
+
+Go to a filename, and type `gf` (Go-to-File).
+For example, if you put your cursor over the `~/.vimrc` in this line, you can edit your vim configuration file.
+
+`source ~/.vimrc`
+
+# Project Structure
+
+Make a 20 character 'visual split' in the current working directory ('`.`').
+
+`:20vs .`
+
+Swap buffer positions:
+
+`C-w x`
+
+

writing/vim/search.md

@@ -1,22 +1,23 @@
 ---
 title: "vim search"
-tags: [ "vim" ]
+tags: [ "vim", "search" ]
+requires: [ "vim basics" ]
 ---
 Search for the next and or previous occurrence of the word under your cursor with `*` and `#`.
 
 Search and replace the first 'one' found with 'two':
 
-> :%s/one/two/
+`:%s/one/two/`
 
 Same, but replace 'one' globally:
 
-> :%s/one/two/g
+`:%s/one/two/g`
 
 Put quotes around every occurrence of `$HOME`:
 
-> :%s/$HOME/"&"
+`:%s/$HOME/"&"`
 
 Same, but add curly brackets around `$HOSTNAME`:
 
-> :%s/$HOSTNAME/{&}
+`:%s/$HOSTNAME/{&}`
 

writing/vim/vim_in_bash.md

@@ -1,13 +1,14 @@
 ---
 title: "vim in bash"
 tags: [ "vim", "bash", "inputrc" ]
+requires: [ "vim basics" ]
 ---
 
 Put bash in vim mode!
 
 Place the following in your `~/.inputrc`:
 
-```bash
+```
 set editing-mode vi
 set show-mode-in-prompt on
 set vi-ins-mode-string \1\e[33;32m\2[>]=\1\e[0m\2

writing/vim/windows.md

@@ -0,0 +1,15 @@
+---
+title: "vim windows"
+tags: [ "vim" ]
+requires: [ "vim basics" ]
+---
+
+| Command                   | Keys                |
+|:--------------------------|:-------------------:|
+| split window              | `C-w s`             |
+| split window vertically   | `C-w v`             |
+| close window              | `C-q`               |
+| change window             | `C-w w`             |
+| rotate windows            | `C-w r`             |
+| split open new file       | `:sf $filepath`     |
+

writing/vim_tricks.md

@@ -0,0 +1,10 @@
+---
+title: "Vim Tricks"
+tags: [ "vim" ]
+requiered: [ "ssh" ]
+---
+
+## Remote Editing
+
+`vim scp://*user*@*myserver*[:*port*]//*path/to/file.txt*`
+