Makefile

@@ -19,14 +19,14 @@ default += $(databases)
 
 $(databases): .dbs/%.rec: %/ | .dbs/
 	$(info making $(@F))
-	@mkdir -p $(@D)
+	mkdir -p $(@D)
 	for entry in $(shell find $< -type f -name "*.md") ; do \
 		sed -n '2,/^---$$/ {/^---$$/d; p}' "$$entry" |\
 		sed -e 's/\[ //'  -e 's/ \]//' |\
 		tr -d '"' ;\
 		printf "wordcount: %s\n" "$$(wc -w < $$entry)" ;\
 		printf "file: %s\n\n" "$$entry" ;\
-	done > $@
+	done >> $@
 	for entry in $(shell find $< -type f -name "*.md"); do \
 		recset $@ -e "file = '$${entry}'" -f wordcount --set-add="$$(wc -w < $${entry})" ;\
 	done

data/base_16.md

@@ -1,6 +1,6 @@
 ---
 title: "Base 16"
-tags: [ "data" ]
+tags: [ "Data" ]
 ---
 
 ```bash

data/calcurse.md

@@ -5,10 +5,5 @@ 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
-```
+The UK government keeps an ics file with clock, [here](https://www.gov.uk/when-do-the-clocks-change/united-kingdom.ics).
 

data/email.md

@@ -9,10 +9,10 @@ Install `opensmtpd` (or similar), then `ncat` or `nc` or `netcat` (this mysterio
 
 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
@@ -40,7 +40,7 @@ Tell the mail daemon who you are in this format.
 
 Then tell it who you're sending to.
 
-```sh
+```
 RCPT TO: <www@dmz.rs>
 ```
 
@@ -67,7 +67,7 @@ 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
+ ```bash
 sudo grep -r $FRAGMENT /var/spool/*
  ```
 

data/exiftool.md

@@ -1,17 +1,17 @@
 ---
 title: "exiftool"
-tags: [ "metadata", "exifdata" ]
+tags: [ "Metadata" ]
 ---
 
-Find metadata:
+Find metadata.
 
-```sh
-exiftool "$file".jpg
+```bash
+exiftool image.jpg
 ```
 
-Find info on all `.png` images in current directory.
+Find info on all images in current directory.
 
-```sh
+```bash
 exiftool -ext .png .
 ```
 
@@ -19,14 +19,22 @@ You can make this recurring with the -r switch.
 
 And overwrite all metadata:
 
-```sh
+```bash
 exiftool -all= -overwrite_original -ext jpg .
 ```
 (NB: This does not work on pdf data. See [here](pdf_erasure.md) for erasing all pdf data)
 
 Or just GPS data:
 
-```sh
+```bash
 exiftool -gps:all= *.jpg
 ```
 
+You can also use the imagemagick tool:
+
+```bash
+identify -verbose
+```
+
+
+

data/git/git-lfs.md

@@ -1,72 +1,24 @@
 ---
 title: "git-lfs"
-tags: [ "data", "git" ]
+tags: [ "data" ]
 ---
 
-Git Large File Storage ('LFS') needs to change your `~/.gitconfig` to check out those binary files:
+Install, and add with
 
-```sh
-cat ~/.gitconfig
+```bash
 git lfs install
-cat ~/.gitconfig
 ```
 
-Then track some filetypes with:
+Then track some filetype with:
 
-```sh
-cd $git_repository
-ext=ttf
-git lfs track "*.$ext"
+```bash
+git lfs track "\*.ttf"
 ```
 
 Or a directory with:
 
-```sh
+```bash
 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
-```
-
+All changes require adding `.gitattributes`.

data/gpg.md

@@ -1,6 +1,6 @@
 ---
 title: "gpg"
-tags: [ "data", "gpg" ]
+tags: [ "data", "GPG" ]
 ---
 
 - [Setup](gpg/basics.md)

data/groff.md

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

data/khard.md

@@ -4,49 +4,57 @@ tags: [ "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/pass.md

@@ -1,42 +1,42 @@
 ---
 title: "pass"
 tags: [ "data" ]
-requires: "GPG Basics"
 ---
+[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

@@ -2,8 +2,7 @@
 title: "pdf to txt"
 tags: [ "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
 

hardware/keyboard.md

@@ -9,7 +9,7 @@ This works everywhere, including in a bare-ass tty.
 
 Select a keymap, and create a new custom map.
 
-```sh
+```bash
 su root
 
 basemap=/usr/share/kbd/keymaps/i386/qwerty/pl1.map.gz
@@ -22,7 +22,7 @@ gunzip -c $basemap | \
 
 Tell the system to use this keymap at startup by naming it in the `rc.conf` file:
 
-```sh
+```bash
 echo "KEYMAP=$newmap" >> /etc/rc.conf
 
 cat /etc/rc.conf
@@ -33,24 +33,24 @@ reboot
 
 Set layout to British English.
 
-```sh
+```bash
 setxkbmap -layout gb
 ```
 
 Or Polish with:
 
-```sh
+```bash
 setxkbmap -layout pl
 ```
 
 | Language | short |
-|:---------|:------|
-| Polish   | `pl`  |
-| Serbian  | `rs`  |
+|:--------|:------|
+| Polish  | pl |
+| Serbian | rs |
 
 Set 'alt + shift', as the command which cycles through the British English, Polish and Serbian keyboard layout.
 
-```sh
+```bash
 setxkbmap -layout gb,pl,rs -option grp:alt_shift_toggle
 ```
 

networking/wifi.md

@@ -1,8 +1,7 @@
 ---
-title: "network"
+title: "wifi"
 tags: [ "Networking" ]
 ---
-
 # Netstat Stuff
 
 Stats on local net usage within domain.

networking/wireguard.md

@@ -1,6 +1,6 @@
 ---
 title: "wireguard"
-tags: [ "networking", "VPN" ]
+tags: [ "Networking", "VPN" ]
 ---
 <!--
 from 
@@ -11,22 +11,25 @@ https://engineerworkshop.com/blog/how-to-set-up-wireguard-on-a-raspberry-pi/
 
 Install `wireguard-tools` on the server.
 
-```sh
-su root
+```bash
+sudo -i
+```
+
+```bash
 cd /etc/wireguard
 ```
 
 umask 077
 
-```sh
+```bash
 wg genkey | tee server_private_key | wg pubkey > server_public_key
 ```
 
-```sh
+```bash
 wg genkey | tee client_private_key | wg pubkey > client_public_key
 ```
 
-```sh
+```bash
     echo "
     [Interface]
     Address = 10.0.0.1/24
@@ -95,6 +98,6 @@ Add multiple peers by copying the `[peer]` section (they each get called `peer`)
 
 Make a standard client configuration, then:
 
-```sh
+```bash
 qrencode -t ansiutf8 < /etc/wireguard/mobile_user.conf
 ```

networking/wireless.md

@@ -1,63 +1,60 @@
 ---
 title: "wireless"
-tags: [ "networking" ]
+tags: [ "Networking" ]
 ---
 
-Check wifi's working
-
-```sh
+# Check wifi's working
+```bash
 lspci -k
 ```
 
 Or for usb wifi: 
 
-```sh
+```bash
 dmesg | grep usbcore
 ```
 
-...and hopefully it'll say the new interface is registered.
+... and hopefully it'll say the new interface is registered.
 
-Check if a wifi interface has been created
+# Check if a wifi interface has been created
 
-```sh
+```bash
 ip link
 ```
 
-...or
+or
 
-```sh
+```bash
 iw dev
 ```
 
 Assuming it's wlan0, bring it up with 
 
-```sh
+```bash
 ip link set wlan0 up
 ```
 
 Error messages probably means your wireless chipset requires a firmware to function.  In this case, check the kernel messages for firmware being loaded
 
-```sh
+```bash
 dmesg | grep firmware
 ```
 
 # Utilities
 
-- `iw` doesn't do wpa/wpa2.
-- `iwd` does everything except WEXT encryption.
-- `wpa_supplicant` does everything.
+iw doesn't do wpa/wpa2.  wpa_supplicant does everything.  iwd does everything except WEXT encryption.
 
 # Connecting
 
 Get the link status:
 
-```sh
+```bash
 iw dev wlan0 link
 ```
 
 Scan for available points:
 
-```sh
+```bash
 iw dev wlan0 scan
 ```
 

networking/wpa_supplicant.md

@@ -3,55 +3,55 @@ title: "wpa_supplicant"
 tags: [ "Networking" ]
 ---
 
-`wpa_supplicant` configurations are stored in `/etc/wpa_supplicant/wpa_supplicant-wlan0` (or equivalent).
+wpa_supplicant configurations are stored in /etc/wpa_supplicant/wpa_supplicant-wlan0 (or equivalent).
 
 ## WiFi Connection
 
-```sh
+```bash
 wpa_cli
 ```
 
 Once in, scan the network, add an empty place to store credentials, then input them.
 
-```sh
+```bash
 scan
 ```
 
-```sh
+```bash
 scan_results
 ```
 
-```sh
+```bash
 add_network
 ```
 
 This outputs a network number, e.g. '3'.  This is the new network you'll work with.
 
-```sh
+```bash
 set_network *3* ssid *"Kosachok Cafe"*
 ```
 
-```sh
+```bash
 set_network 3 psk *"Kosachok2019"*
 ```
 
 OR (for no password)
 
-```sh
+```bash
 set_network *3* key_mgmt NONE
 ```
 
-```sh
+```bash
 enable_network 3
 ```
 
-```sh
+```bash
 save_config
 ```
 
 This takes a while to connect, so to speed things up, restart the service:
 
-```sh
+```bash
 sudo sv restart wpa_supplicant
 ```
 
@@ -59,13 +59,13 @@ sudo sv restart wpa_supplicant
 
 You can script like this:
 
-```sh
+```bash
 wpa_cli add_network
 ```
 
 That returns an ID, so you can say:
 
-```sh
+```bash
 newNetwork="$(wpa_cli add_network)"
 ```
 
@@ -73,19 +73,19 @@ Then `$newNetwork` would equal that number, and you can add/ remove networks wit
 
 But remember to escape the quotes, so adding a network would be:
 
-```sh
+```bash
 wpa_cli set_network *3* psk *\""passphrase"\"*
 ```
 
 ## Generating Keys Manually
 
-```sh
+```bash
 wpa_passphrase [ssid] [password]
 ```
 
 For example:
 
-```sh
+```bash
 wpa_passphrase 'Cafe Kosachok' 'Kosachok2019'
 ```