Merge branch 'master' of github.com:dopefishh/martlubbers.net
authorMart Lubbers <mart@martlubbers.net>
Wed, 22 Apr 2015 06:58:28 +0000 (08:58 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 22 Apr 2015 06:58:28 +0000 (08:58 +0200)
Conflicts:
hashes.txt

.gitignore [new file with mode: 0644]
dvorak.html
hashes.txt [deleted file]
index.html
put.bash

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..dbb7e6b
--- /dev/null
@@ -0,0 +1 @@
+hashes.txt
index df8cc2c..1b3b552 100644 (file)
@@ -6,6 +6,23 @@
        <body>
                <p>Since about 2011 I've started using dvorak as my main keyboard layout and like the efficiency compared to QWERTY.</p>
 
+               <h2>Dvorak russian update (2015-04-16)</h2>
+               <p>Since having to setup the keyboard after login can be useful if you
+               don't have the rights to edit system configuration files on your system(eg.
+               work) but it's not a durable solution for your own system. If you want to
+               make these things semipermanent you can use the handy program called
+               <a href="http://www.freedesktop.org/software/systemd/man/localectl.html">
+                       localectl
+               </a> which writes an xorg.conf.d/ file. In my specific case these are the
+               commands to set the keymap for the console and for within X. For the
+               console I only use normal dvorak whereas in X I want to be able to
+               switch(with menu key) and use the right alt as compose key.
+               <pre>
+# localectl set-x11-keymap --no-convert dvorak,ru pc104 ,phonetic_dvorak compose:ralt,grp:menu_toggle
+# localectl set-keymap --no-convert dvorak
+               </pre>
+               </p>
+
                <h2>Dvorak russian (2014-10-07)</h2>
                <p>When learning russian I had to type some stuff in russian, as I found
                out that there was a phonetic keyboard I was excited but it didn't work on
diff --git a/hashes.txt b/hashes.txt
deleted file mode 100644 (file)
index 8358176..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-3d85a9b435eb833de088e45c3f56e49c  ./dvorak.html
-9e5b7702d73bfb7febb24bf58f0e8d60  ./hashes.txt
-641691d9c0ede8c0fad969af2d2e4017  ./index.html
-72ac29b74f3e09c551aa10a2a8d2581d  ./lejos-ubuntu.html
-0ba6cb2c3a9d7d8ba27406d215aa501e  ./mart@martlubbers.net.asc
-75068866762dc200d6e185bfe9b3a2bf  ./o.html
-ce31052406b3874b287e98c8a9477516  ./p.jpg
-e8a032f7db299973004f4baad35967a9  ./put.bash
-43eb61826bc538817b4c78c7f8d57019  ./README.md
-acaac946ac8dc79dc3896e74edbdd303  ./robots.txt
-d69f225d06c3d7a417fb5e8159efc2d1  ./test.php
-146f1bb6bed2adfd4d13f9644390db71  ./archive/nsa-dropbox.html
-2ed34aa229468632cce58151c33d1ebc  ./archive/wlan-debian.html
-d07dca8f45b3f046558216cf3ac96c28  ./archive/youtube-term.html
-dd13e096acf6b9b95cace6943fe56577  ./files/dvorak-0.74.map
-85f82d281bc3d4e48e375193fdaada66  ./files/dvorak_dos.tar
-b92c31cd0dfde6e6e8322d2163f0d728  ./files/phonetic_dvorak.gz
index 037fcf2..21f191c 100644 (file)
@@ -66,7 +66,7 @@
                        <li>Hacking</li>
                        <li><a href="http://www.howchuenmonkeykungfu.nl">Kung fu</a></li>
                        <li><a href="http://linuxnijmegen.nl">Linux</a></li>
-                       <li>Pok&#233;mon</li>
+                       <li>Parkour</li>
                </ul>
 
                <h3>Suspended projects/archive</h3>
index 80770f6..8f3806b 100644 (file)
--- a/put.bash
+++ b/put.bash
@@ -3,7 +3,7 @@ set -e
 files=$(find . -type f -not -iwholename "*.git*")
 user=$(gpg -q --use-agent -d ~/pw/general.asc | grep ftpmartlubbers.net -A3 | head -3 | tail -2 | sed 's/\s\+\(user\|pass\):\s\+//g' | head -c -1 | tr '\n' ':')
 
-for f in $files
+for f in $(find . -type f -not -iwholename "*.git*")
 do
        origmd5=$(grep "$f" ./hashes.txt | awk '{print $1}')
        currmd5=$(md5sum "$f" | awk '{print $1}')