diff --git a/.gitmodules b/.gitmodules
index 8f6164a1..d9753d11 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,8 +11,8 @@
 	path = home-common/graphical/rofi/zzzfoo
 	url = https://github.com/andersju/zzzfoo.git
 [submodule "modules/cdarknet/hosts"]
-	path = modules/cdarknet/hosts
+	path = system/modules/cdarknet/hosts
 	url = git@git.darmstadt.ccc.de:cdark.net/hosts
 [submodule "modules/cdarknet/nixdark"]
-	path = modules/cdarknet/nixdark
+	path = system/modules/cdarknet/nixdark
 	url = git@git.darmstadt.ccc.de:cdark.net/nixdark
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d103829b..00000000
--- a/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-default: all
-
-all: links config
-
-links:
-	ln -sfT data/aktuell/it/config ~/config
-	ln -sfT data/aktuell/it/config/dotfiles ~/.dotfiles
-	ln -sfT data/aktuell/it/config/bin ~/bin
-	ln -sfT ~/data/aktuell/it/config/nixos ~/.config/nixpkgs/config
-	ln -sfT data/aktuell/it/secrets/password-store ~/.password-store
-	ln -sfT data/aktuell/it/secrets/gnupg ~/.gnupg
-
-system-links:
-	sudo ln -sfT ${HOME}/data/aktuell/it/config/nixos /etc/nixos/config
-
-config:
-	rcup rcrc
-	rcup
-	mkdir -p ~/.vimhist/bak
-	touch .chpwd-recent-dirs
diff --git a/home-common/graphical/rofi/zzzfoo b/home-common/graphical/rofi/zzzfoo
deleted file mode 160000
index 4800c1c6..00000000
--- a/home-common/graphical/rofi/zzzfoo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4800c1c645b24ef7b7638f2a31f45826b8fc2973
diff --git a/home-manager/Makefile b/home-manager/Makefile
new file mode 100644
index 00000000..b6fde8d3
--- /dev/null
+++ b/home-manager/Makefile
@@ -0,0 +1,8 @@
+default: all
+
+all: links
+
+links:
+	ln -sfT ~/data/aktuell/it/config/nixos ~/.config/nixpkgs/config
+	ln -sfT data/aktuell/it/secrets/password-store ~/.password-store
+	ln -sfT data/aktuell/it/secrets/gnupg ~/.gnupg
diff --git a/homes/apollo/battery.nix b/home-manager/battery.nix
similarity index 100%
rename from homes/apollo/battery.nix
rename to home-manager/battery.nix
diff --git a/home-common/configs/vimrc b/home-manager/configs/vimrc
similarity index 100%
rename from home-common/configs/vimrc
rename to home-manager/configs/vimrc
diff --git a/home-common/configs/zshrc b/home-manager/configs/zshrc
similarity index 100%
rename from home-common/configs/zshrc
rename to home-manager/configs/zshrc
diff --git a/home-common/default.nix b/home-manager/default.nix
similarity index 99%
rename from home-common/default.nix
rename to home-manager/default.nix
index 04d8b916..6652ff19 100644
--- a/home-common/default.nix
+++ b/home-manager/default.nix
@@ -97,8 +97,6 @@ in {
     };
   };
 
-
-
   home.sessionVariables = {
     BROWSER="${pkgs.firefox}/bin/firefox";
     EDITOR="${pkgs.neovim}/bin/nvim";
diff --git a/homes/charon/dovecot.sieve b/home-manager/dovecot.sieve
similarity index 100%
rename from homes/charon/dovecot.sieve
rename to home-manager/dovecot.sieve
diff --git a/home-common/graphical/default.nix b/home-manager/graphical/default.nix
similarity index 100%
rename from home-common/graphical/default.nix
rename to home-manager/graphical/default.nix
diff --git a/home-common/graphical/eventd.nix b/home-manager/graphical/eventd.nix
similarity index 100%
rename from home-common/graphical/eventd.nix
rename to home-manager/graphical/eventd.nix
diff --git a/home-common/graphical/i3.nix b/home-manager/graphical/i3.nix
similarity index 100%
rename from home-common/graphical/i3.nix
rename to home-manager/graphical/i3.nix
diff --git a/home-common/graphical/rofi/default.nix b/home-manager/graphical/rofi/default.nix
similarity index 100%
rename from home-common/graphical/rofi/default.nix
rename to home-manager/graphical/rofi/default.nix
diff --git a/home-common/graphical/rofi/tasklauncher.py b/home-manager/graphical/rofi/tasklauncher.py
similarity index 100%
rename from home-common/graphical/rofi/tasklauncher.py
rename to home-manager/graphical/rofi/tasklauncher.py
diff --git a/home-common/graphical/st/config.h b/home-manager/graphical/st/config.h
similarity index 99%
rename from home-common/graphical/st/config.h
rename to home-manager/graphical/st/config.h
index a7f33f20..312b77c3 100644
--- a/home-common/graphical/st/config.h
+++ b/home-manager/graphical/st/config.h
@@ -5,7 +5,8 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char font[] = "Roboto Mono:pixelsize=12:antialias=true:autohint=true";
+static char font[] = "Monofur Nerd Font:pixelsize=16:antialias=true:autohint=true";
+//static char font[] = "-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1";
 static int borderpx = 2;
 #define histsize 20000
 
diff --git a/home-common/graphical/st/default.nix b/home-manager/graphical/st/default.nix
similarity index 100%
rename from home-common/graphical/st/default.nix
rename to home-manager/graphical/st/default.nix
diff --git a/home-common/graphical/st/st-alpha-0.7.diff b/home-manager/graphical/st/st-alpha-0.7.diff
similarity index 100%
rename from home-common/graphical/st/st-alpha-0.7.diff
rename to home-manager/graphical/st/st-alpha-0.7.diff
diff --git a/home-common/graphical/st/st-externalpipe-0.7.diff b/home-manager/graphical/st/st-externalpipe-0.7.diff
similarity index 100%
rename from home-common/graphical/st/st-externalpipe-0.7.diff
rename to home-manager/graphical/st/st-externalpipe-0.7.diff
diff --git a/home-common/graphical/urxvt.nix b/home-manager/graphical/urxvt.nix
similarity index 100%
rename from home-common/graphical/urxvt.nix
rename to home-manager/graphical/urxvt.nix
diff --git a/homes/charon/habitask.nix b/home-manager/habitask.nix
similarity index 100%
rename from homes/charon/habitask.nix
rename to home-manager/habitask.nix
diff --git a/home-common/latex.nix b/home-manager/latex.nix
similarity index 100%
rename from home-common/latex.nix
rename to home-manager/latex.nix
diff --git a/modules/force-copies.nix b/home-manager/modules/force-copies.nix
similarity index 100%
rename from modules/force-copies.nix
rename to home-manager/modules/force-copies.nix
diff --git a/modules/home-options.nix b/home-manager/modules/home-options.nix
similarity index 100%
rename from modules/home-options.nix
rename to home-manager/modules/home-options.nix
diff --git a/modules/mpd.nix b/home-manager/modules/mpd.nix
similarity index 100%
rename from modules/mpd.nix
rename to home-manager/modules/mpd.nix
diff --git a/homes/charon/morgenreport.nix b/home-manager/morgenreport.nix
similarity index 100%
rename from homes/charon/morgenreport.nix
rename to home-manager/morgenreport.nix
diff --git a/home-common/my-systems.nix b/home-manager/my-systems.nix
similarity index 100%
rename from home-common/my-systems.nix
rename to home-manager/my-systems.nix
diff --git a/packages/eventd/default.nix b/home-manager/packages/eventd/default.nix
similarity index 67%
rename from packages/eventd/default.nix
rename to home-manager/packages/eventd/default.nix
index bac0b24f..f9f2cdac 100644
--- a/packages/eventd/default.nix
+++ b/home-manager/packages/eventd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     owner = "sardemff7";
     repo = "eventd";
     rev = version;
-    sha256 = "162gr3agmjn6d0wdj3lixv8qfvgfm9qg3wphbvwywdp4qcwvnjz8";
+    sha256 = "1xjkary1lq8yk1nqw039hrxwax1h0l0vi1dmcyqrgvzb1igsfa6y";
     fetchSubmodules = true;
   };
   buildInputs = [
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     dbus
   ];
   preConfigure = ''
-    export mesonFlags="-Denable-systemd=true -Denable-introspection=false -Denable-nd-wayland=false -Denable-im=false -Denable-sound=false -Ddbussessionservicedir=$prefix/share/dbus-1/services -Dsystemduserunitdir=$prefix/lib/systemd/user -Dsystemdsystemunitdir=$prefix/lib/systemd/system"
+    export mesonFlags="-Dsystemd=true -Dintrospection=false -Dnd-wayland=false -Dim=false -Dsound=false -Ddbussessionservicedir=$prefix/share/dbus-1/services -Dsystemduserunitdir=$prefix/lib/systemd/user -Dsystemdsystemunitdir=$prefix/lib/systemd/system"
   '';
 }
diff --git a/home-manager/packages/rust-scripts/.gitignore b/home-manager/packages/rust-scripts/.gitignore
new file mode 100644
index 00000000..eb5a316c
--- /dev/null
+++ b/home-manager/packages/rust-scripts/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/packages/rust-scripts/Cargo.lock b/home-manager/packages/rust-scripts/Cargo.lock
similarity index 100%
rename from packages/rust-scripts/Cargo.lock
rename to home-manager/packages/rust-scripts/Cargo.lock
diff --git a/packages/rust-scripts/Cargo.toml b/home-manager/packages/rust-scripts/Cargo.toml
similarity index 100%
rename from packages/rust-scripts/Cargo.toml
rename to home-manager/packages/rust-scripts/Cargo.toml
diff --git a/packages/rust-scripts/src/bin/hotkeys.rs b/home-manager/packages/rust-scripts/src/bin/hotkeys.rs
similarity index 100%
rename from packages/rust-scripts/src/bin/hotkeys.rs
rename to home-manager/packages/rust-scripts/src/bin/hotkeys.rs
diff --git a/packages/rust-scripts/src/bin/kassandra.rs b/home-manager/packages/rust-scripts/src/bin/kassandra.rs
similarity index 100%
rename from packages/rust-scripts/src/bin/kassandra.rs
rename to home-manager/packages/rust-scripts/src/bin/kassandra.rs
diff --git a/packages/rust-scripts/src/generate.rs b/home-manager/packages/rust-scripts/src/generate.rs
similarity index 100%
rename from packages/rust-scripts/src/generate.rs
rename to home-manager/packages/rust-scripts/src/generate.rs
diff --git a/packages/rust-scripts/src/hotkeys.rs b/home-manager/packages/rust-scripts/src/hotkeys.rs
similarity index 100%
rename from packages/rust-scripts/src/hotkeys.rs
rename to home-manager/packages/rust-scripts/src/hotkeys.rs
diff --git a/packages/rust-scripts/src/kassandra.rs b/home-manager/packages/rust-scripts/src/kassandra.rs
similarity index 99%
rename from packages/rust-scripts/src/kassandra.rs
rename to home-manager/packages/rust-scripts/src/kassandra.rs
index c866afbe..fc841953 100644
--- a/packages/rust-scripts/src/kassandra.rs
+++ b/home-manager/packages/rust-scripts/src/kassandra.rs
@@ -22,7 +22,7 @@ use tasktree::{TreeCache, TaskNode};
 fn print_task_short(task: &Task) -> String {
     let mut info = vec![task.description().clone()];
     if let Some(tags) = task.tags() {
-        info.push(format!("+{}", tags.join(",+")));
+        info.push(format!("+{}", tags.join(", +")));
     }
     if let Some(project) = task.project() {
         info.push(format!("({})", project));
diff --git a/packages/rust-scripts/src/lib.rs b/home-manager/packages/rust-scripts/src/lib.rs
similarity index 100%
rename from packages/rust-scripts/src/lib.rs
rename to home-manager/packages/rust-scripts/src/lib.rs
diff --git a/packages/rust-scripts/src/refresh.rs b/home-manager/packages/rust-scripts/src/refresh.rs
similarity index 84%
rename from packages/rust-scripts/src/refresh.rs
rename to home-manager/packages/rust-scripts/src/refresh.rs
index 7f4e0ee8..3ddbca69 100644
--- a/packages/rust-scripts/src/refresh.rs
+++ b/home-manager/packages/rust-scripts/src/refresh.rs
@@ -1,4 +1,5 @@
 use chrono::offset::{Local, TimeZone};
+use chrono::Duration;
 
 use kairos::timetype::TimeType as TT;
 use kairos::iter::Iter;
@@ -7,14 +8,14 @@ use kairos::error::Result as KairosResult;
 use task_hookrs::status::TaskStatus as TS;
 use task_hookrs::task::Task;
 use task_hookrs::cache::TaskCache;
-use task_hookrs::error::{Result, ResultExt};
+use task_hookrs::error::Result;
 use task_hookrs::date::Date;
 
 use generate::TaskGenerator;
 use tasktree::TaskNode;
 
 pub enum Timer {
-    DeadTime(TT),
+    DeadTime(Duration),
     Repetition(Iter),
 }
 
@@ -29,16 +30,13 @@ impl TaskRefresher for TaskCache {
     where
         T: IntoIterator<Item = Task>,
     {
-        let now = TT::Moment(Local::now().naive_local());
+        let now = Local::now();
+        let now_moment = TT::Moment(Local::now().naive_local());
         let recent = match recurrence {
-            Timer::DeadTime(time) => {
-                (now - time).calculate().chain_err(
-                    || "Failed to calculate recent from deadtime",
-                )?
-            }
+            Timer::DeadTime(time) => TT::Moment((now - time).naive_local()),
             Timer::Repetition(iter) => {
                 iter.filter_map(KairosResult::ok)
-                    .take_while(|t| *t <= now)
+                    .take_while(|t| *t <= now_moment)
                     .last()
                     .ok_or("Repetition starts in the future")?
                     .clone()
diff --git a/packages/rust-scripts/src/tasktree.rs b/home-manager/packages/rust-scripts/src/tasktree.rs
similarity index 100%
rename from packages/rust-scripts/src/tasktree.rs
rename to home-manager/packages/rust-scripts/src/tasktree.rs
diff --git a/packages/rust-scripts/src/update.rs b/home-manager/packages/rust-scripts/src/update.rs
similarity index 94%
rename from packages/rust-scripts/src/update.rs
rename to home-manager/packages/rust-scripts/src/update.rs
index c863419a..d234c087 100644
--- a/packages/rust-scripts/src/update.rs
+++ b/home-manager/packages/rust-scripts/src/update.rs
@@ -5,6 +5,7 @@ use generate::GeneratedTask;
 use refresh::{TaskRefresher, Timer};
 use tasktree::TreeCache;
 use chrono::NaiveDate;
+use chrono::Duration;
 use kairos::timetype::TimeType as TT;
 use kairos::iter::extensions::{Weekly, Monthly, Daily};
 
@@ -52,17 +53,17 @@ pub fn update_tasks(cache: &mut TaskCache) -> Result<()> {
             "Putze Waschbecken",
             "Wäsche sortieren und entscheiden, welche Waschgänge notwendig sind",
         ]),
-        Timer::DeadTime(TT::weeks(2)),
+        Timer::DeadTime(Duration::weeks(2)),
     )?;
     cache.reactivate(
         simple_tasks(
             vec!["Reinige Toilette", "Zehennägel schneiden"],
         ),
-        Timer::DeadTime(TT::weeks(4)),
+        Timer::DeadTime(Duration::weeks(4)),
     )?;
     cache.reactivate(
         simple_tasks(vec!["Friseurtermin machen"]),
-        Timer::DeadTime(TT::weeks(6)),
+        Timer::DeadTime(Duration::weeks(6)),
     )?;
     cache.reactivate(
         simple_tasks(vec![
diff --git a/packages/tasktree/default.nix b/home-manager/packages/tasktree/default.nix
similarity index 100%
rename from packages/tasktree/default.nix
rename to home-manager/packages/tasktree/default.nix
diff --git a/packages/tasktree/deps.nix b/home-manager/packages/tasktree/deps.nix
similarity index 100%
rename from packages/tasktree/deps.nix
rename to home-manager/packages/tasktree/deps.nix
diff --git a/homes/apollo/sleep-nag.nix b/home-manager/sleep-nag.nix
similarity index 100%
rename from homes/apollo/sleep-nag.nix
rename to home-manager/sleep-nag.nix
diff --git a/homes/charon/sort-mail.nix b/home-manager/sort-mail.nix
similarity index 100%
rename from homes/charon/sort-mail.nix
rename to home-manager/sort-mail.nix
diff --git a/home-common/taskwarrior.nix b/home-manager/taskwarrior.nix
similarity index 100%
rename from home-common/taskwarrior.nix
rename to home-manager/taskwarrior.nix
diff --git a/home-common/update-hm.nix b/home-manager/update-hm.nix
similarity index 100%
rename from home-common/update-hm.nix
rename to home-manager/update-hm.nix
diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix
index f61ee757..5dd8bf23 100644
--- a/hosts/apollo/configuration.nix
+++ b/hosts/apollo/configuration.nix
@@ -10,11 +10,14 @@ networking = {
 i18n.consoleKeyMap = "neo";
 
 imports = [
+   <home-manager/nixos>
    ./hardware-configuration.nix
    ../../modules/cdarknet
    ../../host-common/common.nix
 ];
 
+home-manager.users = {};
+
 # Use the systemd-boot EFI boot loader.
 boot = {
 	loader = {
diff --git a/homes/apollo/home.nix b/hosts/apollo/home.nix
similarity index 94%
rename from homes/apollo/home.nix
rename to hosts/apollo/home.nix
index 5b5d92f9..1693ef39 100644
--- a/homes/apollo/home.nix
+++ b/hosts/apollo/home.nix
@@ -89,6 +89,12 @@ in
     # look & feel
     libertine
     nerdfonts
+    dina-font
+    envypn-font
+    google-fonts
+    gnome3.gnome-font-viewer
+    unscii
+    xfontsel
 
     # media
     ncmpcpp
diff --git a/homes/charon/home.nix b/hosts/charon/home.nix
similarity index 100%
rename from homes/charon/home.nix
rename to hosts/charon/home.nix
diff --git a/homes/fb4/home.nix b/hosts/poseidon/home.nix
similarity index 100%
rename from homes/fb4/home.nix
rename to hosts/poseidon/home.nix
diff --git a/homes/fb4/nix-gc.nix b/hosts/poseidon/nix-gc.nix
similarity index 100%
rename from homes/fb4/nix-gc.nix
rename to hosts/poseidon/nix-gc.nix
diff --git a/homes/fb4/nix-update-channel.nix b/hosts/poseidon/nix-update-channel.nix
similarity index 100%
rename from homes/fb4/nix-update-channel.nix
rename to hosts/poseidon/nix-update-channel.nix
diff --git a/homes/fb4/syncthing.nix b/hosts/poseidon/syncthing.nix
similarity index 100%
rename from homes/fb4/syncthing.nix
rename to hosts/poseidon/syncthing.nix
diff --git a/packages/blezz/default.nix b/packages/blezz/default.nix
deleted file mode 100644
index 4d1cc8c9..00000000
--- a/packages/blezz/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ fetchFromGitHub, stdenv, libxcb, xcbutil, xcbutilwm  }:
-stdenv.mkDerivation rec {
-  name = "blezz";
-  version = "8643772";
-  src = fetchFromGitHub {
-    owner = "Blezzing";
-    repo = "blezz";
-    rev = version;
-    sha256 = "0kgbzkx49018wxli4agf2vwyq9lnin1qvh1hs6wr59384hmvrbnv";
-  };
-  buildInputs = [ libxcb xcbutil xcbutilwm ];
-   patchPhase = ''
-    grep -v /usr/lib makefile > makefile1
-    mv makefile1 makefile
-    sed s,/usr/bin/,$prefix/usr/bin/, -i makefile
-    mkdir -p $prefix/usr/bin
-  '';
-}
diff --git a/packages/rust-scripts/default.nix b/packages/rust-scripts/default.nix
deleted file mode 100644
index 6990394d..00000000
--- a/packages/rust-scripts/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ rustPlatform }:
-with rustPlatform; buildRustPackage rec {
-  name = "rust-scripts";
-  src = ./.;
-#  depsSha256 = "";
-  cargoSha256 = "0h1fimvkm05y5vi2c2baxys5scv2icf0g6bjp62p7x935y5j85ks";
-  doCheck = false;
-}
diff --git a/host-common/admin.nix b/system/admin.nix
similarity index 100%
rename from host-common/admin.nix
rename to system/admin.nix
diff --git a/host-common/common.nix b/system/common.nix
similarity index 100%
rename from host-common/common.nix
rename to system/common.nix
diff --git a/host-common/init_ssh.nix b/system/init_ssh.nix
similarity index 100%
rename from host-common/init_ssh.nix
rename to system/init_ssh.nix
diff --git a/modules/cdarknet/default.nix b/system/modules/cdarknet/default.nix
similarity index 100%
rename from modules/cdarknet/default.nix
rename to system/modules/cdarknet/default.nix
diff --git a/modules/cdarknet/hosts b/system/modules/cdarknet/hosts
similarity index 100%
rename from modules/cdarknet/hosts
rename to system/modules/cdarknet/hosts
diff --git a/modules/cdarknet/nixdark b/system/modules/cdarknet/nixdark
similarity index 100%
rename from modules/cdarknet/nixdark
rename to system/modules/cdarknet/nixdark
diff --git a/host-common/server.nix b/system/server.nix
similarity index 100%
rename from host-common/server.nix
rename to system/server.nix
diff --git a/host-common/syncthing.nix b/system/syncthing.nix
similarity index 100%
rename from host-common/syncthing.nix
rename to system/syncthing.nix