summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-10-28 23:05:22 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-10-28 23:05:22 +0200
commit1004e36e2cb220798e24494fcc116f769749a5de (patch)
tree008ed9309dc7db5aa3b3a837f42cc6fa105894ca /content
parentaa27b2fde51e13ec79914cd14ff6cb21303958b3 (diff)
downloadblog-1004e36e2cb220798e24494fcc116f769749a5de.zip
blog-1004e36e2cb220798e24494fcc116f769749a5de.tar.gz
blog-1004e36e2cb220798e24494fcc116f769749a5de.tar.bz2
update research section and little fix for setup
add Facharbeit and CV
Diffstat (limited to 'content')
-rw-r--r--content/docs/Facharbeit.pdfbin0 -> 235136 bytes
-rw-r--r--content/docs/cv_eng.pdfbin0 -> 112961 bytes
-rw-r--r--content/docs/cv_ger.pdfbin0 -> 115415 bytes
-rw-r--r--content/pages/research.rst18
-rw-r--r--content/pages/setup.rst2
5 files changed, 17 insertions, 3 deletions
diff --git a/content/docs/Facharbeit.pdf b/content/docs/Facharbeit.pdf
new file mode 100644
index 0000000..b01785e
--- /dev/null
+++ b/content/docs/Facharbeit.pdf
Binary files differ
diff --git a/content/docs/cv_eng.pdf b/content/docs/cv_eng.pdf
new file mode 100644
index 0000000..718c924
--- /dev/null
+++ b/content/docs/cv_eng.pdf
Binary files differ
diff --git a/content/docs/cv_ger.pdf b/content/docs/cv_ger.pdf
new file mode 100644
index 0000000..b20c140
--- /dev/null
+++ b/content/docs/cv_ger.pdf
Binary files differ
diff --git a/content/pages/research.rst b/content/pages/research.rst
index e456311..f4193df 100644
--- a/content/pages/research.rst
+++ b/content/pages/research.rst
@@ -1,4 +1,18 @@
-:title: Research
+:title: Research and Education
:status: published
-coming soon
+| A short form of my CV in `English <./docs/cv_eng.pdf>`__ and `German <./docs/cv_ger.pdf>`__
+| Feel free to contact me for a long form.
+|
+
+The main focus of my engineering studies was medical technology and robotics. Besides the classic engineering basics, I dived into the fields of automation, mechatronics, sofware engineering and simulation. I have a special interest in humanoid robots, biomimetics and prosthetics.
+
+Theses
+######
+
+Currently, only my Facharbeit is available. I'm planning to add the theses I wrote during my engineering studies.
+
+`Pax Augusta – Pax Americana <./docs/Facharbeit.pdf>`__
+-------------------------------------------------------
+| My Facharbeit. It's written in German and here is a short summary in German:
+| Die Arbeit versucht einen Vergleich zwischen Rom zur Zeit von Augustus und Amerika nach dem 2. Weltkrieg zu ziehen. Vor allem das Friedensverständnis und die Sicherung der Vormachtstellung beider Großmächte wird untersucht. Gemeinsamkeiten und Unterschiede in der Motivation, Politik, Kultur und den geopolitischen Gegebenheiten werden aufgezeigt. Abschließend wird ein Ausblick auf die zukünftigen Herausforderungen zur Erlangung eines universalen Friedens gewagt.
diff --git a/content/pages/setup.rst b/content/pages/setup.rst
index 9e9d99f..2ad5fb1 100644
--- a/content/pages/setup.rst
+++ b/content/pages/setup.rst
@@ -40,7 +40,7 @@ For some time, I switched between `Xfce <https://www.xfce.org/>`_, `KDE's Plasma
Of course, `my photo and video editing workflow only involves free software <{filename}/pages/notes.rst#media>`_, although some of my older `photos <https://fossencdi.org/gallery/index.html>`_ were edited with nonfree software because I wasn't yet aware about free software at the time. Sometimes, I use a Wacom Bamboo tablet for editing photos, creating vector graphics or annotating documents in `Xournal <http://xournal.sourceforge.net/>`_. `qpdfview <https://launchpad.net/qpdfview>`_ is my go-to PDF viewer because it makes it possible to open many PDF files in a tabbed view and it syncs nicely a PDF preview of my `LaTeX <https://www.latex-project.org/>`_ documents.
-My music is handled by `MPD <https://www.musicpd.org/>`_. It's a daemon that can be accessed by different interfaces. On the desktop, I use `ncmpcpp <https://rybczak.net/ncmpcpp/>`_. On the phone, I stream music from my PC with `MPDroid <https://github.com/abarisain/dmix>`_. I like about MPD that it practically always plays my music without any hiccups, even when the machine is under full load including heavy disc IO.
+My music is handled by `MPD <https://www.musicpd.org/>`_. It's a daemon that can be accessed by different interfaces. On the desktop, I use `ncmpcpp <https://rybczak.net/ncmpcpp/>`_. On the phone, I stream music from my PC with `MPDroid <https://github.com/abarisain/dmix>`_. I like about MPD that it almost always plays my music without any hiccups, even when the machine is under full load including heavy disc IO.
`youtube-dl <https://rg3.github.io/youtube-dl/>`_ in combination with `mpv <https://mpv.io/>`_ and `MediathekView <http://zdfmediathk.sourceforge.net/>`_ are used to access videos that are available on the Internet. My IRC setup consists of `WeeChat <https://weechat.org/>`_ and `ZNC <http://wiki.znc.in/ZNC>`_. `pass <https://www.passwordstore.org/>`_ stores all my passwords. The ugly but extremely handy `Ding dictionary lookup program <https://www-user.tu-chemnitz.de/~fri/ding/>`_ is my dictionary and thesaurus interface.