Merge branch 'master' of gogs:brian/vim-castle

Conflicts: .vim/vimwiki/vimwiki/Linux_Slackware.wiki .vim/vimwiki/vimwiki/Notes.wiki .vim/vimwiki/vimwiki/Other.wiki .vim/vimwiki/vimwiki/Play.wiki .vim/vimwiki/vimwiki/RR3_ModList.wiki .vim/vimwiki/vimwiki/Slackware_FullSystemUpgrade.wiki .vim/vimwiki/vimwiki/Slackware_Parallels.wiki .vim/vimwiki/vimwiki/Slackware_PostInstallation.wiki .vim/vimwiki/vimwiki/Starbound.wiki .vim/vimwiki/vimwiki/Work.wiki .vim/vimwiki/vimwiki/bible_topics_identity.wiki .vim/vimwiki/vimwiki/work_clients_high_touch_enertech_capture.wiki .vim/vimwiki/vimwiki_html/Linux_Slackware.html .vim/vimwiki/vimwiki_html/Notes.html .vim/vimwiki/vimwiki_html/Other.html .vim/vimwiki/vimwiki_html/Play.html .vim/vimwiki/vimwiki_html/RR3_ModList.html .vim/vimwiki/vimwiki_html/Slackware_FullSystemUpgrade.html .vim/vimwiki/vimwiki_html/Slackware_Parallels.html .vim/vimwiki/vimwiki_html/Slackware_PostInstallation.html .vim/vimwiki/vimwiki_html/Starbound.html .vim/vimwiki/vimwiki_html/Work.html .vim/vimwiki/vimwiki_html/bible_topics_identity.html .vim/vimwiki/vimwiki_html/work_clients_high_touch_enertech_capture.html
2015-03-31 07:48:27 -05:00 · 2015-03-31 07:48:27 -05:00 · 5c305ca866
commit 5c305ca866
parent f6badb1501 7aab30063c
15 changed files with 333 additions and 0 deletions
--- a/.vim/bundle/webapi-vim
+++ b/.vim/bundle/webapi-vim
@ -0,0 +1 @@
+Subproject commit a7789abffe936db56e3152e23733847f94755753
--- a/.vim/vimwiki/vimwiki/D_and_D.wiki
+++ b/.vim/vimwiki/vimwiki/D_and_D.wiki
@ -0,0 +1,7 @@
+
+Loots from 3/2/2015
+800 SP
+150 GP
+4 Goblets with Moonstones
+Misty Step Scroll
+Lightning Bolt Scroll
--- a/.vim/vimwiki/vimwiki/Linux_Slackware_Wifi.wiki
+++ b/.vim/vimwiki/vimwiki/Linux_Slackware_Wifi.wiki
@ -0,0 +1,2 @@
+==== Slackware Wifi (wicd) ====
+Install wicd package from the `extras` folder of the cd
--- a/.vim/vimwiki/vimwiki/Mac_EFI_Jailbreak.wiki
+++ b/.vim/vimwiki/vimwiki/Mac_EFI_Jailbreak.wiki
@ -0,0 +1,39 @@
+==="Jailbreaking" a Mac===
+
+/EFI/boot/refind_ia32.efi ?> /EFI/boot/bootia32.efi
+==== Steps ====
+* Boot into a live CD
+* Install rEFInd
+* Setup system like normal
+
+====Requirements====
+* [[http://www.mediafire.com/?dpgorsfdkf6nn2c | ISO2USB EFI Booter for Mac]]
+* A Live CD with loopback support
+  * xubuntu works well
+
+====Installation====
+* Ensure the ISO file will fit on your USB flash drive. Backup important content from your drive — it will be erased.
+* Make one large partition on your USB flash drive, using e.g. `(g)parted`, `(c)gdisk`, or `(c)fdisk`. 
+  You can use either a GUID partition table (GPT — unless you’re using (c)fdisk) or an MSDOS/MBR partition table, both will work. Use “Microsoft basic data” (code 0700) as the partition type.
+* Format the partition with FAT32. (g)parted can do this. Alternatively, you can type 
+  `mkfs.vfat -F 32 /dev/sdX1` from the command line (after replacing the “X” with the correct letter for your USB drive). 
+  Formatting with HFS+, as some sources indicate, didn’t work for me.
+* Mount your drive and cd into it (as root: `# mkdir /mnt/usb && mount /dev/sdX1 /mnt/usb && cd /mnt/usb`).
+* Create the directory `efi/boot/` in the current directory (`# mkdir -p efi/boot/`) — 
+  (i.e., the full path of this directory is `/mnt/usb/efi/boot/` if your USB drive is mounted in `/mnt/usb/`).
+* Copy either `bootIA32.efi` or `bootX64.efi` to the new directory (depending on whether you have a 32 or 64-bit system), 
+  and rename the file to boot.efi.
+  * Old White Macbook needs `bootIA32.efi`
+* Copy the downloaded LiveCD image to the new directory, and rename it to `boot.iso`.
+
+That’s all. The USB drive now contains two directories and two files, and should boot. 
+Make sure you used the file and directory names as provided here. For clarity, all that is 
+now on your USB drive is (relative to the root directory of that drive):
+`/efi/boot/boot.iso`
+`/efi/boot/boot.efi`
+
+In order to install Linux, I booted Kubuntu using the method described above, installed rEFInd 
+from there, which then allowed me to boot from a normal Live USB flash drive. I ended up installing 
+Arch Linux. The details and non-trivialities of the Linux installation will be described in a future 
+post. I didn’t manage to install Linux without installing rEFInd though, so in retrospect I might as 
+well have installed rEFInd on my new disc, mounted as an external disc to my other Linux computer.
--- a/.vim/vimwiki/vimwiki/Server_Admin_MySQL.wiki
+++ b/.vim/vimwiki/vimwiki/Server_Admin_MySQL.wiki
@ -0,0 +1,6 @@
+=== Grant User Privileges ===
+`GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP ON database.<table|*> TO '<user>'@'<localhost|domain>';`
+
+=== View User Privileges ===
+`SHOW GRANTS FOR '<user>'@'<localhost|domain>';`
+
--- a/.vim/vimwiki/vimwiki/Server_Admin_Rsync.wiki
+++ b/.vim/vimwiki/vimwiki/Server_Admin_Rsync.wiki
@ -0,0 +1,29 @@
+==== RSync ====
+Basic Rsync Backup
+`rsync -av source/ destination/`
+To/From Remote
+`rsync -av -e ssh source/ username@remotemachine:/path/to/destination/`
+
+=====Trailing Slashes _Do_ matter... Sometimes=====
+Rsync cares about trailing slashes on the *source* argument.
+For example, let `a` and `b` be two directories with the file `foo` initially in `a`:
+`rsync -a a b`
+produces `b/a/foo` whereas
+`rsync -a a/ b`
+produces `b/foo`. A trailing slash on the destination has no effect.
+
+=====Incremental Backups using Rsync=====
+Needs rsync v.2.5.7 or later
+{{{
+rm -rf backup_folder.1
+mv backup_folder.0 backup_folder.1 # Obviously, can have as many backups copies as you want
+rsync -a --delete --link-dest=../backup_folder.1 source_directory/ backup_folder.0/
+}}}
+If running an older rsync:
+{{{
+mv backup_folder.1 backup_folder.tmp
+mv backup_folder.0 backup_folder.1
+mv backup_folder.tmp backup_folder.0
+cp -al backup_folder.1/. backup_folder.0
+rsync -a --delete source_directory/ backup_folder.0/
+}}}
--- a/.vim/vimwiki/vimwiki/Slackware_EncFS.wiki
+++ b/.vim/vimwiki/vimwiki/Slackware_EncFS.wiki
@ -0,0 +1,6 @@
+Mount:
+encfs <encoded-dir> <mount-pount>
+
+Unmount:
+fusermount -u <mount-point>
+
--- a/.vim/vimwiki/vimwiki/bible_esv_galations_5.13-14.wiki
+++ b/.vim/vimwiki/vimwiki/bible_esv_galations_5.13-14.wiki
@ -0,0 +1,3 @@
+13 For you were called to freedom, brothers. Only do not use your freedom as an opportunity for the flesh, but through love serve one another.
+14 For the whole law s fulfilled in one word: "You shall love your neighbor as yourself."
+15 But if you bite and devour one another, watch out that you are not consumed by one another.
--- a/.vim/vimwiki/vimwiki_html/D_and_D.html
+++ b/.vim/vimwiki/vimwiki_html/D_and_D.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>D_and_D</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+
+<p>
+Loots from 3/2/2015
+800 SP
+150 GP
+4 Goblets with Moonstones
+Misty Step Scroll
+Lightning Bolt Scroll
+</p>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/Linux_Slackware_Wifi.html
+++ b/.vim/vimwiki/vimwiki_html/Linux_Slackware_Wifi.html
@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>Linux_Slackware_Wifi</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<h4 id="toc_0.0.0.1">Slackware Wifi (wicd)</h4>
+<p>
+Install wicd package from the <code>extras</code> folder of the cd
+</p>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/Mac_EFI_Jailbreak.html
+++ b/.vim/vimwiki/vimwiki_html/Mac_EFI_Jailbreak.html
@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>Mac_EFI_Jailbreak</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<h3 id="toc_0.0.1">"Jailbreaking" a Mac</h3>
+
+<p>
+/EFI/boot/refind_ia32.efi ?&gt; /EFI/boot/bootia32.efi
+</p>
+<h4 id="toc_0.0.1.1">Steps</h4>
+<ul>
+<li>
+Boot into a live CD
+
+<li>
+Install rEFInd
+
+<li>
+Setup system like normal
+
+</ul>
+
+<h4 id="toc_0.0.1.2">Requirements</h4>
+<ul>
+<li>
+<a href="http://www.mediafire.com/?dpgorsfdkf6nn2c ">ISO2USB EFI Booter for Mac</a>
+
+<li>
+A Live CD with loopback support
+
+<ul>
+<li>
+xubuntu works well
+
+</ul>
+</ul>
+
+<h4 id="toc_0.0.1.3">Installation</h4>
+<ul>
+<li>
+Ensure the ISO file will fit on your USB flash drive. Backup important content from your drive — it will be erased.
+
+<li>
+Make one large partition on your USB flash drive, using e.g. <code>(g)parted</code>, <code>(c)gdisk</code>, or <code>(c)fdisk</code>. 
+  You can use either a GUID partition table (GPT — unless you’re using (c)fdisk) or an MSDOS/MBR partition table, both will work. Use “Microsoft basic data” (code 0700) as the partition type.
+
+<li>
+Format the partition with FAT32. (g)parted can do this. Alternatively, you can type 
+  <code>mkfs.vfat -F 32 /dev/sdX1</code> from the command line (after replacing the “X” with the correct letter for your USB drive). 
+  Formatting with HFS+, as some sources indicate, didn’t work for me.
+
+<li>
+Mount your drive and cd into it (as root: <code># mkdir /mnt/usb &amp;&amp; mount /dev/sdX1 /mnt/usb &amp;&amp; cd /mnt/usb</code>).
+
+<li>
+Create the directory <code>efi/boot/</code> in the current directory (<code># mkdir -p efi/boot/</code>) — 
+  (i.e., the full path of this directory is <code>/mnt/usb/efi/boot/</code> if your USB drive is mounted in <code>/mnt/usb/</code>).
+
+<li>
+Copy either <code>bootIA32.efi</code> or <code>bootX64.efi</code> to the new directory (depending on whether you have a 32 or 64-bit system), 
+  and rename the file to boot.efi.
+
+<ul>
+<li>
+Old White Macbook needs <code>bootIA32.efi</code>
+
+</ul>
+<li>
+Copy the downloaded LiveCD image to the new directory, and rename it to <code>boot.iso</code>.
+
+</ul>
+
+<p>
+That’s all. The USB drive now contains two directories and two files, and should boot. 
+Make sure you used the file and directory names as provided here. For clarity, all that is 
+now on your USB drive is (relative to the root directory of that drive):
+<code>/efi/boot/boot.iso</code>
+<code>/efi/boot/boot.efi</code>
+</p>
+
+<p>
+In order to install Linux, I booted Kubuntu using the method described above, installed rEFInd 
+from there, which then allowed me to boot from a normal Live USB flash drive. I ended up installing 
+Arch Linux. The details and non-trivialities of the Linux installation will be described in a future 
+post. I didn’t manage to install Linux without installing rEFInd though, so in retrospect I might as 
+well have installed rEFInd on my new disc, mounted as an external disc to my other Linux computer.
+</p>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/Server_Admin_MySQL.html
+++ b/.vim/vimwiki/vimwiki_html/Server_Admin_MySQL.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>Server_Admin_MySQL</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<h3 id="toc_0.0.1">Grant User Privileges</h3>
+<p>
+<code>GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP ON database.&lt;table|*&gt; TO '&lt;user&gt;'@'&lt;localhost|domain&gt;';</code>
+</p>
+
+<h3 id="toc_0.0.2">View User Privileges</h3>
+<p>
+<code>SHOW GRANTS FOR '&lt;user&gt;'@'&lt;localhost|domain&gt;';</code>
+</p>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/Server_Admin_Rsync.html
+++ b/.vim/vimwiki/vimwiki_html/Server_Admin_Rsync.html
@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>Server_Admin_Rsync</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<h4 id="toc_0.0.0.1">RSync</h4>
+<p>
+Basic Rsync Backup
+<code>rsync -av source/ destination/</code>
+To/From Remote
+<code>rsync -av -e ssh source/ username@remotemachine:/path/to/destination/</code>
+</p>
+
+<h5 id="toc_0.0.0.1.1">Trailing Slashes <em>Do</em> matter... Sometimes</h5>
+<p>
+Rsync cares about trailing slashes on the <strong>source</strong> argument.
+For example, let <code>a</code> and <code>b</code> be two directories with the file <code>foo</code> initially in <code>a</code>:
+<code>rsync -a a b</code>
+produces <code>b/a/foo</code> whereas
+<code>rsync -a a/ b</code>
+produces <code>b/foo</code>. A trailing slash on the destination has no effect.
+</p>
+
+<h5 id="toc_0.0.0.1.2">Incremental Backups using Rsync</h5>
+<p>
+Needs rsync v.2.5.7 or later
+</p>
+<pre>
+rm -rf backup_folder.1
+mv backup_folder.0 backup_folder.1 # Obviously, can have as many backups copies as you want
+rsync -a --delete --link-dest=../backup_folder.1 source_directory/ backup_folder.0/
+</pre>
+<p>
+If running an older rsync:
+</p>
+<pre>
+mv backup_folder.1 backup_folder.tmp
+mv backup_folder.0 backup_folder.1
+mv backup_folder.tmp backup_folder.0
+cp -al backup_folder.1/. backup_folder.0
+rsync -a --delete source_directory/ backup_folder.0/
+</pre>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/Slackware_EncFS.html
+++ b/.vim/vimwiki/vimwiki_html/Slackware_EncFS.html
@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>Slackware_EncFS</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<p>
+Mount:
+encfs &lt;encoded-dir&gt; &lt;mount-pount&gt;
+</p>
+
+<p>
+Unmount:
+fusermount -u &lt;mount-point&gt;
+</p>
+
+</body>
+</html>
--- a/.vim/vimwiki/vimwiki_html/bible_esv_galations_5.13-14.html
+++ b/.vim/vimwiki/vimwiki_html/bible_esv_galations_5.13-14.html
@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="style.css">
+<title>bible_esv_galations_5.13-14</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+<p>
+13 For you were called to freedom, brothers. Only do not use your freedom as an opportunity for the flesh, but through love serve one another.
+14 For the whole law s fulfilled in one word: "You shall love your neighbor as yourself."
+15 But if you bite and devour one another, watch out that you are not consumed by one another.
+</p>
+
+</body>
+</html>
				`@ -0,0 +1 @@`
				`Subproject commit a7789abffe936db56e3152e23733847f94755753`