hardware setup

also improved notes and robots.txt

4 files changed, 25 insertions, 5 deletions

diff --git a/content/extras/robots.txt b/content/extras/robots.txt
index e44dfbe..986e1bc 100644
--- a/content/extras/robots.txt
+++ b/content/extras/robots.txt
@@ -1,3 +1,3 @@
 User-agent: *
-Allow: /
 Disallow: /impressum.html
+Allow: /
diff --git a/content/pages/notes.rst b/content/pages/notes.rst
index 19f6850..93b4b10 100644
--- a/content/pages/notes.rst
+++ b/content/pages/notes.rst
@@ -1,15 +1,15 @@
 :title: Notes
 :status: published
 
-This is a collection of useful free software and commands for various purposes.
+This is a collection of useful free software and commands for various purposes, that didn't quite fit into `my setup description <./setup.html>`_.
 
 .. contents::
 
 Debian
 ######
 
-Live image
-----------
+Custom live image
+-----------------
 
 Sometimes it's quite useful to have your own custom live system image on a USB stick or a CD, e.g. to save a broken installation or to do maintenance work that cannot be done when the system is running. Building a custom image makes it possible to include software packages that are not included by default and to change the general configuration to your liking.
 
@@ -34,7 +34,7 @@ When I build a Debian package from its sources, I only sometimes want to make ac
 Emacs
 #####
 
-I do nearly all my text editing in Emacs. I write all my code in Emacs, edit configuration files in Emacs, write Latex documents with the great `AUCTEX <https://www.gnu.org/software/auctex/>`_ package and do my email with `mu4e <https://www.djcbsoftware.nl/code/mu/mu4e.html>`_. You can find a partially cleaned up version of my Emacs config file `here <https://code.fossencdi.org/config.git/tree/emacs>`_. I use the `"tomorrow" theme <https://github.com/purcell/color-theme-sanityinc-tomorrow>`_. Packages are maintained with `El-Get <http://tapoueh.org/emacs/el-get.html>`_.
+I do nearly all my text editing in Emacs. I write all my code in Emacs, edit configuration files in Emacs, write Latex documents with the great `AUCTEX <https://www.gnu.org/software/auctex/>`_ package and do my email with `mu4e <https://www.djcbsoftware.nl/code/mu/mu4e.html>`_. The text you are reading right now was also written in Emacs. You can find a partially cleaned up version of my Emacs config file `here <https://code.fossencdi.org/config.git/tree/emacs>`_. I use the `"tomorrow" theme <https://github.com/purcell/color-theme-sanityinc-tomorrow>`_. Packages are maintained with `El-Get <http://tapoueh.org/emacs/el-get.html>`_.
 
 To securely send email in Emacs, I do certificate pinning with GnuTLS as described `here <https://blogs.fsfe.org/jens.lechtenboerger/2014/03/10/certificate-pinning-with-gnutls-in-the-mess-of-ssltls/>`__. My mail server uses `Let’s Encrypt <https://letsencrypt.org/>`_, so I have to do the pinning every two months. The procedure is as follows:
 
diff --git a/content/pages/setup.rst b/content/pages/setup.rst
new file mode 100644
index 0000000..0ffa6ed
--- /dev/null
+++ b/content/pages/setup.rst
@@ -0,0 +1,20 @@
+:title: My setup
+:status: published
+
+I'm always interested in what tools others are using to get their work done. On this page, I want to share how I get my stuff done, at least the computing part of it. This is also inspired by the `The Setup <https://usesthis.com/>`_ and Richard Stallman's `"How I do my computing" <https://stallman.org/stallman-computing.html>`_.
+
+
+Hardware
+########
+
+My laptop is a Thinkpad Edge E530. I was lucky to get it quite cheap without Windows preinstalled. I like about it that it did not yet fail on me over the last years. I replaced the crappy hard disk with a SSD to get some performance out of the otherwise not very powerful laptop. The screen is not that good, but the fact that it's a matte screen makes it quite usable in the sunlight. I removed the camera and microphone. `This guide <http://www.insidemylaptop.com/replace-screen-on-lenovo-e530-laptop/>`_ was quite helpful for that, although it's actually for replacing the screen. However, the same steps make it possible to access the camera and microphone module above the screen.
+
+I built my own PC after I had finished school and I still use it today. The CPU is an Intel Core i7-860 and runs overclocked at 3.4 GHz which is still enough for my performance needs. The processor is perfectly cooled by a `Scythe Mugen 2 Rev.B <http://www.overclock.net/products/scythe-scmg-2100-mugen-2-rev-b>`_ which is not only really huge but also very quiet. I added 8 GB of RAM and the motherboard is a `MSI P55-GD65 <https://www.msi.com/Motherboard/P55GD65.html>`_. I can't really say something positive about the motherboard as it made quite some issues over the years. The only bad purchase besides the motherboard was the GPU. I managed to buy a variant of the Nvidia GeForce GTS 250 from EVGA that has the fan always running at 100%. To keep the noise down, I replaced the fan with an `Alpenföhn Klara <http://www.alpenfoehn.de/auslaufmodelle/klara>`_. The power supply is from `bequiet! <http://www.bequiet.com/>`_ and everything is kept inside a nice Aluminium case from Lian Li that also has a side panel window. The only issue the sometimes oscillating and thus noisy side panel.
+
+For personal data and services for family and friends, I use a HP ProLiant MicroServer N54L as a home server. It is equipped with two 1 TB disks. A TP-Link TL-WDR4300 serves as router with an Allnet ALL0333CJ as modem. This blog and other public stuff is hosted on a `VPS <https://en.wikipedia.org/wiki/Virtual_private_server>`_ which uses `KVM <http://www.linux-kvm.org/page/Main_Page>`_. I'm planning to move from the VPS to another home server as soon as I can get hold on a fast internet connection that is separate from the one the MicroServer is connected to. I'd like to keep the two servers completely separate from each other so I can use them as backups for each other.
+
+
+Software
+########
+
+Coming soon!
diff --git a/pelican-themes b/pelican-themes
-Subproject c63928f911753ad98937080c102e6485d741685
+Subproject 4eebebc6c808280d62c2c8f420c94b5059bb9ab