Merge branch 'dev' into vhs

Makefile

@@ -1,82 +0,0 @@
-MAKEFLAGS += -j
-MAKEFLAGS += -s
-EDITOR ?= vi
-FZF != command -v sk || command -v fzy || command -v fzf || \
-	{ echo install a fuzzy finder && exit 1 ;}
-
-spill_contents = sed -e '1,/---/d'
-
-help: ## Print the help message
-	@awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z._-]+:.*?## / {printf "\033[36m%s\033[0m : %s\n", $$1, $$2}' $(MAKEFILE_LIST) | \
-		sort | \
-		column -s ':' -t
-
-articles != find * -type f -name "*.md"
-
-dirs != ls -d */
-categories = $(patsubst %/, %, $(dirs))
-
-databases = $(patsubst %, .dbs/%.rec, $(categories))
-
-default += $(databases)
-
-$(foreach dir, $(categories), \
-	$(eval .dbs/$(dir).rec: $(wildcard $(dir)/*)) \
-	)
-
-.dbs/:
-	mkdir $@
-$(databases): .dbs/%.rec: %/ | .dbs/
-	$(info making $(@F))
-	for entry in $(shell find $< -type f -name "*.md") ; do \
-		printf "file: %s\n" "$$entry" ;\
-		sed -n '2,/^---$$/ {/^---$$/d; p}' "$$entry"  |\
-		tr -d '[]' | tr -s ' ' |\
-		sed '/tags: /s/, /\ntag: /g ; s/tags:/tag:/ ; /requires/s/, /\nrequires: /g' ;\
-		printf "wordcount: %s\n\n" "$$(wc -w < $$entry)" ;\
-	done > $@
-
-# This two-variable read can only happen because of the quotes in the titles.
-db.rec: $(databases)
-	$(warning rebuilding from $? )
-	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 $^ >> $@
-	recsel $@ -e "requires != ''" -CR title,requires |\
-	while read title requires; do \
-		for provider in "$$requires" ; do \
-			recset $@ -e "title = '$${provider}'" -f provides -a "$${title}" ;\
-		done ;\
-	done
-	sed -i 's/"//g' $@
-	recfix --sort $@
-	$(info Created main database: $@)
-
-default += db.rec
-
-.git/info/exclude: $(default)
-	echo $^ | tr ' ' '\n' > $@
-
-default += .git/info/exclude
-
-.PHONY: database
-database: $(default) ## Make a recfiles database
-
-.PHONY: article
-article: ## Write an article
-	@path=$$(find $(categories) -type d | sort | uniq | $(FZF)) ;\
-	read -p "Title: " title ;\
-	filename="$$(echo "$$title" | tr '[:upper:]' '[:lower:]' | tr ' ' '_')" ;\
-	printf '%s\n' '---' >> $$path/$$filename.md ;\
-	printf 'title: "%s"\n' "$$title" >> $$path/$$filename.md ;\
-	printf 'tags: [ "%s" ]\n' "$$path" | tr '[:upper:]' '[:lower:]' | sed 's#\/#", "#g' >> $$path/$$filename.md ;\
-	printf '%s\n\n' '---' >> $$path/$$filename.md ;\
-	$(EDITOR) +5 "$$path/$$filename.md"
-
-.PHONY: clean
-clean: ## Remove all generated files
-	$(RM) $(default)

README.md

@@ -1,101 +1,73 @@
 ---
-title: "Linux Knowledge Base"
+title: "Knowledge Base"
 ---
 
-The Linux Knowledge-Base provides quick-start guides for working with terminal programs.
+# Linux Knowledgebase
 
-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 -e "title = 'ssh'"
-recsel db.rec -e "title ~ 'ssh'"
-recsel db.rec -e "title ~ 'bash'" -R title,wordcount
-
-recsel db.rec -t guide -j provides -G title \
-    -e "title = 'ssh'" \
-    -p 'sum(provides_wordcount)'
-```
+This is a list of quickstart guides for Linux programs, designed to get the user up and running as fast as possible.
 
 # Style
 
-## No History, No Context
+## Praxis Only
 
-- 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.
+We leave theory alone as much as possible.
+The documentation should be of the form 'if you want *X*, type *Y*'.
 
-## State Knowledge Dependencies
+We don't need to explain what a program does - anyone looking up 'how to X', already knows what they want to do.
+We don't even need to explain which program to use - if someone wants to combine an mp4 and webm video into a single video file, they only care about that result, not about learning `ffmpeg`.
 
-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.
+Any interest in these tools only comes after we can use them.
 
-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.
+## Chronological
 
-[Do not Jaquays documentation](https://splint.rs/posts/no_links)
+Entries should read like scripts - everything in the right order, with small notes on what this does.
 
-## Be Opinionated
+The chronology should never branch.
+If `gitea` can use three different types of database, the documentation should simply pick one and continue instructions from there.
+Repetition works better than a reference - if a database requires three commands to set up, it's better to repeat those three commands for every program that requires a database than to just link to another file which discusses databases.
 
-- Guides should not ask the reader to select options half-way through.
-- Options for different filesystems, databases, et c., should be written as separate guides.
+### Closing
 
-## Repetition Beats Reference
+Introductory documents should show anything required to cleanly uninstall a program, without leaving bulky configuration files behind.
 
-If a database requires three commands to set up, it's better to repeat those three commands for every program that requires a database than to just link to another file which discusses databases.
+## Three Input Types
 
-## Show Arguments as Variables
+There are three types of examples:
 
-Look at this line:
+Fixed input:
 
-```sh
-grep ls --color=always  $HISTFILE | less -R
+```bash
+ls
 ```
 
-What else can go in place of `always`?
-Can you say `--color=red`?
-Can you put anything?
-The answer is not obvious.
+Anything with arbitrary input should be shown as a variable.
 
-What about this line:
-
-```sh
-git branch new
-git checkout new
+```bash
+ls $FILE
 ```
 
-Do you always use `new`?
-Can you use another word here?
-The answer is not obvious.
+Non-commands (e.g. output) should be shown as quoted text:
 
-It's better to make all arbitrary values variables.
+> LK           img
+> Mail         kn
+> Projects     music
+
+# Example
+
+```
+How to see which websites you're actively accessing:
+
+` ` `bash
+ss -tr dst :$PORT
+` ` `   
+
+> State  Recv-Q  Send-Q   Local Address:Port                                    Peer Address:Port   Process  
+> ESTAB  0       0         192.168.0.14:42476                                 149.154.167.91:https           
+> ESTAB  0       0         192.168.0.14:43644                                  104.17.90.199:https           
 
-```sh
-git branch $branch_name
-git checkout $branch_name
-PAGER='less -R'
-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?
+# What's wrong with everything else?
 
 ## Man pages
 
@@ -103,14 +75,12 @@ If the command is `ls`, users will see files once they try the command, but the
 - Often presumes you know everything except that one program.
 - Often written in the 80's, and it shows.
 - Zero respect for your time.
-- Often references `info` pages (yuck).
 
-## `curl cheat.sh`
+## curl cheat.sh/
 
 - Doesn't have the programs I like.
 - Too short to get you started on many programs.
 - Poor understanding of priority (`git stash` is covered before `git commit`).
-- Repetitive
 
 # Current State
 

_index.md

@@ -0,0 +1,6 @@
+---
+title: "Linux Knowledge Base"
+---
+
+{{< ticks >}}
+{{< /ticks >}}

basics/at.md

@@ -1,6 +1,6 @@
 ---
 title: "at"
-tags: [ "basics", "time" ]
+tags: [ "Documentation", "Basics" ]
 ---
 Install with:
 
@@ -64,6 +64,8 @@ atrm 2
 
 Check `/var/spool/atd/` to see the jobs.
 
+![At it again](/tapes/at.gif)
+
 ## Automation
 
 Automatically add a job for later, by setting the date, then using echo for the command.

basics/at.tape

@@ -0,0 +1,40 @@
+Sleep 500ms
+Type "at teatime"
+Enter
+Sleep 1.5s
+Type "./"
+Sleep 500ms
+Type "baskup.sh"
+Sleep 1.5s
+Enter
+Sleep 1.5s
+Ctrl+D
+Sleep 3.5s
+Type "atq"
+Enter
+Sleep 1.5s
+Type "atq 1"
+Sleep 500ms
+Type "4"
+Enter
+Sleep 500ms
+Type "at"
+Sleep 1s
+Type " -c 15"
+Enter
+Sleep 1.5s
+Type "at"
+Sleep 500ms
+Type " "
+Sleep 500ms
+Type "-"
+Sleep 500ms
+Type "c 15 | grep PWD"
+Enter
+Sleep 5.5s
+Type "atrm 15"
+Sleep 2s
+Enter
+Sleep 3s
+Ctrl+D
+

basics/basics.md

@@ -1,6 +1,6 @@
 ---
 title: "Basics"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 
 You need about a dozen commands to move around Linux.
@@ -342,12 +342,11 @@ apt install $PROGRAM
 
 Remove `lolcat`, because it's useless:
 
-```sh
+```bash
 sudo apt remove lolcat
 ```
 
-...and that's pretty much it.
-You can move, create, destroy, install things, and look things up.
+... and that's pretty much it.  You can move, create, destroy, install things, and look things up.
 
 # Review
 

basics/clock.md

@@ -1,6 +1,6 @@
 ---
 title: "clock"
-tags: [ "basics", "time" ]
+tags: [ "Documentation", "Basics" ]
 ---
 
 Show system time:

basics/column.md

@@ -1,36 +0,0 @@
----
-title: "column"
-tags: [ "basics", "format", "json" ]
----
-
-Put output into column.
-
-```bash
-du -h /etc/* | column
-```
-
-Reformat file with an explicit separator (`-s`):
-
-```bash
-column -ts: /etc/passwd
-```
-
-Give columns names (`-N`), so you can hide some (`-H`):
-
-```bash
-column -ts: -N User,PW,UID,GID,Description,Home,shell -H PW,GID /etc/passwd
-```
-
-Reorder with `-O` (unspecified items remain):
-
-
-```bash
-column -ts: -N User,PW,UID,GID,Description,Home,shell -H PW,GID -O User,Description,shell /etc/passwd 
-```
-
-Output to json format with `-J`:
-
-```bash
-column -J -ts: -H PW,GID,shell -N User,PW,UID,GID,Description,Home,shell /etc/passwd
-```
-

basics/conditionals.md

@@ -1,6 +1,6 @@
 ---
 title: "conditionals"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 # If statements
 

basics/cron.md

@@ -1,12 +1,10 @@
 ---
 title: "cron"
-tags: [ "basics", "time" ]
+tags: [ "Documentation", "Basics" ]
 ---
-# Cronie
+# Cron
 
-The `cronie` program is also known as `crond`.
-
-## Install
+The crontab program might have various names, like `cronie` or `crond`.
 
 ```bash
 sudo apt search -n ^cron
@@ -16,35 +14,20 @@ Once installed, search for the service name, and start it.
 
 ```bash
 sudo systemctl list-unit-files | grep cron
-sudo systemctl enable --now $NAME
 ```
 
-## Usage
-
-Show your current crontab:
-
 ```bash
-crontab -l
+sudo systemctl enable --now cron
 ```
 
-You can put this in a file and edit it:
+You can *e*dit your crontab with:
 
 ```bash
-crontab -l > $filename
-echo '39 3 */3 * * /bin/tar czf /tmp/etc_backup.tgz /etc/' >> $filename
+crontab -e
 ```
 
-Then apply that crontab:
 
-```bash
-crontab $filename
-rm $filename
-```
-
-The `cron` program will check your syntax before adding the tab.
-
-Your crontab file sits somewhere in `/var/spool/`.
-Probably in `/var/spool/cron`.
+> 39 */3 * * * /usr/bin/updatedb
 
 ## Syntax
 
@@ -56,61 +39,43 @@ These five points refer to:
 
 So '3pm every Sunday' would be:
 
-`0 15 * * 7`
+> 0 15 * * 7
 
 Here 'Sunday' is indicated by "7", and '3pm' is 'the 15th hour'.
 The minute is '0' (i.e. '0 minutes past three pm').
 
 Doing the same thing, but only in February, would be:
 
-`0 15 * 2 7`
+> 0 15 * 2 7
 
-### Variables
-
-`cronie` doesn't know where you live, so to put something in your `$HOME` directory, you have to tell it:
+### Full Paths
 
+Executing something requires the full path to where it is, so you cannot simply use `apt update -y`, because cron does not know where `apt` is.
+Instead, find out where it is:
 
 ```bash
-echo "HOME=$HOME" > $filename
-crontab -l >> $filename
-crontab $filename
+type -P apt
 ```
 
-`cronie` doesn't know where anything lives, including programs.
-You can give it your usual `$PATH` variable like this:
+`/usr/bin/apt`
 
+Then put that into the crontab:
 
 ```bash
-echo $PATH > $filename
-crontab -l >> $filename
-crontab $filename
+sudo crontab -e
 ```
 
-Now instead of doing this
+> 40 */3 * * * /usr/bin/apt update -y
 
-`40 */3 * * * /usr/bin/du -sh $HOME/* | sort -h > $HOME/sum.txt`
+This will run `apt update -y` as root every 3 hours, at 40 minutes past the hour, e.g. 00:40, 03:40, 06:40.
 
-You can simply do this: 
-
-`40 */3 * * * du -sh $HOME/* | sort -h > $HOME/sum.txt`
-
-## Run as Root
+## Directories
 
 You can execute a script as root by putting it into a directory, instead of in the tab.
 Look at the available cron directories:
 
 ```bash
-ls -d /etc/cron.*
-```
-
-Make a script which runs daily:
-
-```bash
-f=apt_update.sh
-echo '#!/bin/bash' > $f
-echo 'apt update --yes' >> $f
-chmod +x $f
-sudo mv $f /etc/cron.daily/
+ls /etc/cron.\*
 ```
 
 ### Testing with runparts
@@ -121,9 +86,50 @@ Run-parts runs all executable scripts in a directory.
 run-parts /etc/cron.hourly
 ```
 
-# Troubleshooting
+## Tips
+
+### Variables
+
+Add your `$HOME` to crontab to use scripts.
+First add `HOME=/home/user`, then you can use syntax like this:
+
+0 * * * * $HOME/.scripts/myScript.sh
+
+*Remember to test the script by executing that line first*:
+
+```bash
+$HOME/.scripts/myScript.sh
+```
+
+You can also add your regular path to your crontab as a variable (see example below).
+If you're using vim as the editor, just run this at the top of your crontab:
+
+```bash
+:r!echo PATH=$PATH
+```
 
 ### `date` Commands
 
 Cron doesn't understand the `%` sign, so if you want to use `date +%R`, then it should be escaped with a backslash: `date +\%R`.
 
+### File Location
+
+The crontab files are in `/var/spool/cron/`, so you can backup or restore them.
+
+# Example
+
+```
+HOME=/home/user
+PATH=/usr/condabin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/user/.local/bin:/home/user/.scripts/:/home/user/.local/bin:/home/user/.scripts/
+
+1 0 1 * *    /usr/bin/mkdir -p $HOME/arc/$(date +\%Y/\%m)
+
+18 0 1 */3 * $HOME/.scripts/mail-clean.sh
+
+* * * * * ping -c 1 home || mail-pull.sh
+
+50 18 * * * /usr/bin/timeout 30m /usr/bin/syncthing
+
+```
+
+

basics/eval.md

@@ -1,22 +0,0 @@
----
-title: "eval"
-tags: [ "basics" ]
----
-
-Compose a statement for execution.
-
-```bash
-x='echo $y'
-echo $x
-y=dragon
-eval "$x"
-```
-
-The results remain in the current shell, unlike sub-shells.
-
-```bash
-b=basilisk
-sh -c 'echo $b'
-eval "g=goblin"
-echo $g
-```

basics/games.md

@@ -1,11 +0,0 @@
----
-title: "bash games"
-tags: [ "games" ]
----
-
-Games are a great way to learn bash.
-
-- `mapscii.me` is an interactive terminal map.
-    1. Install telnet.
-    1. `telnet mapscii.me`
-- [Over the Wire](https://overthewire.org/wargames) teaches bash with small challenging you can do over `ssh`.

basics/hard_links.md

@@ -1,38 +0,0 @@
----
-title: "hard links"
-tags: [ "basics", "links" ]
----
-
-A hard link is one file which exists in multiple locations.
-
-Each file has an ID, which is kept on the hard disk's partition.
-Each hard link has the same ID, because they are the same file.
-This ID is called the 'inode'.
-
-Create a file, and a hard link:
-
-```bash
-fortune > $file_1
-mkdir -p x/y/z/
-ln $file_1 x/y/z/$file_2
-```
-Have a long look at the file with the `-l` flag, and check the inode with `-i`:
-
-```bash
-ls -li $file_1 x/y/z/$file_2
-```
-
-Since they are the same file, you can make a change to one, and it changes both:
-
-```bash
-fortune | tee x/y/z/$file_2
-cat $file_1
-cat x/y/z/$file_2
-```
-
-# Danger Zone
-
-- hard links will not work on directories, only standard files and fifos.
-- `git` will destroy and remake files, so it will not respect hard links.
-- Files cannot have a hard link on another disk partition, because the inode is stored on each partition.
-

basics/joyous_ascii.md

@@ -1,25 +0,0 @@
----
-title: "Joyous ASCII"
-tags: [ "fun" ]
----
-
-- `asciiquarium`
-- `cbonsai -lim "$(fortune)"`
-
-```sh
-cow=$(cowsay -l | sort -R | head  -1)
-fortune -s | figlet | cowsay -nf $cow | lolcat
-```
-
-Watch the [Collatz Conjecture](https://en.wikipedia.org/wiki/Collatz_conjecture) collapse:
-
-```sh
-x="$(du -sc ~/.cache | tr -d '[:alpha:]' | tail -1)"
-until [ "$x" -eq "1" ]; do
-    test "$(( x % 2 ))" -eq 0 && x=$(( x / 2 )) || \
-        x=$(( x * 3 + 1 ))
-    clear -x
-    figlet "$x" | lolcat
-    sleep 1
-done
-```

basics/kernel.md

@@ -0,0 +1,34 @@
+---
+title: "kernel"
+tags: [ "Documentation", "Basics" ]
+---
+## Living Space
+
+Kernel modules live in lib/modules/$(uname -r)
+
+## Change
+
+Load them with
+
+```bash
+sudo modprobe ath9k
+```
+
+Or remove one with
+
+```bash
+sudo modprove uvcvideo
+```
+
+The PC's irritating speaker beep can be really annoying. Disable it with:
+
+```bash
+sudo modprobe -r pcspeaker
+```
+
+Permanently disable a module by blacklisting it in `/etc/modprobe.d`:
+
+```bash
+echo 'blacklist pcspkr' > /etc/modprobe.d/*nobeep*.conf
+```
+

basics/kill.md

@@ -1,6 +1,6 @@
 ---
 title: "kill"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 
 If you want to kill a program in a graphical environment, open a terminal and type:

basics/links.md

@@ -1,9 +1,19 @@
 ---
 title: "links"
-tags: [ "basics", "links" ]
+tags: [ "Documentation", "Basics" ]
 ---
+Link from X to Y.
 
-There are two types:
+```bash
+ln -s X ../otherdir/Y
+```
+
+If you want a hard link, this will make a single file exist in two locations.
+If it is deleted in one location, it continues to exist in the other.
+
+```bash
+ln *X* *Y*
+```
+
+Both files must be on the same hard drive, as they have the same inode (check this with `ls -i file`).
 
-- [Soft links](soft_links.md)
-- [Hard links](hard_links.md)

basics/locale.md

@@ -1,6 +1,6 @@
 ---
 title: "locale"
-tags: [ "basics", "time" ]
+tags: [ "Documentation", "Basics" ]
 ---
 
 Your locale tells the computer your location, preferred time-and-date format, standard language, papersize, et c.

basics/locating.md

@@ -1,33 +1,43 @@
 ---
 title: "locating"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 # Type
 
 `type` shows what kind of thing you're running, be it an alias, function, or binary program.
 
-```sh
-type cd
-type ls
-type -P ls
-type -a cat
+```bash
+type cmus
 ```
 
+![where is cmus?](/tapes/which.gif)
+
 # Whereis the Program
 
-Where is `grep` and all its configuration files?
+Ask where the `angband` program is, along with all its configuration files:
 
-```sh
-whereis grep
+`whereis angband`
+
+Also `which` shows where a binary file (the program) is, 
+
+```bash
+which cmus
 ```
 
-Which one of these is the binary file which you actually use?
+# Quick Search for Files
 
-```sh
-which grep
+You'll need to set up `locate` for this by installing `mlocate`.
+`mlocate` needs a list of all files on the machine, so run:
+
+```bash
+sudo updatedb
 ```
 
-# More
+Then to find a file called 'my-cats.jpg', run:
 
-- [Search instantly with `plocate`](data/search_system.md)
+```bash
+locate cats
+```
+
+For best results, run `updatedb` regularly, perhaps in crontab.
 

basics/ls.md

@@ -1,46 +0,0 @@
----
-title: "ls"
-tags: [ "basics" ]
----
-
-Firstly, your `ls` is probably aliased to something.
-
-Check it with:
-
-
-```bash
-alias ls
-```
-If the prompt shows some alias, then start by removing it:
-
-
-```bash
-unalias ls
-```
-
-Now we can begin.
-
-Check the most recently modified file:
-
-
-```bash
-ls -t
-```
-
-Reverse this with `tac` to see the file which has been unmodified the longest:
-
-
-```bash
-ls -t | tac
-```
-Group files by extension:
-
-```bash
-ls -X
-```
-Sort largest files first:
-
-```bash
-ls -X
-```
-

basics/processes.md

@@ -1,6 +1,6 @@
 ---
 title: "processes"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 # Proccesses
 

basics/setup/quality_of_life.md

@@ -1,180 +0,0 @@
----
-title: "Quality of Life"
-tags: [ "basics", "setup" ]
-dependencies: [ "vi", "basics" ]
----
-
-This & That
-===========
-
-Refer to 'that last thing', and 'the first thing':
-
-```bash
-fortune -l > file1
-cat !$  | tr -d u
-diff !^ !$
-```
-
-**NB:** this can go wrong:
-
-```bash
-ls -l file1 file2
-cat !^
-```
-
-Done
-----
-
-`<C-d>`
-
-- If you have a command, Control + d will execute the command.
-- If you have nothing, `exit`.
-
-Input Run-Commands (`~/.inputrc`)
-=================================
-
-Alias Expansion
----------------
-
-```bash
-echo '"\C- ": shell-expand-line' >> ~/.inputrc
-exec bash
-```
-
-Now you can expand all aliases with 'Control + Space'.
-Try just `ls`, then 'Control + Space'.
-
-Glob Expansion (`*`)
---------------------
-
-```bash
-echo '"\C-x": glob-expand-word' >> ~/.inputrc
-exec bash
-ls *<C-x>
-```
-
-- Are you sure you want to delete that?
-    * `rm -r *<C-x>`
-- Clean up the Downloads folder:
-    * `rm Downloads/*pdf<C-x>`
-
-Arbitrary Commands
-------------------
-
-Use `\n` as a 'newline' character to automatically press `<Return>`.
-
-```bash
-echo 'Control-y: "| lolcat\n"' >> ~/.inputrc
-exec bash
-ls<C-y>
-```
-
-```bash
-Control-l: "\C-u clear -x && ls\n"
-exec bash
-cd /etc/<C-l>
-```
-
-Readline as Vi
---------------
-
-```bash
-echo 'set editing-mode vi' >> ~/.inputrc
-echo 'set keymap vi-insert' >> ~/.inputrc
-exec bash
-```
-
-The prompt now works according to `vi`-motions.
-This goes much further than the bash-option, `set -o vi` ('set option: `vi`').
-It changes the cursor in the terminal, not just bash.
-
-Try:
-
-- `ls <C-n>`
-- `ls <C-p>`
-- Type some words.
-- `<Esc>0dw$p`
-- <Esc> to normal-mode, and go back with 'b', and forward with 'e'.
-- `4b` to step back four times.
-- `cE`
-- `<Esc>kcw`
-- ls -a<Esc>xxxx
-
-Works with `python` too:
-
-```python
-im<C-n>os<Return>
-os.li<C-n><Return>
-<Esc>kfn
-<C-d>
-```
-
-Fix Globs!
-----------
-
-If you tried the previous commands then they will not work any more, because the `vi`-commands overwrite the other commands.
-Remove them.
-
-```bash
-sed '/ vi/d' ~/.inputrc
-sed -i '/ vi/d' ~/.inputrc
-
-sed '1 i set editing-mode vi' .inputrc 
-sed -i '1 i set editing-mode vi' ~/.inputrc 
-sed -i '2 i set keymap vi-insert' ~/.inputrc 
-```
-
-Vi-sibility
------------
-
-The `readline` prompt becomes confusing if you don't remember if you're in insert or normal mode.
-But you can show the  current mode in the prompt:
-
-```bash
-echo 'set show-mode-in-prompt on' >> ~/.inputrc
-exec bash
-```
-
-Set new symbols for normal and insert mode:
-
-```bash
-echo 'set vi-ins-mode-string "  "' >> ~/.inputrc
-echo 'set vi-cmd-mode-string " "' >> ~/.inputrc
-```
-
-Fuzzy Sort
-==========
-
-Check your repos for `sk-im`, and install.
-The program is called `sk`.
-
-```bash
-FUZZY=sk
-```
-
-If you don't have it, `fzy` or `fzf` should work the same way.
-
-```bash
-FUZZY=fzy
-```
-
-Find some 'read-config' files to check out:
-
-```bash
-find . -maxdepth 2 -name "*rc"
-find . -maxdepth 2 -name "*rc" | $FUZZY
-```
-
-And read some:
-
-```bash
-PAGER='less -R'
-$PAGER "$(find . -maxdepth 2 -name "*rc" | $FUZZY)"
-```
-
-Make the change long-term:
-
-```bash
-alias rrc='$PAGER "$(find . -maxdepth 2 -name "*rc" | sk)"'
-alias | grep rrc= >> ~/.bash_aliases
-```

basics/soft_links.md

@@ -1,72 +0,0 @@
----
-title: "soft links"
-tags: [ "basics", "links" ]
----
-A soft link is a file which says how to go to another file.
-When a program encounters a soft link, it will make a  guess at whether it should ignore it, or try to get to that file.
-
-To make a soft link to a file in the current directory, linking is easy:
-
-```bash
-fortune > $file_1
-ln -s $file_1 $link_1
-```
-
-Now imagine your directory looks like this:
-
-```
-dir_0/
-├── dir_1
-│   └── file_1
-├── dir_2
-│   └── file_1
-├── file_1
-└── link_1
-
-```
-
-Inside `dir_1`, making a soft link to `dir_0/file_1` would mean putting the directions to that file:
-
-```bash
-cd dir_1
-ln -s ../file_1 link_1
-```
-
-The real content of the file is just '`../file_1`, so making it from another directory would mean writing exactly the same address to that file:
-
-```bash
-ln -s ../file_1 dir_2/link_2
-```
-
-Both symlinks are identical, except for the name.
-
-```
-dir_0/
-├── dir_1
-│   ├── file_1
-│   └── link_1   <-- This one points to ../file_1
-├── dir_2
-│   ├── file_1
-│   └── link_2   <-- This one points to ../file_1 as well.
-└── file_2
-
-```
-
-Since it's just an address, you can delete the original file, then make another.
-
-```bash
-rm file_1
-ls -l dir_1/
-fortune > file_1
-cat dir_2/link_2
-fortune | tee -a file_1
-cat dir_1/link_1
-```
-
-Last, let's make a link from `dir_2/link_2` to `dir_1/file_1` (this will delete the old link):
-
-```bash
-ln -s -f ../dir_1/file_1 dir_2/link_2
-cat dir_2/link_2
-```
-

basics/time.md

@@ -1,6 +1,6 @@
 ---
 title: "time"
-tags: [ "basics", "time" ]
+tags: [ "Documentation", "Basics" ]
 ---
 # systemd
 
@@ -56,7 +56,7 @@ Then set that language, with:
 LANG=pl_PL.UTF-8
 ```
 
-...then reboot.
+... then reboot.
 
 # Network Time Protocol
 
@@ -68,11 +68,3 @@ ntpq -p
 
 Usually this is run as a service, so just start that service.
 
-# Force Reset
-
-If your clock drifts too far from the right time, it will not reset happily.
-For it to reset like this:
-
-```bash
-sudo ntpd -q -g -x -n
-```

basics/tree.md

@@ -1,36 +0,0 @@
----
-title: "tree"
-tags: [ "basics", "tree", "markdown" ]
----
-
-The `tree` utility outputs a full listing of everything in your current directory, and those below.
-
-- Just directories: `tree -d`
-- Output colour to `less`: `tree -C --info | less -re`
-- Ignore files in the `.gitignore` file: `tree --gitignore`
-
-You can place information about the files in a directory to use with the `tree --info` option, like this:
-
-```
-config
-	Config files.
-	This is a git submodule.
-README.md
-	Summary of the git.
-*.jpg
-	Little picture, does not display
-	words well.
-```
-
-Each description-line starts with a tab.
-
-## Markdown Conversion
-
-To represent a file structure as a nested series of markdown lists, you can try this horrifying `sed` one-liner:
-
-```bash
-tree -tf --dirsfirst --gitignore --noreport --charset ascii  | \
-    sed -e 's/| \+/  /g' \
-    -e 's/[|`]-\+/ */g' \
-    -e 's:\(* \)\(\(.*/\)\([^/]\+\)\):\1[\4](\2):g'
-```

basics/users.md

@@ -1,6 +1,6 @@
 ---
 title: "users"
-tags: [ "basics" ]
+tags: [ "Documentation", "Basics" ]
 ---
 # Basic Information
 

basics/which.tape

@@ -0,0 +1,31 @@
+Type "whereis cmus"
+Enter
+Sleep 1s
+Type "which cmus"
+Enter
+Sleep 500ms
+Type "type /bin/cmus"
+Enter
+Sleep 5s
+Type "man cmus"
+Enter
+Sleep 1s
+Type " "
+Sleep 1s
+Type " "
+Sleep 1s
+Type " "
+Sleep 500ms
+Type " "
+Sleep 1.5s
+Type " "
+Sleep 500ms
+Type " "
+Sleep 1.5s
+Type " "
+Sleep 500ms
+Type " q"
+Sleep 500ms
+Type "cmus"
+Sleep 3s
+Ctrl+D

basics/yes.md

@@ -1,24 +0,0 @@
----
-title: "yes"
-tags: [ "basics" ]
----
-# The Best Linux Program: `yes`
-
-The program `yes` prints the word `yes` to your terminal until you cancel it, perhaps with 'Control + c'.
-Or technically it prints `yes\n`, meaning `yes` and then a new line (like pressing the Return key).
-
-This is extremely powerful.
-
-If you ever want to automatically install something which persistently nags you with `do you want to do the thing? [y/N]?`, then you can just pipe `yes` into that program, and it will answer 'yes' to all questions.
-
-```bash
-yes | $INSTALL_SCRIPT_FILE.sh
-```
-
-This works best for disposable systems, like VMs or containers.
-Try this on a live system, and you might find out that you should have read that message fully.
-
-```bash
-yes | yay
-```
-

chat/profanity.md

@@ -1,6 +1,6 @@
 ---
 title: "profanity"
-tags: [ "chat", "omemo" ]
+tags: [ "Documentation", "Chat" ]
 ---
 # Setup (Commands)
 
@@ -140,5 +140,54 @@ You can ensure omemo automatcally turns on:
 ```
 /omemo policy automatic
 ```
----
+
+## otr
+
+Install libotr-dev or libotr5-dev or whatever..
+
+```
+sudo apt -y install lib5otr-dev
+```
+
+Make your otr keys.
+
+```
+/otr gen
+```
+
+Then you can start an otr converstation.
+
+```
+/otr start bob@jobbies.org
+```
+
+Or if you already have a conversation windows open, switch to our using:
+
+```
+/otr
+```
+
+Finally, verify!
+
+```
+/otr question "Who are you?" bob
+```
+
+Bob is verified upon the answer, 'bob'.
+
+### OTR Finger Prints
+
+Get yours with 
+
+```
+/otr myfp
+```
+
+```
+/otr theirfp
+```
+
+```
+/otr myfp
+```
 

chat/wgetpaste.md

@@ -1,29 +1,29 @@
 ---
 title: "wgetpaste"
-tags: [ "chat" ]
+tags: [ "Documentation", "Chat" ]
 ---
 
 See available pastebins:
 
-```sh
+```bash
 wgetpaste -S
 ```
 
 Upload script.sh to bpaste:
 
-```sh
+```bash
 wgetpaste -s bpaste script.sh
 ```
 
 Input clipboard to dpaste with the heading "Title"
 
-```sh
+```bash
 wgetpaste -s dpaste -d Title -x
 ```
 
 Paste in the file then load the result to the right-hand clipboard:
 
-```sh
+```bash
 wgetpaste -s dpaste -X
 ```
 

data/backups/archives.md

@@ -1,6 +1,6 @@
 ---
 title: "Archives"
-tags: [ "tar", "backups", ".tgz", "tar.gz" ]
+tags: [ "Documentation", "tar", "backups" ]
 ---
 # `tar`
 
@@ -8,21 +8,22 @@ tags: [ "tar", "backups", ".tgz", "tar.gz" ]
 
 Combine many files and directories into a single t-archive file.
 
-```sh
+```bash
 tar cf "$ARCHIVE".tar $DIR
 ```
 You can remember this with the mnemonic '*C*reate *F*ile'.
 
-Unfortunately, this stores the full file path, so making a tar archive of `/etc/nginx/` will store `etc/nginx` (without the leading `/`).
+Unfortunately, this stores the full file path, so making a tar archive of `/etc/nginx/` will store `etc/nginx` (without the leading `/`.
+
 It's often better to tell tar which path to start from using the `-C` flag.
 
-```sh
+```bash
 tar cf "$ARCHIVE".tar -C /etc/ nginx
 ```
 
 Check the contents of your archive with:
 
-```sh
+```bash
 tar tf "$ARCHIVE".tar
 ```
 
@@ -30,7 +31,7 @@ If you want to store 'everything in a directory', then using `*` will not work,
 
 Instead, you can store the target in a variable:
 
-```sh
+```bash
 files=$(ls /etc/nginx)
 tar cf "$ARCHIVE".tar -C /etc/nginx/ $file
 ```
@@ -39,9 +40,7 @@ tar cf "$ARCHIVE".tar -C /etc/nginx/ $file
 
 Extract the tar archive with
 
-```sh
-tar xf "$ARCHIVE".tar
-```
+> tar xf "$ARCHIVE".tar
 
 You can remember this with the mnemonic 'e*X*tract *F*ile'.
 
@@ -49,7 +48,7 @@ You can remember this with the mnemonic 'e*X*tract *F*ile'.
 
 Create a zip-compressed archive with the `z` flag.
 
-```sh
+```bash
 tar czf "$ARCHIVE".tgz -C /etc/nginx/ $file
 ```
 
@@ -61,16 +60,18 @@ You can use any file ending you want, but sane people like to use '.tgz' or '.ta
 
 Make archive:
 
-```sh
-7za a -tzip -p "$PASSWORD" -mem=AES256 $ARCHIVE.zip $FILE_1 $FILE_2
+```bash
+PASSWORD=my_password
+```
+```bash
+7za a -tzip -p$PASSWORD -mem=AES256 $ARCHIVE.zip $FILE_1 $FILE_2
 ```
-
 Note that people can still see every filename in your archive, and can change those files.
 They just can't read the contents.
 
 Unzip:
 
-```sh
+```bash
 7za x archive.zip
 ```
 

data/backups/unison.md

@@ -1,11 +1,11 @@
 ---
 title: "unison"
-tags: [ "backups", "synch" ]
+tags: [ "Documentation", "Backups" ]
 ---
 
 Install unison on both machines, and make sure both have the same version of unison, with the same version of the ocaml compiler (the smallest difference will cause problems).
 
-```sh
+```bash
 unison -version
 ```
 
@@ -13,14 +13,14 @@ Create the `~/.unison` directory on both machines.
 
 Make a job called `backup`:
 
-```sh
+```bash
 JOB=backup
 ```
 
 Here is an example job, which synchronizes the `~/music` directory with a remote machine which has the same username.
 
 
-```sh
+```bash
 echo "
 auto = true
 root=$HOME
@@ -42,7 +42,7 @@ The last command means it will ignore any file with a name ending in `.flac`.
 The first command means this will run but also confirm which files will be deleted, and which will be transferred, us `batch = true` instead.
 Or you can deleted that line in the `.prf` file and run it with a flag:
 
-```sh
+```bash
 unison -batch *backup*.prf
 ```
 

data/base_16.md

@@ -1,26 +1,8 @@
 ---
 title: "Base 16"
-tags: [ "data" ]
+tags: [ "Documentation", "Data" ]
 ---
 
-Base 16 numbers often use `0x` at the start, so '10' just means '10', but `0x10` means '10 in base 16' which means '16'.
-
-For small numbers, use `printf`.
-
-```sh
+```bash
 printf "%x" $NUMBER
 ```
-
-For any number, use `bc`.
-
-
-```sh
-fortune | md5sum  | cut -d' ' -f1 | tr [:lower:] [:upper:] | bc
-```
-
-- Inputting base 16 uses `ibase=16`.
-- Outputting base 10 uses `ibase=10`
-
-```sh
-echo 'ibase=16;' $(echo cbb478ac825f0dce7671254be035d0bc | tr [:lower:] [:upper:]) | bc
-```

data/calcurse.md

@@ -1,14 +0,0 @@
----
-title: "calcurse"
-tags: [ "data", "calendar", "daylight savings" ]
----
-
-## Setup
-
-The UK government keeps an `ics` file with clock.
-
-```sh
-wget https://www.gov.uk/when-do-the-clocks-change/united-kingdom.ics
-calcurse -i united-kingdom.ics
-```
-

data/email.md

@@ -1,73 +0,0 @@
----
-title: "e-mail"
-tags: [ "data", "smtp" ]
----
-
-This is bare-bones, original, primitive e-mail.
-
-Install `opensmtpd` (or similar), then `ncat` or `nc` or `netcat` (this mysterious cat has many names).
-
-Start the `opensmtpd` service, then use netcat to speak with the mail-daemon:
-
-```sh
-nc localhost 25
-```
-
-The computer should respond with code `220`, which means 'I am listening'.
-
-> 220 hex ESMTP OpenSMTPD
-
-```
-HELO gmail.com
-```
-
-You say `HELO` and say where you are coming from.
-
-
-The `smtpd` will not check, so I am going to lie to it.
-Mail servers are easily impressed, so it will be pleased to meet you.
-
-> 250 hex Hello gmail.com [::1], pleased to meet you
-
-```
-MAIL FROM: <admin@gmail.com>
-```
-
-All the mail commands start with 4 bytes, because it's easier for admins to program.
-Tell the mail daemon who you are in this format.
-
-> 250 2.0.0 Ok
-
-Then tell it who you're sending to.
-
-```sh
-RCPT TO: <www@dmz.rs>
-```
-
-> 250 2.1.5 Destination address valid: Recipient ok
-
-Finally, tell it that you want to send `DATA`.
-
-```
-DATA
-```
-
-> 354 Enter mail, end with "." on a line by itself
-
-```
-Subject: turn off server please
-
-very urgent
-.
-```
-
-> 250 2.0.0 73864a49 Message accepted for delivery
-
-You will find the email under `/var/spool` or `/var/mail` or similar.
-
-If unsure, just take a part of your email, like `FRAGMENT="turn off server please"`, then `grep` for it:
-
- ```sh
-sudo grep -r $FRAGMENT /var/spool/*
- ```
-

data/git-lfs.md

@@ -0,0 +1,24 @@
+---
+title: "git-lfs"
+tags: [ "Documentation", "data" ]
+---
+
+Install, and add with
+
+```bash
+git lfs install
+```
+
+Then track some filetype with:
+
+```bash
+git lfs track "\*.ttf"
+```
+
+Or a directory with:
+
+```bash
+git lfs track "images/"
+```
+
+All changes require adding `.gitattributes`.

data/git.md

@@ -1,45 +1,46 @@
 ---
 title: "git"
-tags: [ "data" ]
+tags: [ "Documentation", "data" ]
 ---
 # Starting
 
 ## New Machines
 
-```sh
+```bash
 git config --global user.email "$YOUR_EMAIL"
 ```
 
-```sh
+```bash
 git config --global user.name "$YOUR_NAME"
 ```
 
 # New Git
 
-Decide on algorithm:
+Start a git in directory `$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
+mkdir $DIR && cd $DIR
 ```
 
-Make a file explaining what the project does, and tell `git` to track it:
+```bash
+git init
+```
 
-```sh
-echo "I hereby solemnly swear never to commit a binary file." > README.md
+Make a file explaining what the project does:
+
+```bash
+vim README.md
+```
+
+Add this to the git:
+
+```bash
 git add README.md
 ```
 
 Then make the initial commit, explaining the change you just made:
 
-```sh
+```bash
 git commit
 ```
 
@@ -47,17 +48,17 @@ git commit
 
 Once you make a change to some file, add it and make a commit explaining it.
 
-```sh
+```bash
 git add $FILE
 ```
 
-```sh
+```bash
 git commit -m"change $FILE"
 ```
 
 Check your history:
 
-```sh
+```bash
 git log
 ```
 
@@ -68,20 +69,20 @@ Give it the same name as the `$DIR` directory, above.
 
 Add this as a remote:
 
-```sh
+```bash
 REMOTE=gitlab
 git remote add $REMOTE  https://gitlab.com/$USERNAME/$DIR
 ```
 
 Tell git you're pushing the branch "master" to the remote repo "origin": 
 
-```sh
+```bash
 git push -u master origin
 ```
 
 If someone makes a change on the remote, pull it down with:
 
-```sh
+```bash
 git pull
 ```
 
@@ -90,82 +91,109 @@ 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:
 
-```sh
-git branch $FEATURE_BRANCH
+```bash
+git branch *featurez*
 ```
 
 Have a look at all your branches:
 
-```sh
+```bash
 git branch
 ```
 
 Switch to your new branch:
 
-```sh
-git checkout $FEATURE_BRANCH
+```bash
+git checkout *featurez*
 ```
 
 And if your changes are rubbish, checkout the "master" branch again, then delete "featurez":
 
-```sh
-git branch -D $FEATURE_BRANCH
+```bash
+git branch -D *featurez*
 ```
 
 Or if it's a good branch, push it to the remote:
 
-```sh
-remote=origin
-git push $remote $FEATURE_BRANCH
+```bash
+git push *origin* *featurez*
 ```
 
 ## Merging
 
 Once you like the feature, merge it into the main branch.  Switch to master then merge it:
 
-```sh
-git merge $FEATURE_BRANCH
+```bash
+git merge *featurez*
 ```
 
-And delete the branch, as you've already merged it:
+and delete `featurez` as you've already merged it:
 
-```sh
-git branch -d $FEATURE_BRANCH
+```bash
+git branch -d featurez
 ```
 
 # Subtree
 
 ## Pulling another git repo into a subtree
 
-```sh
+```bash
 git subtree add -P config git@gitlab.com:bindrpg/config.git master
 ```
 
+## Pulling a Subtree from an existing git
+
+The project has subdirectories sub-1,sub-2,sub-3.  The first should be its own repository, but should also retain its own history.
+
+First, we extract its history as an independent item, and make that into a seprate branch.
+
+```bash
+git subtree split --prefix=sub-1 -b sub
+```
+
+If you want something a few directories deep, you can use `--prefix=sub-1/dir-2/dir-3
+
+Then go and create a new git somewhere else:
+
+```bash
+cd ..;mkdir sub-1;cd sub-1;git init --bare
+```
+
+Then go back to your initial git repo, and do the following:
+
+git push ../subtest sub:master
+
+Finally, you can clone this repo from your original.
+
+```bash
+git clone ../subtest
+```
+
 # Tricks
 
 ## Delete All History
 
-```sh
+```bash
 git checkout --orphan temp
 ```
 
-```sh
+```bash
 git add -A
 ```
 
-```sh
+```bash
 git commit -am "release the commits!"
 ```
 
-```sh
+```bash
 git branch -D master
 ```
 
-```sh
+```bash
 git branch -m master
 ```
 
-```sh
+```bash
 git push -f origin master
 ```
 
@@ -173,21 +201,21 @@ Gitlab requires more changes, such as going to `settings > repository` and switc
 
 ## Clean up Bloated Repo
 
-```sh
+```bash
 git fsck --full
 ```
 
-```sh
+```bash
 git gc --prune=now --aggressive
 ```
 
-```sh
+```bash
 git repack
 ```
 
 ## Find Binary Blobs
 
-```sh
+```bash
 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

@@ -1,22 +0,0 @@
----
-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/git/git-lfs.md

@@ -1,73 +0,0 @@
----
-title: "git-lfs"
-tags: [ "data", "git" ]
-requires: [ "git" ]
----
-
-Git Large File Storage ('LFS') needs to change your `~/.gitconfig` to check out those binary files:
-
-```sh
-cat ~/.gitconfig
-git lfs install
-cat ~/.gitconfig
-```
-
-Then track some filetypes with:
-
-```sh
-cd $git_repository
-ext=ttf
-git lfs track "*.$ext"
-```
-
-Or a directory with:
-
-```sh
-git lfs track "images/"
-```
-
-Track the changes to `.gitattributes`:
-
-```sh
-git status
-git add .gitattributes
-git commit -m "add $ext to lfs"
-```
-
-## Bash Completion
-
-If bash completion does not work, you'll have to add it:
-
-```sh
-git lfs completion bash |  sudo tee /usr/share/bash-completion/completions/git-lfs 
-```
-
-## Trouble Shooting
-
-You have some file "$FILE".png, which has some problem.
-
-Check the filetype:
-
-```sh
-file "$FILE".png
-```
-
-This should say the type is 'image'.
-If it says the type is 'text', then this file is really just a reminder to `git-lfs` to check out that file.
-
-Check `git-lfs` is expecting that file:
-
-```sh
-git lfs status
-git lfs ls-files
-```
-
-...then try these commands, and check the filetype again:
-
-```sh
-git lfs fetch --all
-git lfs fsck
-git lfs checkout
-git lfs status
-```
-

data/git/git_secret.md

@@ -1,9 +0,0 @@
----
-title: "git-secret"
-tags: [ "data", "git" ]
----
-
-This utility is largely useless, as it can only identify people by their email.
-So if someone has multiple GPG keys associated with one email, the tool will not work.
-
-A broken tool is better than a tool which will break soon.

data/git/git_stash.md

@@ -1,69 +0,0 @@
----
-title: "git stash"
-tags: [ "data", "git" ]
-requires: [ "git" ]
----
-
-Save file-changes without committing anything.
-
-Change a file:
-
-```sh
-file=README.md
-fortune >> ${file}
-git diff
-git stash save
-```
-
-List which stashes you have:
-
-
-```sh
-git stash list
-
-    stash@{1}: WIP on master: c21f102 init git
-```
-
-Make a new file, then stash it:
-
-
-```sh
-otherfile=file.log
-fortune > ${otherfile}
-git add ${otherfile}
-stashname=logfile
-git stash save ${stashname}
-```
-
-Now you can see two stashed changes, and the most recent has a name:
-
-```sh
-git stash list
-
-    stash@{0}: On master: logfile
-    stash@{1}: WIP on master: c21f102 init git
-```
-
-You can delete a stash by referring to its index number, or name (if it has one).
-
-```sh
-choice=1
-git stash drop ${choice}
-
-choice=${stashname}
-git stash drop ${choice}
-```
-
-Or just run `git stash drop` to remove the most recent (labelled `{0}`).
-
-Return stashed changes with an index number (or the most recent).
-
-```sh
-git stash pop ${choice}
-```
-
-Delete all stashes:
-
-```sh
-git stash clear
-```

data/git/hooks.md

@@ -1,29 +0,0 @@
----
-title: "git hooks"
-tags: [ "data", "git" ]
----
-
-Check out the sample hooks:
-
-```bash
-cd $GIT_REPO
-ls .git/hooks
-head .git/hooks/pre-commit.sample
-```
-
-Add a hook to check the shell scripts in `$GIT_REPO` before making a commit:
-
-```bash
-echo '#!/bin/sh
-shellcheck *.sh' > .git/hooks/commit-msg
-chmod u+x .git/hooks/commit-msg
-```
-
-## Committing
-
-Your `git hooks` will not enter the repository, but you can commit them to a repository, then request others add these git hooks to their own branch, by putting a note in the project's `README.md`.
-
-```markdown
-The project comes with recommended git hooks.
-You can activate the hooks with `git config core.hooksPath hooks`.
-```

data/git/subtree.md

@@ -1,34 +0,0 @@
----
-title: "git subtree"
-tags: [ "data", "git", "subtree" ]
----
-
-## Pulling a Subtree from an existing git
-
-The project has subdirectories `sub-1`, `sub-2`, `sub-3`.
-The first should be its own repository, but should also retain its own history.
-
-First, we extract its history as an independent item, and make that into a seprate branch.
-
-```bash
-git subtree split --prefix=sub-1 -b sub
-```
-
-If you want something a few directories deep, you can use `--prefix=sub-1/dir-2/dir-3
-
-Then go and create a new git somewhere else:
-
-```bash
-cd ..;mkdir sub-1;cd sub-1;git init --bare
-```
-
-Then go back to your initial git repo, and do the following:
-
-git push ../subtest sub:master
-
-Finally, you can clone this repo from your original.
-
-```bash
-git clone ../subtest
-```
-

data/gpg.md

@@ -1,7 +1,119 @@
 ---
 title: "gpg"
-tags: [ "data", "gpg" ]
+tags: [ "Documentation", "data" ]
 ---
+# Making keys
+
+Generate keys:
+
+```bash
+gpg --gen-key
+```
+
+Follow the guide.
+
+# Encrypting a file
+
+```bash
+gpg -r malinfreeborn@posteo.net -e file
+```
+
+`-r` specifies the recipient.
+
+Check you have an encrypted version of your file.
+
+# Changing Expiration Dates
+
+gpg --list-keys
+
+... and then use the second part of 'pub', which is the ID.  But that's not appearing here so... on with gpg2?
+
+# Making encrypted files with a local password
+
+Make a password with a password (cypher encryption).
+
+```bash
+gpg -c --output passwords.txt
+```
+
+or 
+
+```bash
+gpg -c > passwords.txt
+```
+
+Put in a password.
+
+Write message then stop with Ctrl+d.
+
+Get the message back out the file with:
+
+```bash
+gpg -d passwords.txt
+```
+
+# Circles of Trust
+
+Search for a key at any key store:
+
+```bash
+gpg --search-keys nestorv
+```
+
+Once you've made a decision about someone:
+
+```bash
+gpg --list-keys
+```
+
+You get something like this:
+
+```
+pub   rsa3072 2021-08-15 [SC] [expires: 2023-08-15]
+      CD30421FD825696BD95F1FF644C62C57B790D3CF
+uid           [ultimate] Malin Freeborn <malinfreeborn@posteo.net>
+sub   rsa3072 2021-08-15 [E] [expires: 2023-08-15]
+
+```
+
+Notice the long, ugly, string - CD30421FD825696BD95F1FF644C62C57B790D3CF - and how horribly ugly it is.
+This is a fingerprint.
+
+You can now decide the trust level (this stays on your computer).
+
+```bash
+gpg --edit-key *CD30421FD825696BD95F1FF644C62C57B790D3CF*
+```
+
+Once you're in the interface, type `trust`.
+
+```bash
+gpg --sign-key alice@posteo.net
+```
+
+Then send those trusted keys up to a server, so people can see you have verified them:
+
+```bash
+gpg --send-keys *024C6B1C84449BD1CB4DF7A152295D2377F4D70F*
+```
+
+# Refresh Keys
+
+```bash
+gpg --refresh-keys
+```
+
+# Export
+
+Your public key:
+
+```bash
+gpg --output *me*.gpg --armor --export
+```
+
+or
+
+```bash
+gpg --export -a *person@email.tld* > *my_key*.pub
+```
 
-- [Setup](gpg/basics.md)
-- [Extras](gpg/extras.md)

data/gpg/basics.md

@@ -1,146 +0,0 @@
----
-title: "GPG Basics"
-tags: [ "data", "GPG" ]
----
-# Making keys
-
-Generate keys:
-
-```bash
-gpg --full-generate-key
-```
-
-Follow the guide.
-
-# Encrypting a file
-
-```bash
-gpg -r malinfreeborn@posteo.net -e file
-```
-
-`-r` specifies the recipient.
-
-Check you have an encrypted version of your file.
-
-# Changing Expiration Dates
-
-
-```bash
-gpg --list-keys
-# or...
-gpg -k
-```
-
-... and then use the second part of 'pub', which is the ID.  But that's not appearing here so... on with gpg2?
-
-# Making encrypted files with a local password
-
-Make a password with a password (cypher encryption).
-
-```bash
-gpg -c --output passwords.txt
-```
-
-or 
-
-```bash
-gpg -c > passwords.txt
-```
-
-Put in a password.
-
-Write message then stop with Ctrl+d.
-
-Get the message back out the file with:
-
-```bash
-gpg -d passwords.txt
-```
-
-# Circles of Trust
-
-Search for a key at any key store:
-
-```bash
-gpg --search-keys nestorv
-```
-
-Once you've made a decision about someone:
-
-```bash
-gpg --list-keys
-```
-
-You get something like this:
-
-```
-pub   rsa3072 2021-08-15 [SC] [expires: 2023-08-15]
-      CD30421FD825696BD95F1FF644C62C57B790D3CF
-uid           [ultimate] Malin Freeborn <malinfreeborn@posteo.net>
-sub   rsa3072 2021-08-15 [E] [expires: after-forever]
-
-```
-
-Notice the long, ugly, string - `CD30421FD825696BD95F1FF644C62C57B790D3CF` - and how horribly ugly it is.
-This is a fingerprint.
-
-You can now decide the trust level (this stays on your computer).
-
-```bash
-gpg --edit-key CD30421FD825696BD95F1FF644C62C57B790D3CF
-```
-
-Once you're in the interface, type `trust`.
-
-```bash
-gpg --sign-key alice@posteo.net
-```
-
-# Swapping Keys
-
-This system relies on a ring of people swapping key information.
-
-## Sending
-
-Send those trusted keys up to a server, so people can see you have verified them:
-
-```bash
-gpg --send-keys 024C6B1C84449BD1CB4DF7A152295D2377F4D70F
-```
-
-## Upload Your Keys
-
-## Add More Key Servers
-
-Key servers often swap keys, but it's best to just send to multiple places immediately.
-You can add key servers by adding this to `~/.gnupg/gpg.conf`.
-
-```
-keyserver hkps://keys.openpgp.org
-keyserver hkps://mail-api.proton.me
-keyserver hkps://keys.mailvelope.com
-```
-
-# Refresh Keys
-
-Refreshing keys will tell you if some key you have contains a signature from someone you already trust, or if someone has published a revocation certificate (meaning their key should not be trusted any more).
-
-```bash
-gpg --refresh-keys
-```
-
-You can use the [crontab](../../basics/cron.md) to refresh keys, but this will mostly fail, since keyservers often don't hold the right data.
-
-# Export
-
-Your public key:
-
-```bash
-gpg --output me.gpg --armor --export
-```
-Alternatively:
-
-```bash
-gpg --export -a person@email.tld > my_key.pub
-```
-

data/gpg/extras.md

@@ -1,11 +0,0 @@
----
-title: "gpg with vim"
-tags: [ "vim", "data", "GPG" ]
-requires: [ "GPG Basics", "vim basics" ]
----
-
-The `vim-gnupg` plugin lets vim edit gpg-encrypted files as if they were unencrypted.
-
-It's probably in your package manager.
-If not, you'll need to endure the faff of following the [instructions](http://www.vim.org/scripts/script.php?script_id=3645).
-

data/groff.md

@@ -1,6 +1,6 @@
 ---
 title: "groff"
-tags: [ "data", "logic" ]
+tags: [ "Documentation", "Data" ]
 ---
 # Basic Documents
 

data/interactive_string_substitution.md

@@ -1,19 +0,0 @@
----
-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/json.md

@@ -1,13 +0,0 @@
----
-title: "ijq"
-tags: [ "data", "json", "TUI" ]
----
-
-Analyse `json` easier with `ijq`.
-
-```sh
-column -J -ts: -H PW,GID,shell -N User,PW,UID,GID,Description,Home,shell /etc/passwd > host.json
-ijq !$
-```
-
-If you get stuck, try adding `.[]`.

data/khard.md

@@ -1,52 +1,60 @@
 ---
 title: "khard"
-tags: [ "data" ]
+tags: [ "Documentation", "Data" ]
 ---
 Get the basic config:
 
-```sh
+```bash
 mkdir ~/.config/khard
 ```
 
-```sh
+```bash
 cp /usr/share/doc/khard/examples/khard/khard.conf.example ~/.config/khard.conf
 ```
 
 Short list
 
-```sh
+```bash
 khard list
 ```
 
 Longer list
 
-```sh
+```bash
 khard show
 ```
 
 Show from addressbook 'work'
 
-```sh
+```bash
 khard list -a work
 ```
 
 Make a new contact in address book 'family'
 
-```sh
+```bash
 khard new -a family
 ```
 
-```sh
+```bash
 khard edit grampa
 ```
 
-```sh
+```bash
 khard remove bob
 ```
 
 Move contact 'nina' from 'work' to 'home' address book.
 
-```sh
+```bash
 khard move -a home nina -A work
 ```
 
+## Advanced
+
+Merge:
+
+```bash
+khard merge [-a source_abook] [-u uid|search terms [search terms ...]] [-A target_abook] [-U target_uid|-t target_search_terms]
+```
+

data/newsboat.md

@@ -1,6 +1,6 @@
 ---
 title: "newsboat"
-tags: [ "RSS" ]
+tags: [ "Documentation", "RSS" ]
 ---
 Create the configuration directory before you start, and add at least 1 URL.
 

data/pass.md

@@ -1,42 +1,42 @@
 ---
 title: "pass"
-tags: [ "data" ]
-requires: "GPG Basics"
+tags: [ "Documentation", "data" ]
 ---
+[Video instructions](https://www.hooktube.com/watch?v=hlRQTj1D9LA)
 
 Setup [gpg](./gpg.md) keys.
 
 Show your gpg secret it:
 
-```sh
+```bash
 gpg --list-secret-keys
 ```
 
 Then use the id number under `sec` to make a pass repo:
 
-```sh
+```bash
 KEY="$(gpg --list-secret-keys  | grep -m 1 -A1 '^sec' | tail -n 1)"
 ```
 
-```sh
+```bash
 pass init $KEY
 ```
 
 To add a basic password, e.g. for `$WEBSITE`:
 
-```sh
+```bash
 pass $WEBSITE
 ```
 
 To insert a multiline password, e.g. with a login name:
 
-```sh
+```bash
 pass add -m $WEBSITE
 ```
 
 Remove a password:
 
-```sh
+```bash
 pass rm $WEBSITE
 ```
 

data/pdf-to-txt.md

@@ -1,9 +1,8 @@
 ---
 title: "pdf to txt"
-tags: [ "data", "pdf", "ocr" ]
+tags: [ "Documentation", "data", "pdf", "ocr" ]
 ---
-
-How to translate pdfs to text (results are very poor, and will need lots of corrections).
+How to translate pdf book images to text (results are very poor, and will need lots of corrections).
 
 ## Dependencies
 
@@ -18,8 +17,8 @@ pdftoppm -png *file*.pdf test
 ```
 
 ```bash
-for x in *png; do
-    tesseract -l eng  "$x" - >> out.txt
+for x in \*png; do
+    tesseract -l eng  "$x" - >> *out*.txt
 done
 ```
 

data/pdf_erasure.md

@@ -1,28 +0,0 @@
----
-title: "PDF Metadata Erasure"
-tags: [ "metadata", "ghost script", "gs", ".pdf" ]
----
-
-You cannot erase pdf metadata with `exiftool` (it only *appends* your changes).
-To delete pdf metadata, you'll need `gs`.
-
-Make a text file called 'pdfmark.txt'.
-
-
-```text
-[ /Title ()
-/Author ()
-/Subject ()
-/Creator ()
-/ModDate ()
-/Producer ()
-/Keywords ()
-/CreationDate ()
-/DOCINFO pdfmark
-```
-
-Then run:
-
-```bash
-gs -o output.pdf -sDEVICE=pdfwrite "$FILE".pdf pdfmark.txt
-```

data/radicale.md

@@ -1,123 +0,0 @@
----
-title: "radicale and nginx"
-tags: [ "data", "calendar" ]
-requires: [ "nginx", "certbot" ]
----
-
-Check before you start:
-
-- you have a normally running site on nginx already.
-- your server has the directory `/etc/nginx/sites-enabled/` enabled in the nginx config.
-
-## Installation and Service
-
-Install `radicale` through your package manager (not `pip`).
-The standard `radicale` package should come with a nice `systemd` service file.
-
-If the service comes already-started, stop it immediately:
-
-```bash
-sudo systemctl stop radicale
-```
-
-## Set up Passwords
-
-Edit `/etc/radicale/config`, changing the `[auth]` section from this:
-
-```
-#type = none
-```
-
-...to this:
-```
-type = htpasswd
-```
-
-Make sure the service is off, as people may be able to sign in without a password at this point.
-
-Next, find the `htpasswd` program.
-You might get it in the `apache` package or similar.
-
-`htpasswd` allows you to generate passwords for users, and place them in `/etc/radicale/users`.
-
-```bash
-PASS="$(xkcdpass)"
-htpasswd -nb $USER "$PASS" | sudo tee -a /etc/radicale/users
-echo "Your username is $USER"
-echo "Your password is $PASS"
-```
-Right now, you can't sign into the server except through the localhost, which is pointless.
-So now we add a subdomain to `nginx`.
-
-```nginx
-
-echo '
- server {
-    if ($host = cal.DOMAIN) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-
-     listen 80;
-     server_name cal.DOMAIN;
-                                                                                        
-     location / {
-         proxy_pass http://localhost:5232;
-         proxy_set_header Host $host;
-         proxy_set_header X-Real-IP $remote_addr;
-         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     }
-                                                                                        
-     return 301 https://$server_name$request_uri;
- 
-
-}
-                                                                                        
- server {
-     listen 443 ssl;
-     server_name cal.DOMAIN;
-    ssl_certificate /etc/letsencrypt/live/cal.DOMAIN/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/cal.DOMAIN/privkey.pem; # managed by Certbot
-                                                                                        
-     location / {
-         proxy_pass http://localhost:5232;
-         proxy_set_header Host $host;
-         proxy_set_header X-Real-IP $remote_addr;
-         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     }
- 
-}
-' > /etc/nginx/sites-available/radicale
-sudo ln -s /etc/nginx/sites-available/radicale /etc/nginx/sites-enables/
-```
-
-Finally, replace the example `DOMAIN` with your actual domain name.
-
-```bash
-DOMAIN=whatever.com
-sudo sed -i "s/DOMAIN/$DOMAIN/g" /etc/nginx/sites-available/radicale 
-```
-
-(optional: replace that `cal.` prefix with anything else)
-
-Check nginx is happy:
-
-```bash
-sudo nginx -t
-```
-You will almost certainly need a new SSL certificate for the site:
-
-```bash
-sudo certbod -d cal.$DOMAIN
-```
-
-Start or restart both services:
-
-```bash
-sudo systemctl start radicale
-sudo systemctl restart nginx
-```
-
-You should now be able to log into your calendar, and add it to a phone.
-
-**NB:** you don't need the port number.

data/recfiles.md

@@ -1,54 +0,0 @@
----
-title: "Recfiles"
-tags: [ "data", "database" ]
----
-
-Create:
-
-```sh
-database=games.rec
-touch $database
-for g in Vojvodina Saboter Carcassonne Chess; do
-    recins -r "Name: $g" -r "Played: yes" $database
-done
-```
-
-Read:
-
-```sh
-recsel $database
-query=Carc
-recsel --quick=$query $database
-
-game=Vojvodina
-recsel --expression="Name = '${game}'" $database
-```
-
-Update:
-
-```sh
-recset --expression="Name = '${game}'" -f Played --set="no" $database
-new_field=Played
-value=no
-recset -f "$new_field" --delete $database
-recset -f "$new_field" --set-add="$value" $database
-recsel $database
-```
-
-Delete:
-
-```sh
-recdel --expression="Name = '${game}'" $database
-recset -f "$new_field" --delete $database
-```
-
-- [Extended example](recfiles/extended.md)
-- [Playing with board games data](recfiles/Board_Games.md)
-- [Playing with IP addresses](recfiles/IP_ASN.md)
-- [Manage LaTeX Bibliographies](recfiles/bibliography.md)
-- [Fixes](recfiles/recfixes.md)
-
-# Resources
-
-- [Recfiles for gemini capsules](gemini://tilde.town/~dozens/gemlog/21.gmi)
-

data/recfiles/bibliography.md

@@ -1,121 +0,0 @@
----
-title: "Recfile Bibliography for TeX"
-tags: [ "data", "database", "recfiles", "tex" ]
-requires: [ "Recfiles", "TeX", "Makefile" ]
----
-
-Store your bibliography in a `recfile` database, then extract any part with `make`.
-
-For example, you could store books like this in `bibliography.rec`:
-
-```recfile
-%rec: book
-%key: slug
-
-slug: thinkingexperience
-author: H. H. Price
-title: Thinking and Experience
-year: 1953
-publisher: Harvard University Press, Cambridge
-
-slug: inventingrightwrong
-author: John Leslie Mackie
-title: Inventing Right and Wrong
-year: 1997
-publisher: Penguin Books, England
-
-```
-
-Run `make book` to extract `book.bib`, ready for LaTeX to use:
-
-```bib
-@book{thinkingexperience,
-   author = {H. H. Price},
-   title = {Thinking and Experience},
-   year = {1953},
-   publisher = {Harvard University Press, Cambridge},
-}
-
-@book{inventingrightwrong,
-   author = {John Leslie Mackie},
-   title = {Inventing Right and Wrong},
-   year = {1997},
-   publisher = {Penguin Books, England},
-}
-```
-
-The `makefile` syntax is just a few lines (though admittedly employs some garbled shell-crud):
-
-```make
-bibs != grep -Po '%rec: \K.*' bibliography.rec
-bibfiles = $(patsubst %, %.bib, $(bibs))
-
-$(bibfiles): %.bib: bibliography.rec
-	recsel $< -t $(basename $@) |\
-		sed 's/slug: \(.*\)/@$(basename $@){\1,/g' |\
-		sed 's/^\(\b.*\b\): \(.*\)/   \1 = {\2},/gI' |\
-		sed 's/^$$/}\n/g' > $@
-		echo '}' >> $@
-```
-
-Here's a longer `bibliography.rec` file, which can also produce `article.bib`:
-
-```recfile
-%rec: book
-%key: slug
-%type: year int
-%constraint: year > -2000
-%sort: year month
-
-slug: thinkingexperience
-author: H. H. Price
-title: Thinking and Experience
-year: 1953
-publisher: Harvard University Press, Cambridge
-
-slug: inventingrightwrong
-author: John Leslie Mackie
-title: Inventing Right and Wrong
-year: 1997
-publisher: Penguin Books, England
-
-slug: metaphysicscontemporaryintro
-author: Michael J. Loux
-title: Metaphysics: A Contemporary Introduction
-year: 1998
-publisher: Routledge, London
-
-slug: pluralityworlds
-author: David Lewis
-title: On the Plurality of Worlds
-publisher: Blackwell Publishing, Oxford
-year: 2001
-
-%rec: article
-%key: slug
-%sort: year month
-
-slug: genuinerealisttheory
-author: John Divers
-title: A Genuine Realist Theory of Advanced Modalizing
-year: 1999
-pages: 217–240
-month: april
-journaltitle: Mind
-uri: https://academic.oup.com/mind/article-abstract/108/430/217/975258?redirectedFrom=fulltext
-volume: 108
-publisher: Harvard University Press, Cambridge
-
-slug: twokindsmentalrealism
-author: Tam\'{a}s Demeter
-title: Two Kinds of Mental Realism
-year: 2009
-pages: 40:59-71
-uri: https://www.researchgate.net/profile/Tamas_Demeter2/publication/41554923_Two_Kinds_of_Mental_Realism/links/0deec53247f5a4ae21000000.pdf
-month: august
-journaltitle: Journal for General Philosophy of Science
-volume: 30
-publisher: Harvard University Press, Cambridge
-
-```
-

data/recfiles/board_games.md

@@ -1,62 +0,0 @@
----
-title: "Board Games with Recfiles"
-tags: [ "data", "recfiles", "games" ]
-requires: "Recfiles"
----
-
-You can play with a board games database from boardgamegeek.com.
-
-## Download the Database
-
-```sh
-mkdir board_games
-cd board_games
-curl -Lo bg.zip 'https://www.kaggle.com/api/v1/datasets/download/threnjen/board-games-database-from-boardgamegeek'
-unzip bg.zip
-```
-
-The header line shows fields with a bunch of colons, which will confused `recutils`, so we'll have to get rid of them.
-
-```sh
-sed -i '1s/://g' *.csv 
-```
-
-Convert the games to `.rec` format.
-
-```sh
-csv2rec games.csv > games.rec
-```
-
-## Queries
-
-If you try to look at older games, you'll find lots of results.
-
-```sh
-recsel games.rec -e "YearPublished < 1800" -c
-recsel games.rec -e "YearPublished < 1800" -Cp Name
-```
-But most are wrong.
-The problem is games with a `YearPublished` date of `0`, probably because the year published is unknown.
-
-```sh
-recsel games.rec -e "Name = 'The Goblin King is Angry'" -p YearPublished
-```
-
-Fix the query by removing games published in '0 AD'.
-
-```sh
-recsel games.rec -e "YearPublished < 1800 && YearPublished != 0" -R YearPublished,Name
-```
-
-Or fix the database setting `YearPublished` to 'unknown':
-
-```sh
-recsel games.rec -e "YearPublished = 0" -Cp Name
-recset games.rec -e "YearPublished = 0" -f "YearPublished" -S 'unknown'
-```
-
-Strategic games which work best with 3 players, sorted by Average Rating:
-
-```sh
-recsel games.rec -e "BestPlayers = 3 && CatStrategy = 1" -CR Name --sort=AvgRating
-```

data/recfiles/extended.md

@@ -1,118 +0,0 @@
----
-title: "Recfiles Extended Example"
-tags: [ "data", "database", "recfiles" ]
----
-
-## Create
-
-Make a database for your boardgames, specifying only one field and value:
-
-```bash
-database=games.rec
-n=Name
-g=Vojvodina
-touch $database
-recins -f $n --value $g $database
-recsel $database
-```
-
-Insert a few more, with the estimated playtime:
-
-```bash
-recins -f Name -v Saboter -f Playtime -v 30 $database
-recins -f Name -v Chess -f Playtime -v 30 $database
-```
-
-View all games, or select one by number:
-
-```bash
-recsel $database
-recsel -n 0 $database
-```
-
-Each game should note whether or not you have played it yet, so you can add that field and set the default to `yes`.
-
-```bash
-f=played
-v=yes
-recset -f $f -a $v $database
-```
-
-...but the field is wrong, it should have a capital letter:
-
-```bash
-new_field=Played
-recset -f $f --rename $new_field
-```
-
-## Read
-
-Check how many records the database has:
-
-```bash
-recinf $database
-```
-
-Look at just the games you've never played:
-
-```bash
-recsel --expression="Played = 'no'" $database
-```
-
-Print how many, then just print the names:
-
-```bash
-recsel -e "Played = 'no'" --count $database
-recsel -e "Played = 'no'" --print=Name $database
-```
-
-## Update
-
-To change a game's `Played` field from `no` to `yes`, use `recset` to specify the number, and change that field.
-
-```bash
-num=0
-f=Played
-value=yes
-recsel --number=$num $database
-recset --number=$num -f $f --set=$value $database
-```
-
-Find all games with a playtime of `30`, and set the field `Max_Players` to `4`.
-
-```bash
-recset -e "Playtime = 40" -f Max_Players --set 50 games.rec
-```
-
-This doesn't work, because that field does not exist.
-You can `--set-add` the field, to add it wherever it does not exist.
-
-```bash
-recset -e "Playtime = 40" -f Max_Players --set-add 50 games.rec
-```
-
-## Delete
-
-Remove `Played` record from first game:
-
-```bash
-num=0
-recset --number=$num -f Played --delete $database
-```
-
-You can comment the line instead of deleting it:
-
-```bash
-num=1
-recset --number=$num -f Played --delete $database
-recsel $database
-cat $database
-```
-
-Delete an entire record:
-
-```bash
-num=2
-recdel --number=$num $database
-```
-

data/recfiles/ip_asn.md

@@ -1,16 +0,0 @@
----
-title: "IP Addresses with Recfiles"
-tags: [ "data", "recfiles", "games" ]
-requires: "Recfiles"
----
-
-## Download the Database
-
-Download the csv data, and separate the ipv4 data from the ipv6.
-
-```sh
-curl -Lo ips.zip 'https://www.kaggle.com/api/v1/datasets/download/ipinfo/ipinfo-country-asn'
-unzip -p ips.zip country_asn.csv | csv2rec | recsel -e "start_ip ~ '\.'"  > ipv4.rec
-unzip -p ips.zip country_asn.csv | csv2rec | recsel -e "start_ip ~ '::'"  > ipv6.rec
-```
-

data/recfiles/recfixes.md

@@ -1,33 +0,0 @@
----
-title: "Recfixes"
-tags: [ "data", "recfiles" ]
-requires: "Recfiles"
----
-
-Sometimes `recsel` chokes on a large query, and you need to break the query into chunks with a pipe.
-
-This Kickstarter file has 374,853 records.
-Here's the chonky query:
-
-```sh
-recsel kick.rec -e "Category = 'Games'" -p "Subcategory,Avg(Goal)" -G Subcategory
-```
-
-It breaks down like this:
-
-| Chunk                         | Meaning                                       |
-|:-----------------------------:|:---------------------------------------------:|
-| `recsel kick.rec`             | Select records from `kick.rec`                |
-| `-e "Category = 'Games'"`     | Select only records where Category = 'Games'  |
-| `-p "Subcategory,Avg(Goal)"`  | Print the Subcategory and average goal        |
-| `-G "Subcategory"`            | Group by subcategory                          |
-
-Two ways to break the query apart:
-
-```sh
-recsel kick.rec -e "Category = 'Games'" | recsel -p "Subcategory,Avg(Goal)" -G "Subcategory"
-
-recsel kick.rec -e "Category = 'Games'" > games.rec
-recsel games.rec -p "Subcategory" -G "Subcategory"
-```
-

data/sc-im.md

@@ -1,56 +1,19 @@
 ---
 title: "sc-im"
-tags: [ "TUI", "data", "spreadsheet", ".csv" ]
-requires: [ "vim basics" ]
+tags: [ "Documentation", "data" ]
 ---
+# Edit
 
-- [Sample file](sc-im/sample.sc)
-
-# Basic Commands
-
-## See Cells
-
-Cells are hard to see.
-Change this with `:set autowrap`.
-
-Make `sc-im` always autowrap:
-
-```bash
-mkdir .config/sc-im/bash
-echo 'set autowrap' >> .config/sc-im/scimrc
-```
-
-## Movement
-
-| Command                             | Key |
-|:------------------------------------|:---:|
-| highest part                        | H   |
-| lowest part                         | L   |
-| top                                 | gg  |
-| most right.                         | g$  |
-| most left.                          | g0  |
-| insert middle                       | \   |
-| insert left                         | \>  |
-| insert right                        | <   |
-| to to cell b4                       | gb4 |
-| see all text in cells               | aa  |
-| format cells so you can see it.     | f   |
-| format wider right                  | fl  |
-| format smaller left                 | fh  |
-| format wider down                   | fj  |
-| format smaller down                 | fk  |
-
-## Edit
-
-### Text
+## Text
 
 | Action                | Key |
 |:----------------------|:---:|
 | text (left align)     | <   |
 | text (right align)    | >   |
+| text (right align)    | `|` |
 | Edit existing  text   | E   |
 
-### Meta Actions
+## Meta Actions
 
 | Action                | Key |
 |:----------------------|:---:|
@@ -62,8 +25,28 @@ echo 'set autowrap' >> .config/sc-im/scimrc
 |  paste with format    | Pc  |
 |  delete a cell        | x   |
 
+# Movement
 
-### Functions
+| Action                          | Key |
+|:-------------------------------:|:---:|
+| highest part                    | H   |
+| lowest part                     | L   |
+| top                             | gg  |
+| move right                      | g$  |
+| move left                       |  g0 |
+| insert middle                   | \   |
+| insert left                     | \>  |
+| insert right                    | <   |
+| to to cell b4                   | b4  |
+| see all text in cells           | aa  |
+| format cells so you can see it. | f   |
+| format wider right              | fl  |
+| format smaller left             | fh  |
+| format wider down               | fj  |
+| format smaller down             | fk  |
+
+
+## Functions
 
 | Action                          | Key          |
 |:--------------------------------|:------------:|
@@ -73,7 +56,7 @@ echo 'set autowrap' >> .config/sc-im/scimrc
 |  minimumof those numbers        | =@min(B1:B8) |
 |  multiply C1 to C8              | =@prod(C1:C8)|
 
-### Visual
+## Visual
 
 | Action                          | Key          |
 |:--------------------------------|:------------:|

data/sc-im/convert_spreadsheets.md

@@ -1,13 +0,0 @@
----
-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/sc-im/sample.sc

@@ -1,38 +0,0 @@
-# This data file was generated by the Spreadsheet Calculator Improvised (sc-im)
-# You almost certainly shouldn't edit it.
-
-newsheet "Sheet1"
-movetosheet "Sheet1"
-offscr_sc_cols 0
-offscr_sc_rows 0
-nb_frozen_rows 1
-nb_frozen_cols 0
-nb_frozen_screenrows 2
-nb_frozen_screencols 0
-format A 14 1 0
-format B 18 2 0
-format 0 2
-freeze 0
-label A0 = "Food by Weight"
-leftstring B0 = "No. Meals"
-leftstring A1 = "Ajvar"
-let A1 = 5
-let B1 = A1*$A$10
-leftstring A2 = "Apples"
-let A2 = 3
-let B2 = A2*$A$10
-leftstring A3 = "Rocket"
-let A3 = 0.2
-let B3 = A3*$A$10
-leftstring A4 = "Beli Cheese"
-let A4 = 1
-let B4 = A4*$A$10
-leftstring A6 = "Total"
-let A6 = @sum(A1:A4)
-leftstring B6 = "Total"
-let B6 = @sum(B1:B4)
-leftstring A7 = "Average"
-let A7 = @avg(A1:A4)
-leftstring A10 = "Weight of Meal"
-let A10 = 0.3
-goto A0

data/search_system.md

@@ -1,49 +0,0 @@
----
-title: "Search System"
-tags: [ "data", "search", "locate", "plocate" ]
-requires: "cron"
----
-
-You can search every file on the computer instantly by installing `plocate`.
-
-Once installed, run `sudo updatedb` to create the database of (nearly) every file on the computer.
-
-Check how big the database is:
-
-```sh
-du -h /var/lib/plocate/plocate.db
-```
-
-Once you have the database, you can find nearly any file instantly.
-
-- Search for gifs: `locate .gif`
-- Search for gifs in the `/usr/` directory: `locate /usr/ .gif`
-- Search for jpg images with 'dog' or 'Dog' in the name: `locate -i dog jpg`
-- Search for videos: `plocate --regex '.mp4$|.mkv$|.wmv$|.webm$|.mov$|.avi$'`
-
-For best results, run `updatedb` regularly, perhaps in [crontab](../system/cron.md).
-
-## Search More Places
-
-`plocate` will not search `/tmp/`, because nobody cares about those files, and won't search inside `/mnt/`, because that's where USB sticks get mounted, so the files keep changing as USB sticks come and go.
-
-Change where `plocate` searches by editing the configuration file at `/etc/updatedb.conf`.
-
-By default, the `/mnt` directory is 'pruned' from the database.
-So if you want to search `/mnt` for videos, remove the word `/mnt` from the configuration file.
-
-
-```bash
-su root
-cat /etc/updatedb.conf
-sed -i 's#/mnt/##' /etc/updatedb.conf
-updatedb
-exit
-```
-
-Now you can search in `/mnt` for films:
-
-```sh
-plocate --regex '.mp4$|.mkv$|.wmv$|.webm$|.mov$|.avi$'
-```
-

data/search_video_audio.md

@@ -1,33 +0,0 @@
----
-title: "Search Video Audio"
-tags: [ "data", "video" ]
----
-
-Check subtitles available:
-
-```sh
-url='https://videos.domainepublic.net/videos/watch/d9567d5b-1add-477c-bce3-a58cef84c28c'
-yt-dlp --list-subs "$url" | grep --max-count=1 '^en'
-```
-
-The original language often displays with  `-orig`, e.g. `en-orig (Original)`.
-
-```
-Language Formats
-ar       vtt
-az       vtt
-bg       vtt
-ca       vtt
-cs       vtt
-da       vtt
-de       vtt
-el       vtt
-en       vtt
-```
-
-Search youtube.com for videos on a topic, and download subtitles:
-
-```sh
-url="$(ytfzf -I l "$search" )" && \
-yt-dlp --write-subs --sub-format 'ass/srt/best/vtt' --sub-langs "en.*" --skip-download "$url"
-```

data/sharing_secrets.md

@@ -1,23 +0,0 @@
----
-title: "Sharing Secrets"
-tags: [ "data", "death", "secrets", "ssss" ]
----
-
-You can share parts of a secret with multiple people, so only some of them need to agree to see the secret.
-
-Install `ssss`, then decide on the total number of secrets (`N`), and the threshold of people who must share their shard of the secret in order to reveal the secret.
-
-```bash
-N=5
-T=3
-FILE=secret.txt
-fortune | ssss-split -t $T -n $N > $FILE
-```
-Each shard is a line inside secret.txt.
-
-Check it's working:
-
-```bash
-head -n $T $FILE | ssss-combine -t $T
-tail -n $T $FILE | ssss-combine -t $T
-```

data/soft-serve/maintenance.md

@@ -1,24 +0,0 @@
----
-title: "Soft Serve Maintenance"
-tags: [ "data", "git server", "maintenance" ]
-requires: [ "git", "nginx" ]
----
-
-Over time git repositories become bloated with old data, but never get cleaned.
-I can't find an official way to clean up the crud, so I did this:
-
-```sh
-usermod -aG soft-serve $USER
-# Log out and back in for this to take effect.
-
-cd /var/lib/soft-serve/data/repos
-sudo chmod -R g+w *
-git config --global --add safe.directory '*'
-du -sh *.git
-for repo in *.git; do
-    git -C "$repo" gc
-done
-du -sh *.git
-$EDITOR ~/.gitconfig
-# You should remove having everything marked 'safe'.
-```

data/soft-serve/soft_https.md

@@ -1,71 +0,0 @@
----
-title: "Soft Serve through https"
-tags: [ "data", "git server", "lfs" ]
-requires: [ "git", "nginx" ]
----
-
-## `http` Setup
-
-In this example, the port used is `23231`, but it can be anything.
-Open `/var/lib/soft-serve/data/config.yaml` and make sure the `http` section looks like this:
-
-```
-# The HTTP server configuration.
-http:
-  # The address on which the HTTP server will listen.
-  listen_addr: ":23232"
-
-  # The path to the TLS private key.
-  tls_key_path: ""
-
-  # The path to the TLS certificate.
-  tls_cert_path: ""
-
-  # The public URL of the HTTP server.
-  # This is the address that will be used to clone repositories.
-  # Make sure to use https:// if you are using TLS.
-  public_url: "http://localhost:23232"
-
-```
-
-Restart the `soft-serve` service, then check it's working by cloning from localhost:
-
-```bash
-git clone http://localhost:23232/${some_repo}.git
-```
-
-### `https` Setup
-
-Put this file at `/etc/nginx/sites-enabled/$DOMAIN.tld`, then set up standard certificates with [nginx](../networking/website/nginx.md).
-
-(replace `${DOMAIN_NAME}` with your domain's name).
-
-```
- server {
-     listen 80;
-     server_name ${DOMAIN_NAME};
-                                                                                        
-     location / {
-         proxy_pass http://localhost:23232;
-         proxy_set_header Host $host;
-         proxy_set_header X-Real-IP $remote_addr;
-         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     }
-                                                                                        
-     return 301 https://$server_name$request_uri;
-}
-                                                                                        
- server {
-     listen 443 ssl;
-     server_name ${DOMAIN_NAME};
-
-     location / {
-         proxy_pass http://localhost:23232;
-         proxy_set_header Host $host;
-         proxy_set_header X-Real-IP $remote_addr;
-         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     }
-}
-
-```
-

data/soft.md

@@ -1,8 +0,0 @@
----
-title: "Soft-Serve"
-tags: [ "data", "git server", "lfs", "TUI" ]
-requires: [ "git", "nginx" ]
----
-
-- [Soft-Serve with https](soft-serve/soft_https.md)
-- [Maintenance](soft-serve/maintenance.md)

data/sqlite.md

@@ -1,21 +0,0 @@
----
-title: "sqlite"
-tags: [ "data" ]
----
-
-Work with a database:
-
-```bash
-sqlite3 "$FILE".sqlite3
-```
-Compress the database:
-
-```sqlite
-pragma vacuum;
-```
-Optimize the database:
-
-```sqlite
-pragma optimize;
-```
-

data/task/contexts.md

@@ -1,34 +0,0 @@
----
-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/taskwarrior_configuration.md

@@ -1,20 +0,0 @@
----
-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/taskwarrior/task.md

@@ -1,35 +1,23 @@
 ---
-title: "Taskwarrior"
-tags: [ "data", "organization" ]
+title: "task"
+tags: [ "Documentation", "Organization" ]
 ---
 
 Set up the configuration file:
 
-```sh
+```bash
 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:
 
-```sh
+```bash
 task add update linux
 ```
 
 See which task is next:
 
-```sh
+```bash
 task next
 ```
 
@@ -37,13 +25,13 @@ Note the id number.
 
 Mark a task as started:
 
-```sh
+```bash
 task start 1
 ```
 
 Once finished:
 
-```sh
+```bash
 task 1 done
 ```
 
@@ -51,21 +39,23 @@ task 1 done
 
 Add a project:
 
-```sh
+```bash
 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
-
-for t in "buy red paint" "buy black paint" "buy brushes" ; do
-  task add pro:house.paint $t
-done
+task add pro:house.paint buy red paint
+task add pro:house.paint buy black paint
+task add pro:house.paint buy brushes
 ```
 
 ## Summary
 
-```sh
+```bash
 task pro:house sum
+```
+
+```bash
 task burndown.daily pro:house
 ```
 
@@ -73,33 +63,69 @@ The summaries will show how fast a project is being completed, and when you can
 
 # Tags
 
-
-```sh
+```bash
 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:
 
-```sh
+```bash
 task end.after:today-1wk completed
 ```
 
 # User Defined Attributes
 
-Define a new attribute for tasks called 'size'.
-The 'user defined attribute' (UDA) needs a `type` and `label`.
+Make a UDA 'size'.
 
-```sh
+```bash
 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.
 
-```sh
+```bash
 task config uda.size.values large,medium,small
+```
+
+```bash
 uda.size.default=medium
 ```
 
@@ -107,7 +133,7 @@ uda.size.default=medium
 
 This command shows tasks I'm most interested in:
 
-```sh
+```bash
 task next +ACTIVE or +OVERDUE or due:today or scheduled:today or pri:H
 ```
 

data/taskwarrior/timew.md

@@ -1,18 +1,18 @@
 ---
-title: "timewarrior"
-tags: [ "data", "tracking", "time", "timew" ]
+title: "timew"
+tags: [ "Documentation", "Data" ]
 ---
 # Summaries
 
 Try:
 
-```sh
+```bash
 timew summary :yesterday
 ```
 
 You can also use :week, :lastweek, :month, :quarter, :year, or a range such as:
 
-```sh
+```bash
 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
 
-```sh
+```bash
 timew start
 timew stop
 timew continue
@@ -32,7 +32,7 @@ timew tags
 
 And add ids with:
 
-```sh
+```bash
 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.
 
-```sh
+```bash
 timew summary :ids
 ```
 
 Then if we're looking at task @2:
 
-```sh
+```bash
 timew move @2 12:00
 timew lengthen @2 3mins
 ```
 
-```sh
+```bash
 time shorten @2 40mins
 ```
 
 # Forgetting
 
-```sh
+```bash
 timew start 1h ago @4
 ```
 
 Or if your action actually had a break:
 
-```sh
+```bash
 timew split @8
 ```
 
 Or maybe not?
 
-```sh
+```bash
 timew join @4 @8
 timew @8 delete
 ```
 
 Start at previous time
 
-```sh
+```bash
 timew start 3pm 'Read chapter 12'
 timew start 90mins ago 'Read chapter 12'
 ```
 
 Cancel currently tracked time.
 
-```sh
+```bash
 timew cancel
 ```
 
@@ -157,11 +157,11 @@ with:
 
 # Fixing Errors
 
-```sh
+```bash
 curl -O https://taskwarrior.org/download/timew-dbcorrection.py
 ```
 
-```sh
+```bash
 python timew-dbcorrections.py
 ```
 

data/view_torrents.md

@@ -1,11 +0,0 @@
----
-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.

data/w3m.md

@@ -1,6 +1,6 @@
 ---
 title: "w3m"
-tags: [ "browsers" ]
+tags: [ "Documentation", "browsers" ]
 ---
 Open a search tab:
 
@@ -19,3 +19,4 @@ w3m ddg.gg
 | T        | new tab              |
 | { / }    | switch tabs          |
 
+![w3m browser](/tapes/w3m.gif)

data/w3m.tape

@@ -0,0 +1,42 @@
+Sleep 1s
+Type "w3m ddg.gg"
+Sleep 500ms
+Enter
+Sleep 1.5s
+Tab
+Enter
+Type "cats"
+Enter
+Sleep 2s
+Tab
+Enter
+Sleep 2s
+Type "jjjjjjjjjjjj"
+Tab
+Enter
+Sleep 2s
+Type "U"
+Sleep 500ms
+Ctrl+U
+Sleep 500ms
+Type "dmz.rs"
+Sleep 500ms
+Enter
+Sleep 4.5s
+Type "jjjjjjjj"
+Tab
+Type "j"
+Sleep 500ms
+Enter
+Sleep 1s
+Type " "
+Sleep 2s
+Backspace
+Sleep 500ms
+Type " "
+Sleep 1.5s
+Type " "
+Sleep 2s
+Type "qy"
+Sleep 500ms
+Ctrl+D

distros/android/ssh_to_phone.md

@@ -1,28 +0,0 @@
----
-title: "ssh to phone"
-tags: [ "networking", "ssh", "android" ]
----
-
-1. Install fdroid on phone.
-2. Install termux.
-3. Open fdroid, and run:
-
-
-```sh
-pkg upgrade
-pkg install busybox termux-services openssh openssh-sftp-server
-source $PREFIX/etc/profile.d/start-services.sh
-```
-
-`openssh-sftp-server` will mount the phone's file-system, and show you some directories in `~/storage/`.
-
-4. Copy your PC's ssh public key to the phone's downloads or somewhere, so you can see it in `~/storage/downloads`.
-5. On the phone:
-    * `yes | ssh-keygen`
-    * `cat $pubkey.pub >> ~/.ssh/authorized_hosts`.
-    * Check its ip address with `ifconfig | grep broadcast`
-    * Check the phone's username with with `whoami`
-    * `sshd -D`
-6. On the PC:
-    * `ssh -p 8022 -l $phone_username $phone_ip`
-

distros/arch/arch_pi_install.md

@@ -1,6 +1,6 @@
 ---
 title: "Arch on a Raspberry Pi 4"
-tags: [ "distros", "raspberry pi", "rpi" ]
+tags: [ "Documentation", "distros", "raspberry pi", "rpi" ]
 ---
 
 The [Official Instructions](https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-4) for a Raspberry pi 4 do not allow for working sound from the headphone jack, unless you use the aarch64 Installation.

distros/arch/autologin.md

@@ -1,6 +1,6 @@
 ---
 title: "autologin"
-tags: [ "distros", "arch" ]
+tags: [ "Documentation", "Distros", "Arch" ]
 ---
 
 # Automatic Login

distros/arch/basic-install.md

@@ -1,7 +1,6 @@
 ---
 title: "basic-install"
-tags: [ "arch" ]
-requires: [ "partitions", "time" ]
+tags: [ "Documentation", "arch" ]
 ---
 Keyboard layout changed.
 

distros/arch/fonts.md

@@ -1,25 +1,24 @@
 ---
 title: "fonts"
-tags: [ "distros" ]
+tags: [ "Documentation", "distros" ]
 ---
 # Basics
 
 Update font-cache:
 
-```sh
-su root
+```bash
 fc-cache
 ```
 
 List fonts:
 
-```sh
+```bash
 fc-list
 ```
 
 Grab the part of the font name you need for Xresources:
 
-```sh
+```bash
 fc-list | cut -d: -f2
 ```
 

distros/arch/gpu.md

@@ -1,6 +1,6 @@
 ---
-title: "Ach Linux GPU Setup"
-tags: [ "arch", "GPU" ]
+title: "fonts"
+tags: [ "Documentation", "distros" ]
 ---
 # Step 1: Multilib
 
@@ -60,3 +60,4 @@ You should see 'true' here.
 ```bash
 sudo pacman -S --needed lib32-mesa vulkan-radeon lib32-vulkan-radeon vulkan-icd-loader lib32-vulkan-icd-loader xf86-video-amdgpu
 ```
+

distros/arch/maintenance.md

@@ -1,53 +0,0 @@
----
-title: "Maintenance"
-tags: [ "arch" ]
----
-
-# Package Cache
-
-Clean the cache of old packages in `/var/cachepacman/pkg/`:
-
-```bash
-ls /var/cache/pacman/pkg/ | wc -l
-sudo pacman -Sc
-ls /var/cache/pacman/pkg/ | wc -l
-```
-And the same for `yay` (with `-Yc` to remove old dependencies):
-
-```bash
-ls ~/.cache/yay/ | wc -l
-yay -Sc
-yay -Yc
-ls ~/.cache/yay/ | wc -l
-```
-
-# New Configs
-
-If you chance a configuration file, such as `/etc/environment`, and `pacman` wants to update the file, it will place `/etc/environment.pacnew`.
-
-Check the new files, then look at the difference between the `pacman` version, and your version.
-
-```bash
-sudo find /etc/ /var/ /usr/ -name "*.pacnew" 
-diff /etc/pacman.d/mirrorlist*
-```
-
-Either,
-
-- Update the files manually,
-
-```bash
-sudo -e /etc/pacman.d/mirrorlist
-sudo rm /etc/pacman.d/mirrorlist.pacnew
-```
-
-Or,
-
-- use a tool like `pacdiff` to view the changes next to each other, and select them with `vim`.
-
-
-```bash
-sudo pacman -S pacman-contrib
-sudo pacdiff
-```
-

distros/arch/pacman.md

@@ -1,6 +1,6 @@
 ---
 title: "pacman"
-tags: [ "distros" ]
+tags: [ "Documentation", "distros" ]
 ---
 
 Packages are kept in /var/cache/pacman/pkg.

distros/arch/scripts/archpi.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# https://www.unixmen.com/install-arch-linux-raspberry-pi/
+
+pacman-key --init || echo init fail >> log
+pacman-key --populate archlinuxarm || echo update fail >> log
+pacman -Syyuu || echo update fail  >> log
+
+sed -i s/#en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/ /etc/locale.gen
+
+echo 'LANG=en_GB.UTF-8' >> /etc/locale.conf
+
+locale-gen
+
+pacman -S base-devel htop ranger tmux lolcat fortune-mod git figlet rxvt-unicode task timew calcurse fail2ban
+# texlive-most 
+if [[ $2 == all || $1 == all ]]; then
+	pacman -S nnn feh dmenu rofi xf86-video-fbdev xorg xorg-xinit xorg-server xorg-server-utils xterm
+fi
+
+# Audio
+echo 'dtparam=audio=on' >> /boot/config.txt
+
+if [[ $1 == audio ]]; then
+	pacman -S alsa-utils alsa-firmware alsa-lib alsa-plugins 
+fi
+
+echo 'device_tree_param=spi=on' >> /boot/config.txt
+
+# for a vnc viewer
+if [[ $1 == vnc ]]; then
+	tigervnc gcc geany i3 i3status compton feh sxiv rxvt-unicode 
+fi
+
+# Swap
+
+cd /var/cache/swap
+
+dd if=/dev/zero of=swapfile bs=1K count=2M
+
+chmod 600 swapfile
+
+mkswap swapfile
+
+swapon swapfile
+
+echo "/var/cache/swap/swapfile none swap sw 0 0" > /etc/fstab
+
+# fail2ban
+
+[ -e sshd.local ] && \
+pacman -S fail2ban && \
+mv sshd.local /etc/fail2ban/jail.d && \
+systemctl start fail2ban
+
+# If it won't reboot, install `arch-install-scripts` then try again and firstly:
+# genfstab / > /etc/fstab

distros/arch/scripts/gitea_install.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+pacman -S gitea postgresql
+sudo su postgres -c 'initdb -D /var/lib/postgres/data'
+sudo systemctl start postgresql
+sudo su postgres -c 'createuser -P gitea'
+sudo su postgres -c 'createdb -O gitea gitea'
+sudo sed -i 's/mysql/postgres/' /etc/gitea/app.ini
+sudo sed -i 's/root/gitea/' /etc/gitea/app.ini
+sudo systemctl start gitea

distros/arch/scripts/pihole.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+set -e
+
+yay -S pi-hole-ftl pi-hole-server
+
+# Configuration in /etc/pihole/pihole-FTL.db
+# You can change DBINTERVAL to 60 or more to limit writes to disk
+
+sudo systemctl disable --now systemd-resolved
+sudo systemctl enable --now pihole-FTL
+pihole -g
+pihole -c
+
+if [ "$1" == "unbound" ]; then
+
+sudo pacman -S unbound
+
+sudo cp /etc/unbound/unbound.conf /etc/unbound/unbound.conf.old
+
+echo "server:
+    # If no logfile is specified, syslog is used
+    # logfile: "/var/log/unbound/unbound.log"
+    verbosity: 0
+
+    interface: 127.0.0.1
+    port: 5335
+    do-ip4: yes
+    do-udp: yes
+    do-tcp: yes
+
+    # May be set to yes if you have IPv6 connectivity
+    do-ip6: no
+
+    # You want to leave this to no unless you have *native* IPv6. With 6to4 and
+    # Terredo tunnels your web browser should favor IPv4 for the same reasons
+    prefer-ip6: no
+
+    # Use this only when you downloaded the list of primary root servers!
+    # If you use the default dns-root-data package, unbound will find it automatically
+    #root-hints: "/var/lib/unbound/root.hints"
+
+    # Trust glue only if it is within the server's authority
+    harden-glue: yes
+
+    # Require DNSSEC data for trust-anchored zones, if such data is absent, the zone becomes BOGUS
+    harden-dnssec-stripped: yes
+
+    # Don't use Capitalization randomization as it known to cause DNSSEC issues sometimes
+    # see https://discourse.pi-hole.net/t/unbound-stubby-or-dnscrypt-proxy/9378 for further details
+    use-caps-for-id: no
+
+    # Reduce EDNS reassembly buffer size.
+    # Suggested by the unbound man page to reduce fragmentation reassembly problems
+    edns-buffer-size: 1472
+
+    # Perform prefetching of close to expired message cache entries
+    # This only applies to domains that have been frequently queried
+    prefetch: yes
+
+    # One thread should be sufficient, can be increased on beefy machines. In reality for most users running on small networks or on a single machine, it should be unnecessary to seek performance enhancement by increasing num-threads above 1.
+    num-threads: 1
+
+    # Ensure kernel buffer is large enough to not lose messages in traffic spikes
+    so-rcvbuf: 1m
+
+    # Ensure privacy of local IP ranges
+    private-address: 192.168.0.0/16
+    private-address: 169.254.0.0/16
+    private-address: 172.16.0.0/12
+    private-address: 10.0.0.0/8
+    private-address: fd00::/8
+    private-address: fe80::/10
+" | sudo   tee /etc/unbound.conf
+
+	echo "Make this the  only pihole DNS: PIHOLE_DNS_1=127.0.0.1 in /etc/pihole/setupVars.conf"
+
+fi
+

distros/arch/scripts/steam.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+flatpak --user install flathub com.valvesoftware.Steam
+
+flatpak run com.valvesoftware.Steam
+

distros/arch/scripts/yay.sh

@@ -0,0 +1,10 @@
+git clone https://aur.archlinux.org/yay.git
+
+cd yay
+
+makepkg -si
+
+yay -S perl-graph-easy signal-desktop sc-im ncpamixer xdg-utils-mimeo torrench
+
+yay -S ttf-tengwar-annatar
+

distros/debian/apt.md

@@ -1,6 +1,6 @@
 ---
 title: "apt"
-tags: [ "distros" ]
+tags: [ "Documentation", "distros" ]
 ---
 ## apt
 
@@ -8,27 +8,27 @@ tags: [ "distros" ]
 
 Messed up a package's configuration files?
 
-```sh
+```bash
 sudo apt-get purge [thing]
 ```
 
-```sh
+```bash
 sudo apt autoremove 
 ```
 
 Check if you still have related things:
 
-```sh
+```bash
 apt search [thing]
 ```
 
-```sh
+```bash
 sudo apt-get install [ thing ]
 ```
 
 Still have problems?
 
-```sh
+```bash
 sudo dpgk --force-confmiss -i /var/cache/apt/archives/[thing]
 ```
 

distros/void/aeroplanes.md

@@ -1,24 +1,18 @@
 ---
 title: "Aeroplane Mode in Void"
-tags: [ "void" ]
+tags: [ "Documentation", "Void" ]
 ---
 Put your device in 'aeroplane' mode (e.g. where no trace of signal leaves it) by turning off Wi-Fi and blue-tooth.
 
-```sh
-su root
-sv stop wpa_supplicant bluetoothd
-```
+> sudo sv stop wpa_supplicant bluetoothd
 
-Find your device's name with `ip -color addr`.
+Find your device's name with `ip a`.
 If unsure, try this:
 
-```sh
-name=$(ip a | grep -Eo 'wlp\w{3}')
-echo $name
-```
+> name=$(ip a | grep -Eo 'wlp\w{3}')
+
+> echo $name
 
 Then set that device down:
 
-```sh
-ip link set $name down
-```
+> sudo ip link set $name down

distros/void/autologin.md

@@ -1,6 +1,6 @@
 ---
 title: "Void Autologin"
-tags: [ "void" ]
+tags: [ "Documentation", "Void" ]
 ---
 
 Make the autologin service:

distros/void/brand_name_wallpaper.md

@@ -1,33 +0,0 @@
----
-title: "Brand Name Wallpaper"
-tags: [ "void" ]
----
-
-To automatically stick the logo onto your background, do these commands in the directory.
-
-Get the void linux logo from wikipedia
-
-```bash
-wget https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Void_Linux_logo.svg/256px-Void_Linux_logo.svg.png?20170131170632
-```
-
-Rename it, and resize it (the standard size is too small for most wallpapers)
-
-```bash
-convert -resize 200% '256px-Void_Linux_logo.svg.png?20170131170632' void-logo.png
-```
-Download a pretty wallpaper
-
-```bash
-wget http://wallpapercave.com/wp/Wlm9Gv0.jpg
-```
-
-Put the void logo on all *jpg and *png images
-
-```bash
-for x in *.jpg
-	do
-	composite -compose multiply -gravity Center void-logo.png "$x" "$x"
-done
-```
-

distros/void/extrace.md

@@ -1,22 +1,22 @@
 ---
 title: "extrace"
-tags: [ "void" ]
+tags: [ "Documentation", "Void" ]
 ---
 Monitor all processes:
 
-```sh
+```bash
 extrace
 ```
 
 Monitor one process:
 
-```sh
+```bash
 extrace ls
 ```
 
 Monitor a script:
 
-```sh
+```bash
 ./script.sh | extrace
 ```
 

distros/void/jenkins.md

@@ -9,17 +9,16 @@ Jenkins is janky.
 ## Start
 Start the service file.
 
-```sh
-su root
-ln -s /etc/sv/jenkins /var/service
-sv start jenkins
+```bash
+sudo ln -s /etc/sv/jenkins /var/service
+sudo sv start jenkins
 ```
 
 Then visit the web interface with `$BROWSER localhost:8080`.
 
 If it's not working, try running the command from the run file the first time:
 
-```sh
+```bash
 chpst -u jenkins java -jar /opt/jenkins/jenkins.war
 ```
 

distros/void/locale.md

@@ -1,55 +0,0 @@
----
-title: "Void locale"
-tags: [ "void", "locale" ]
----
-
-Check the current locales:
-
-
-```sh
-locale -a
-```
-
-Add the languages you want by editing `/etc/default/libc-locales`, and uncommenting your choice:
-
-```sh
-#en_DK.UTF-8 UTF-8  
-#en_DK ISO-8859-1  
-en_GB.UTF-8 UTF-8  
-en_GB ISO-8859-1  
-#en_HK.UTF-8 UTF-8  
-#en_HK ISO-8859-1  
-```
-
-Now you can generate what you need for those languages.
-However, instead of generating what you need, you're going to generate everything which needs updating:
-
-
-```sh
-su root
-xbps-reconfigure glibc-locales
-```
-
-Finally, select your chosen locale by placing it in `/etc/locale.conf`.
-
-```sh
-echo "LC_ALL=en_GB.UTF-8
-LANG=en_GB.UTF-8
-LANGUAGE=en_GB.UTF-8" > /etc/locale.conf
-
-
-#en_DK.UTF-8 UTF-8  
-#en_DK ISO-8859-1  
-en_GB.UTF-8 UTF-8  
-en_GB ISO-8859-1  
-#en_HK.UTF-8 UTF-8  
-#en_HK ISO-8859-1  
-```
-
-Check your new locales are available:
-
-
-```sh
-locale -a
-```
-

distros/void/sv.md

@@ -1,6 +1,6 @@
 ---
 title: "sv"
-tags: [ "void" ]
+tags: [ "Documentation", "Void" ]
 ---
 # List Services
 

distros/void/void_basics.md

@@ -1,6 +1,6 @@
 ---
 title: "Void Linux Basics"
-tags: [ "void" ]
+tags: [ "Documentation", "Void" ]
 ---
 # Updates
 
@@ -57,5 +57,5 @@ brightnessctl s 10%+
 
 - [autologin](autologin.md)
 - [services](sv.md)
-- [wifi](../../networking/wpa_supplicant.md)
+- [wifi](wpa_cli.md)