WIP: develop mail config

2026-03-16 18:21:07 +01:00 · 2019-08-18 19:16:56 +02:00
248 changed files with 2450 additions and 5973 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
+secrets.nix
 result
-.direnv
-.envrc
-.history
-.todo
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "submodules/much"]
-	path = submodules/much
-	url = git@github.com:kmein/much
--- a/.versions/home-manager.json
+++ b/.versions/home-manager.json
@@ -1,10 +0,0 @@
-{
-  "url": "https://github.com/rycee/home-manager.git",
-  "rev": "abaebf3b346c4bef500c5bd2fdebbed109261a0c",
-  "date": "2020-10-25T19:44:12+01:00",
-  "path": "/nix/store/48ki37j21zjc299b3qa6dizavw194hp8-home-manager",
-  "sha256": "1gcv2ni4nsicpmi4ain568msvgxch8cj04fxf6qgvhdklmh2y84k",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/.versions/krops.json
+++ b/.versions/krops.json
@@ -1,10 +0,0 @@
-{
-  "url": "https://cgit.krebsco.de/krops",
-  "rev": "55aa2c77ce8183f3d2b24f54efa33ab6a42e1e02",
-  "date": "2020-04-19T01:06:20+02:00",
-  "path": "/nix/store/08wg2yrcgkr6iwipjd6g0fbwb7gacqax-krops",
-  "sha256": "00rvx9h596ync8wgic6xc9srzajzm28wlp9q7mv4z0jsb27l5bj8",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/.versions/nixpkgs-unstable.json
+++ b/.versions/nixpkgs-unstable.json
@@ -1,7 +0,0 @@
-{
-  "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "0ead6f8cfd461c3a366c8bc9893037afd89f798d",
-  "date": "2020-10-27T18:30:26+01:00",
-  "sha256": "170kziw7bxfm4mwi8q5c2vdpayml0mini4zyxagbvbivivdj5hla",
-  "fetchSubmodules": false
-}
--- a/.versions/nixpkgs.json
+++ b/.versions/nixpkgs.json
@@ -1,10 +0,0 @@
-{
-  "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "edb26126d98bc696f4f3e206583faa65d3d6e818",
-  "date": "2020-10-28T21:50:33+01:00",
-  "path": "/nix/store/06cjsyh3xc41h6dfiisa3y4wxb27dd9g-nixpkgs",
-  "sha256": "1cl4ka4kk7kh3bl78g06dhiidazf65q8miyzaxi9930d6gwyzkci",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/.versions/retiolum.json
+++ b/.versions/retiolum.json
@@ -1,10 +0,0 @@
-{
-  "url": "https://github.com/krebs/retiolum",
-  "rev": "e85c778e67f640d2a6cbb36c873dd6ed24a74b97",
-  "date": "2020-11-05T23:02:13+01:00",
-  "path": "/nix/store/s17y738p8fy7vlxfavvf7ip52ms15pm6-retiolum",
-  "sha256": "16gjvms3abvfaw7plm0rdqlpd1p3677wry693narf7f08wj8in1v",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/.versions/stockholm.json
+++ b/.versions/stockholm.json
@@ -1,10 +0,0 @@
-{
-  "url": "https://cgit.krebsco.de/stockholm",
-  "rev": "a85b25865a5b4aade9e3ec97871f3e3d553199d6",
-  "date": "2020-11-10T21:07:09+01:00",
-  "path": "/nix/store/4n7vv3clsld151pyzjda0xrwxqsqmrcp-stockholm",
-  "sha256": "117n7a0094n02li325qlv2ly6v4pa186gfbvrw1plyjsl0r85i0f",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/art/.haskell-grey.png
+++ b/art/.haskell-grey.png
--- a/art/37333571_p0_master1200.jpg
+++ b/art/37333571_p0_master1200.jpg
--- a/art/55991392_p0_master1200.jpg
+++ b/art/55991392_p0_master1200.jpg
--- a/art/58991926_p0_master1200.jpg
+++ b/art/58991926_p0_master1200.jpg
--- a/art/59560674_p0_master1200.jpg
+++ b/art/59560674_p0_master1200.jpg
--- a/art/68479906_p0_master1200.jpg
+++ b/art/68479906_p0_master1200.jpg
--- a/art/69915574_p0_master1200.jpg
+++ b/art/69915574_p0_master1200.jpg
--- a/art/d7ujb9p-e1389b42-5b67-422f-8f23-ddd280a7889a.jpg
+++ b/art/d7ujb9p-e1389b42-5b67-422f-8f23-ddd280a7889a.jpg
--- a/(1).jpeg
+++ b/(1).jpeg
--- a/art/file.jpeg
+++ b/art/file.jpeg
--- a/art/sky_full_of_stars_by_baxiaart_d7vsofp-fullview.jpg
+++ b/art/sky_full_of_stars_by_baxiaart_d7vsofp-fullview.jpg
--- a/art/the_view_by_xlocky-d988pnv.jpg
+++ b/art/the_view_by_xlocky-d988pnv.jpg
--- a/art/tumblr_p3p4cdjUB61qe959eo1_1280.jpg
+++ b/art/tumblr_p3p4cdjUB61qe959eo1_1280.jpg
--- a/art/turn_into_stars_by_awanqi_d9z2go0-fullview.jpg
+++ b/art/turn_into_stars_by_awanqi_d9z2go0-fullview.jpg
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -1,46 +0,0 @@
-{ pkgs, lib, config, ... }:
-let
-  inherit (import <niveum/lib>) colours;
-  colourNames =
-    [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ];
-  colourPairs = lib.getAttrs colourNames colours;
-  alacrittyConfig = {
-    background_opacity = 0.9;
-    colors = {
-      primary = { inherit (colours) background foreground; };
-      normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
-      bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
-    };
-    font = {
-      normal.family = "Monospace";
-      size = 8;
-    };
-    key_bindings = [
-      {
-        key = "Add";
-        mods = "Control";
-        action = "IncreaseFontSize";
-      }
-      {
-        key = "Minus";
-        mods = "Control";
-        action = "DecreaseFontSize";
-      }
-      {
-        key = "Key0";
-        mods = "Control";
-        action = "ResetFontSize";
-      }
-    ];
-  };
-in {
-  environment.variables.TERMINAL = "alacritty";
-
-  environment.systemPackages = [
-    pkgs.alacritty
-  ];
-
-  home-manager.users.me.xdg.configFile = {
-    "alacritty/alacritty.yml".text = builtins.toJSON alacrittyConfig;
-  };
-}
--- a/configs/bash.nix
+++ b/configs/bash.nix
@@ -1,7 +1,6 @@
 {
  programs.bash = {
-    promptInit = ''
-      PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
+    promptInit = ''PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
    interactiveShellInit = ''
      set -o vi
    '';
--- a/configs/bluetooth.nix
+++ b/configs/bluetooth.nix
@@ -1,11 +1,16 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }:
+{
  hardware.bluetooth = {
    enable = true;
-    config.General.Enable =
-      lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ];
+    extraConfig = ''
+      [General]
+      Enable=Source,Sink,Media,Socket
+    '';
  };

  environment.systemPackages = [ pkgs.blueman ];

-  home-manager.users.me = { services.blueman-applet.enable = false; };
+  home-manager.users.me = {
+    services.blueman-applet.enable = true;
+  };
 }
--- a/configs/calcurse.nix
+++ b/configs/calcurse.nix
@@ -1,44 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  environment.systemPackages = [ pkgs.calcurse ];
-
-  systemd.services.caldav-sync = {
-    enable = true;
-    wants = [ "network-online.target" ];
-    startAt = "*:0/15";
-    serviceConfig.User = "kfm";
-    script = "${pkgs.calcurse}/bin/calcurse-caldav";
-  };
-
-  home-manager.users.me = {
-    home.file = {
-      ".calcurse/conf".text = ''
-        appearance.calendarview=monthly
-        appearance.layout=1
-        daemon.enable=no
-        daemon.log=no
-        format.inputdate=4
-        format.outputdate=%F
-        general.confirmquit=no
-        general.confirmdelete=yes
-        general.firstdayofweek=monday
-        appearance.theme=default on default
-      '';
-      ".calcurse/caldav/config".text = lib.generators.toINI {} {
-        General = {
-          Binary = "${pkgs.calcurse}/bin/calcurse";
-          Hostname = "posteo.de:8443";
-          Path = "/calendars/kieran.meinhardt/default/";
-          InsecureSSL = "No";
-          DryRun = "No";
-          Verbose = "Yes";
-        };
-        Auth = {
-          Username = "kieran.meinhardt@posteo.net";
-          Password = lib.strings.fileContents <secrets/mail/posteo>;
-        };
-      };
-    };
-  };
-
-}
--- a/configs/ccc.nix
+++ b/configs/ccc.nix
@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
-let
-  certificate = pkgs.stdenv.mkDerivation rec {
-    name = "dst-root-ca-x3.pem";
-    src = builtins.toFile "${name}.sed" ''
-      1,/DST Root CA X3/d
-      1,/-----END CERTIFICATE-----/p
-    '';
-    nativeBuildInputs = with pkgs; [ cacert gnused ];
-    phases = "installPhase";
-    installPhase = ''
-      ${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
-    '';
-  };
-in {
-  networking.wireless.networks."36C3" = {
-    auth = ''
-      key_mgmt=WPA-EAP
-      eap=TTLS
-      identity="kmein"
-      password=" "
-      ca_cert="${certificate}"
-      altsubject_match="DNS:radius.c3noc.net"
-      phase2="auth=PAP"
-    '';
-  };
-}
--- a/configs/chromium.nix
+++ b/configs/chromium.nix
@@ -1,15 +1,17 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  programs.chromium = {
    enable = true;
    extensions = [
      "hdokiejnpimakedhajhdlcegeplioahd" # LastPass
-      # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
-      # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
+      "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
+      "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
+      "iaalpfgpbocpdfblpnhhgllgbdbchmia" # asciidoctor
    ];
  };

-  environment.systemPackages = [ pkgs.chromium pkgs.brave ];
+  environment.systemPackages = [ pkgs.chromium ];

-  environment.variables.BROWSER = "brave";
+  niveum.applications.browser = "chromium";
 }
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -1,22 +1,26 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+{
  imports = [
-    <niveum/modules/seafile.nix>
-    <niveum/modules/dropbox.nix>
+    <modules/seafile.nix>
+    <modules/google-drive.nix>
+    <modules/dropbox.nix>
+    <stockholm/krebs/3modules/syncthing.nix>
  ];

-  niveum = {
-    dropbox.enable = true;
-    seafile.enable = true;
+  niveum.dropbox = {
+    enable = true;
+    user = config.users.users.me;
  };

-  system.activationScripts.home-symlinks = ''
-    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
-  '';
+  niveum.seafile = {
+    enable = true;
+    user = config.users.users.me;
+  };

-  home-manager.users.me = {
-    services.nextcloud-client.enable = true;
+  niveum.google-drive = rec {
+    enable = true;
+    directory = "${user.home}/cloud/gdrive";
+    user = config.users.users.me;
  };

  services.syncthing = rec {
@@ -25,25 +29,20 @@
    openDefaultPorts = true;
    configDir = "/home/kfm/.config/syncthing";
    dataDir = "/home/kfm/.config/syncthing";
-    declarative = rec {
-      cert = toString <system-secrets/syncthing/cert.pem>;
-      key = toString <system-secrets/syncthing/key.pem>;
-      devices = {
-        wilde.id =
-          "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
-        heym.id =
-          "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
-        manakish.id =
-          "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
-      };
-      folders =
-        let syncthing-dir = "${config.users.users.me.home}/cloud/syncthing";
-        in {
-          "${syncthing-dir}/common".devices = [ "wilde" "manakish" ];
-          "${syncthing-dir}/library".devices = lib.attrNames devices;
-          "${syncthing-dir}/mundoiu".devices = lib.attrNames devices;
-          "${syncthing-dir}/music".devices = lib.attrNames devices;
-        };
+  };
+
+  krebs.syncthing = rec {
+    enable = true;
+    key = toString <secrets/syncthing/key.pem>;
+    cert = toString <secrets/syncthing/cert.pem>;
+    peers = {
+      homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
+      scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";
+      rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
+      wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
    };
+    folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" "wilde" ];
+    folders."${config.users.users.me.home}/cloud/syncthing/library".peers = lib.attrNames peers;
+    folders."${config.users.users.me.home}/cloud/syncthing/mundoiu".peers = lib.attrNames peers;
  };
 }
--- a/configs/codimd.nix
+++ b/configs/codimd.nix
@@ -1,25 +0,0 @@
-{
-  services.nginx.virtualHosts."pad.xn--kiern-0qa.de" = {
-    enableACME = true;
-    addSSL = true;
-    locations."/".extraConfig = ''
-      client_max_body_size 4G;
-      proxy_set_header Host $host;
-      proxy_pass http://localhost:3091;
-    '';
-  };
-
-  services.codimd = {
-    enable = true;
-    configuration = {
-      allowAnonymous = false;
-      allowGravatar = false;
-      db = {
-        dialect = "sqlite";
-        storage = "/var/lib/codimd/db.codimd.sqlite";
-        useCDN = false;
-      };
-      port = 3091;
-    };
-  };
-}
--- a/configs/compton.nix
+++ b/configs/compton.nix
@@ -2,7 +2,7 @@
  services.compton = {
    enable = true;
    shadow = true;
-    menuOpacity = 0.9;
-    shadowOpacity = 0.3;
+    menuOpacity = "0.9";
+    shadowOpacity = "0.3";
  };
 }
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -1,46 +1,129 @@
-{ pkgs, lib, config, options, ... }:
-let
-  inherit (lib.strings) makeBinPath;
-  inherit (import <niveum/lib>) localAddresses kieran;
-in {
+{ pkgs, lib, config, ... }:
+{
  imports = [
+    <modules/constants.nix>
+    {
+      services.dbus.packages = [ pkgs.gnome3.dconf ];
+    }
    <home-manager/nixos>
-    <niveum/modules/system-dependent.nix>
+    # <configs/mopidy.nix>
+    <configs/bash.nix>
+    <configs/bluetooth.nix>
+    <configs/chromium.nix>
+    <configs/cloud.nix>
+    <configs/compton.nix>
+    <configs/default.nix>
+    # <configs/home-assistant.nix>
+    <configs/distrobump.nix>
+    <configs/docker.nix>
+    <configs/dunst.nix>
+    <configs/fonts.nix>
+    <configs/git.nix>
+    <configs/haskell>
+    <configs/hledger.nix>
+    <configs/htop.nix>
+    <configs/hu-berlin.nix>
+    <configs/i3.nix>
+    <configs/kdeconnect.nix>
+    <configs/keybase.nix>
+    <configs/keyboard.nix>
+    <configs/mail.nix>
+    <configs/mpv.nix>
+    <configs/nano.nix>
+    <configs/neovim.nix>
+    <configs/nixpkgs-unstable.nix>
+    <configs/packages>
+    <configs/printing.nix>
+    <configs/python.nix>
+    <configs/random-background.nix>
+    <configs/redshift.nix>
+    <configs/retiolum.nix>
+    <configs/rofi.nix>
+    <configs/sncli.nix>
+    <configs/ssh.nix>
+    <configs/sudo.nix>
+    <configs/themes/owickstrom-dark.nix>
+    <configs/theming.nix>
+    <configs/tmux.nix>
+    <configs/todo-txt.nix>
+    <configs/traadfri.nix>
+    <configs/unclutter.nix>
+    <configs/urxvt.nix>
+    <configs/vscode.nix>
+    <configs/xautolock.nix>
+    <configs/xresources.nix>
+    <configs/zsh.nix>
    {
-      boot.supportedFilesystems = [ "ntfs" ];
+      niveum.user = {
+        github = "kmein";
+        email = "kieran.meinhardt@gmail.com";
+        name = "Kierán Meinhardt";
+      };
+
+      niveum.applications = rec {
+        fileManager = "${config.niveum.applications.terminal} -e ${pkgs.ranger}/bin/ranger";
+      };
+
+      niveum.theme = {
+        gtk = { name = "Arc"; package = pkgs.arc-theme; };
+        icon = { name = "Arc"; package = pkgs.arc-icon-theme; };
+        cursor = { name = "capitaine-cursors"; package = pkgs.capitaine-cursors; };
+      };
    }
    {
-      nix.nixPath = [
-        "/var/src"
-        "nixpkgs-overlays=${toString ../overlays}"
-      ];
-    }
-    { services.dbus.packages = [ pkgs.gnome3.dconf ]; }
-    {
-      nixpkgs = {
-        config = {
-          allowUnfree = true;
-          packageOverrides = pkgs: {
-            nur = import (builtins.fetchTarball
-              "https://github.com/nix-community/NUR/archive/aea85375c7a82297d977904de8dd7f41baf2d59a.tar.gz") {
-                inherit pkgs;
+      nixpkgs.config = {
+        allowUnfree = true;
+        packageOverrides = pkgs: {
+          python3Packages = pkgs.python3Packages.override {
+            overrides = new: old: {
+              spotify-cli-linux = new.callPackage <packages/spotify-cli-linux.nix> {};
+              instaloader = new.callPackage <packages/instaloader.nix> {};
+              sncli = new.callPackage <packages/sncli.nix> {};
+            };
+          };
+          haskellPackages = pkgs.haskellPackages.override {
+            overrides = new: old: {
+              blessings = new.callPackage <packages/blessings.nix> {};
+              scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
+            };
+          };
+          git-quick-stats = pkgs.callPackage <packages/git-quick-stats.nix> {};
+          writeDash = pkgs.writers.writeDash;
+          writeDashBin = pkgs.writers.writeDashBin;
+          iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
+          nix-git = pkgs.callPackage <packages/nix-git.nix> {};
+
+          kmein = {
+            autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
+            bvg = pkgs.callPackage <packages/bvg.nix> {};
+            daybook = pkgs.callPackage <packages/daybook.nix> {};
+            font-size = pkgs.callPackage <packages/font-size.nix> { font = config.niveum.fonts.terminal; };
+            genius = pkgs.callPackage <packages/genius.nix> {};
+            instaget = pkgs.callPackage <packages/instaget.nix> {};
+            literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
+            n = pkgs.callPackage <packages/n.nix> {};
+            depp = pkgs.callPackage <packages/depp.nix> {};
+            odyssey = pkgs.callPackage <packages/odyssey.nix> {};
+            wttr = pkgs.callPackage <packages/wttr.nix> {};
+            nav = pkgs.callPackage <packages/nav.nix> {};
+            slide =
+              let slide-package = pkgs.fetchFromGitHub {
+                owner = "kmein";
+                repo = "slide";
+                rev = "0470583d22212745eab4f46076267addf4d2346c";
+                sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh";
              };
-            writeDashBin = pkgs.writers.writeDashBin;
-            writeDash = pkgs.writers.writeDash;
-            gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
-            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
-            ix = pkgs.callPackage <niveum/packages/ix.nix> { };
+              in pkgs.callPackage slide-package {};
+            haskellPackages.mnemosyne =
+              let mnemosyne-package = pkgs.fetchFromGitHub {
+                repo = "mnemosyne";
+                owner = "kmein";
+                rev = "6bfa13c88db176af80be90840ff03573d67d679f";
+                sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca";
+              };
+              in pkgs.haskellPackages.callPackage mnemosyne-package {};
          };
        };
-        overlays = [
-          (self: super: {
-            scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
-          })
-          (import <niveum/overlays/toml.nix>)
-          (import <stockholm/krebs/5pkgs/haskell>)
-          (import <stockholm/submodules/nix-writers/pkgs>)
-          (import <stockholm/krebs/5pkgs/override>)
-        ];
      };
    }
    {
@@ -48,28 +131,28 @@ in {
      boot.loader.timeout = 1;
      boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
    }
+    {
+      time.timeZone = "Europe/Berlin";
+    }
    {
      home-manager.users.me = {
        programs.zathura = {
          enable = true;
-          options = {
-            selection-clipboard = "clipboard";
-            # first-page-column = "1:1"; # makes side-by-side mode start on the left side
-          };
+          options.selection-clipboard = "clipboard";
        };
      };
    }
    {
      users.mutableUsers = false;

-      users.defaultUserShell = pkgs.zsh;
-
      users.users.me = {
        name = "kfm";
-        description = kieran.name;
-        hashedPassword =
-          "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
-        isNormalUser = true;
+        description = config.niveum.user.name;
+        home = "/home/kfm";
+        createHome = true;
+        group = "users";
+        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
+        shell = pkgs.zsh;
      };
    }
    {
@@ -85,72 +168,91 @@ in {
      environment.systemPackages = [ pkgs.pavucontrol pkgs.pamixer ];
    }
    {
-      environment.interactiveShellInit =
-        "export PATH=$PATH:$HOME/projects/niveum";
-      environment.shellAliases = let
-        wcd = pkgs.writers.writeDash "wcd" ''
-          cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
-        '';
-        where = pkgs.writers.writeDash "where" ''
-          readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
-        '';
-        take = pkgs.writers.writeDash "take" ''
-          mkdir "$1" && cd "$1"
-        '';
-        swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
-      in {
-        "ß" = "${pkgs.utillinux}/bin/setsid";
-        cat = "${pkgs.bat}/bin/bat --style=plain";
-        chromium-incognito =
-          "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
-        cp = "cp -i";
-        dig = "dig +short";
-        ip = "${pkgs.iproute}/bin/ip -c";
-        l = "${pkgs.exa}/bin/exa -s type -a";
-        la = "${pkgs.exa}/bin/exa -s type -la";
-        ll = "${pkgs.exa}/bin/exa -s type -l";
-        ls = "${pkgs.exa}/bin/exa -s type";
-        mv = "mv -i";
-        nixi = "nix repl '<nixpkgs>'";
-        ns = "nix-shell --run zsh";
+      environment.systemPackages = [
+        (pkgs.writers.writeDashBin "niveum-deploy" ''
+          NIVEUM_DIR=/home/kfm/prog/git/niveum
+
+          [ $# -eq 1 ] || echo >&2 "Usage: niveum-deploy SYSTEM"
+
+          eval $(nix-build --no-out-link "$NIVEUM_DIR/deploy.nix" -A "$1")
+        '')
+        (pkgs.writers.writeDashBin "niveum-update" ''
+          NIVEUM_DIR=/home/kfm/prog/git/niveum
+
+          nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-${config.system.stateVersion} > "$NIVEUM_DIR/nixpkgs.json"
+        '')
+      ];
+    }
+    {
+      environment.interactiveShellInit = "export PATH=$PATH:$HOME/.cargo/bin";
+      environment.shellAliases = {
+        clipboard = "${pkgs.xclip}/bin/xclip -se c";
        o = "${pkgs.xdg_utils}/bin/xdg-open";
-        pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
-        pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
-        rm = "rm -i";
-        s = "${pkgs.systemd}/bin/systemctl";
-        take = "source ${take}";
        tmux = "${pkgs.tmux}/bin/tmux -2";
-        tree = "${pkgs.exa}/bin/exa --tree";
-        sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
-        zathura = swallow "${pkgs.zathura}/bin/zathura";
-        us = "${pkgs.systemd}/bin/systemctl --user";
-        wcd = "source ${wcd}";
-        weechat = "${pkgs.openssh}/bin/ssh weechat@toum -t screen -x weechat-screen";
-        where = "source ${where}";
-        yt =
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
-        yta =
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
+        ip = "${pkgs.iproute}/bin/ip -c";
+        ns = "nix-shell --run zsh";
+        nixi = ''nix repl "<nixpkgs>"'';
+        rm = "rm -i";
+        cp = "cp -i";
+        mv = "mv -i";
+        l = "${pkgs.exa}/bin/exa -a";
+        ls = "${pkgs.exa}/bin/exa";
+        ll = "${pkgs.exa}/bin/exa -l";
+        la = "${pkgs.exa}/bin/exa -la";
+        dig = "dig +short";
      };
    }
-    { i18n.defaultLocale = "en_GB.UTF-8"; }
-    { services.illum.enable = true; }
+    {
+      networking.wireless = {
+        enable = true;
+        userControlled.enable = true;
+        networks = {
+          "Aether".pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+          "Asoziales Netzwerk".pskRaw = "8e234041ec5f0cd1b6a14e9adeee9840ed51b2f18856a52137485523e46b0cb6";
+          "EasyBox-927376".pskRaw = "dbd490ab69b39bd67cfa06daf70fc3ef3ee90f482972a668ed758f90f5577c22";
+          "FlixBus Wi-Fi" = {};
+          "FlixBus" = {};
+          "FlixTrain" = {};
+          "Libertarian WiFi".pskRaw = "e9beaae6ffa55d10e80b8a2e7d997411d676a3cc6f1f29d0b080391f04555050";
+          "Ni/Schukajlow".pskRaw = "ffc47f6829da59c48aea878a32252223303f5c47a3859edc90971ffc63346781";
+          "WIFIonICE" = {};
+          "WLAN-914742".psk = "67647139648174545446";
+          "WLAN-XVMU6T".pskRaw = "46ea807283255a3d7029233bd79c18837df582666c007c86a8d591f65fae17cc";
+          "c-base-public" = {};
+          "discord".psk = "baraustrinken";
+          "security-by-obscurity".psk = "44629828256481964386";
+        };
+      };
+
+      environment.systemPackages = [ pkgs.wpa_supplicant_gui ];
+    }
+    {
+      networking.hosts = {
+        "192.168.178.1" = [ "fritz.box" ];
+        "192.168.178.21" = [ "scardanelli" ];
+        "192.168.178.22" = [ "homeros" ];
+        "192.168.178.24" = [ "catullus" ];
+      };
+    }
+    {
+      i18n.defaultLocale = "en_GB.UTF-8";
+    }
+    {
+      services.illum.enable = true;
+    }
    {
      services.xserver = {
        enable = true;
-        displayManager = {
-          autoLogin = {
+        displayManager.lightdm = {
+          enable = true;
+          autoLogin.enable = true;
+          autoLogin.user = config.users.users.me.name;
+          greeters.gtk = {
            enable = true;
-            user = config.users.users.me.name;
-          };
-          lightdm = {
-            enable = true;
-            greeters.gtk = {
-              enable = true;
-              indicators = [ "~spacer" "~host" "~spacer" "~session" "~power" ];
-            };
+            indicators = [ "~spacer" "~host" "~spacer" "~session" "~power" ];
          };
        };
+        desktopManager.default = "none";
      };
    }
    {
@@ -159,80 +261,14 @@ in {
        pumount.source = "${pkgs.pmount}/bin/pumount";
      };
    }
-    { programs.command-not-found.enable = true; }
    {
-      programs.gnupg.agent.enable = true;
-
-      environment.systemPackages = [ pkgs.gnupg pkgs.pass ];
+      programs.command-not-found.enable = true;
    }
    {
-      services.atd.enable = true;
-    }
-    {
-      services.mingetty = {
-        greetingLine = lib.mkForce "";
-        helpLine = lib.mkForce "";
+      programs.java = {
+        enable = true;
+        package = pkgs.openjdk;
      };
    }
-    {
-      networking.hosts = lib.mapAttrs' (name: address: {
-        name = address;
-        value = [ "${name}.local" ];
-      }) localAddresses;
-    }
-    ./alacritty.nix
-    ./bash.nix
-    ./bluetooth.nix
-    ./ccc.nix
-    ./kleiter.nix
-    ./calcurse.nix
-    ./chromium.nix
-    ./cloud.nix
-    ./compton.nix
-    ./direnv.nix
-    ./distrobump.nix
-    ./docker.nix
-    ./dunst.nix
-    ./flix.nix
-    ./fonts.nix
-    ./fzf.nix
-    ./gaslight.nix
-    ./git.nix
-    ./hledger.nix
-    ./htop.nix
-    ./hu-berlin.nix
-    ./i3.nix
-    ./keybase.nix
-    ./keyboard.nix
-    ./mail.nix
-    ./mpv.nix
-    ./mime.nix
-    ./nano.nix
-    ./neovim.nix
-    ./newsboat.nix
-    ./flameshot-once.nix
-    ./packages
-    ./printing.nix
-    ./wallpaper.nix
-    ./redshift.nix
-    ./retiolum.nix
-    ./rofi.nix
-    ./spacetime.nix
-    ./ssh.nix
-    ./sshd.nix
-    ./sudo.nix
-    ./sxiv.nix
-    ./theming.nix
-    ./tmux.nix
-    ./tor.nix
-    ./todo-txt.nix
-    ./traadfri.nix
-    ./unclutter.nix
-    ./version.nix
-    ./vscode.nix
-    ./watson.nix
-    ./wifi.nix
-    ./xautolock.nix
-    ./zsh.nix
  ];
 }
--- a/configs/direnv.nix
+++ b/configs/direnv.nix
@@ -1,39 +0,0 @@
-{ pkgs, ... }:
-let
-  nixify = pkgs.writers.writeDashBin "nixify" ''
-    set -efuC
-
-    if [ ! -e ./.envrc ]; then
-      echo use_nix > .envrc
-      direnv allow
-    fi
-    if [ ! -e shell.nix ]; then
-      cat > shell.nix <<'EOF'
-    { pkgs ? import <nixpkgs> {} }:
-    pkgs.mkShell {
-      buildInputs = with pkgs; [];
-      shellHook = "export HISTFILE=''${toString ./.history}";
-    }
-    EOF
-      ''${EDITOR:-vim} shell.nix
-    fi
-  '';
-in {
-  environment.systemPackages = [ pkgs.direnv nixify ];
-
-  home-manager.users.me.programs.direnv = {
-    enable = true;
-    stdlib = builtins.readFile ("${
-        pkgs.fetchFromGitHub {
-          owner = "Mic92";
-          repo = "dotfiles";
-          rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
-          sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
-        }
-      }/home/.direnvrc");
-  };
-
-  programs.zsh.interactiveShellInit = ''
-    eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
-  '';
-}
--- a/configs/distrobump.nix
+++ b/configs/distrobump.nix
@@ -1,10 +1,13 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }:
+{
  imports = [
    (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
      inherit lib config;
-      pkgs = pkgs // { writeDash = pkgs.writers.writeDash; };
+      pkgs = pkgs // {
+        writeDash = pkgs.writers.writeDash;
+      };
    })
  ];

-  makefu.distrobump.enable = false;
+  makefu.distrobump.enable = true;
 }
--- a/configs/docker.nix
+++ b/configs/docker.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  virtualisation.docker.enable = true;
  users.users.me.extraGroups = [ "docker" ];
  environment.systemPackages = [ pkgs.docker pkgs.docker_compose ];
--- a/configs/dunst.nix
+++ b/configs/dunst.nix
@@ -1,14 +1,12 @@
 { config, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) defaultApplications colours theme;
-in {
+with config.niveum; {
  home-manager.users.me.services.dunst = {
    enable = true;
-    iconTheme = (theme pkgs).icon;
+    iconTheme = theme.icon;
    settings = {
      global = {
        transparency = 10;
-        font = "Monospace 7";
+        font = "${fonts.terminal.name} ${toString fonts.terminal.size}";
        geometry = "200x5-30+20";
        frame_color = colours.foreground;
        follow = "mouse";
@@ -20,7 +18,7 @@ in {
        separator_color = "auto";
        sort = true;
        markup = "full";
-        format = "%a\\n<b>%s</b>\\n%b";
+        format = ''%a\n<b>%s</b>\n%b'';
        alignment = "left";
        show_age_threshold = 60;
        bounce_freq = 0;
@@ -33,7 +31,7 @@ in {
        sticky_history = true;
        history_length = 20;
        dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
-        browser = (defaultApplications pkgs).browser;
+        browser = applications.browser;
        verbosity = "mesg";
        corner_radius = 0;
        mouse_left_click = "do_action";
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -1,25 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) defaultApplications;
-  flameshot-once =
-    pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
-in {
-  nixpkgs.overlays = [
-    (self: super: {
-      xwaitforwindow =
-        super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
-    })
-  ];
-
-  environment.systemPackages = [
-    (flameshot-once.override {
-      config.imgur = {
-        enable = true;
-        createUrl = "http://p.r/image";
-        deleteUrl = "http://p.r/image/delete/%1";
-        xdg-open.browser = (defaultApplications pkgs).browser;
-      };
-      config.timeout = 200;
-    })
-  ];
-}
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -1,62 +0,0 @@
-{ config, pkgs, ... }:
-let
-  flixLocation = "/media/flix";
-  cacheLocation = "/var/cache/flix";
-  indexFilename = "index";
-  flixUser = "flix";
-  flixGroup = "users";
-in {
-  fileSystems.${flixLocation} = {
-    device = "prism.r:/export";
-    fsType = "nfs";
-    options = [
-      "noauto"
-      "noatime"
-      "nodiratime"
-      "x-systemd.automount"
-      "x-systemd.device-timeout=1"
-      "x-systemd.idle-timeout=1min"
-      "x-systemd.requires=tinc.retiolum.service"
-      "x-systemd.requires=wpa_supplicant.service"
-      "user"
-      "_netdev"
-    ];
-  };
-
-  systemd.tmpfiles.rules = [
-    "d '${cacheLocation}' 0750 ${flixUser} ${flixGroup} - -"
-  ];
-
-  systemd.services.flix-index = {
-    description = "Flix indexing service";
-    wants = [ "network-online.target" ];
-    script = "cp ${flixLocation}/download/index ./${indexFilename}";
-    startAt = "hourly";
-    serviceConfig = {
-      Type = "oneshot";
-      User = flixUser;
-      Group = flixGroup;
-      WorkingDirectory = cacheLocation;
-    };
-  };
-
-  users.extraUsers.${flixUser} = {
-    isSystemUser = true;
-    createHome = true;
-    home = cacheLocation;
-    extraGroups = [ flixGroup ];
-  };
-
-  environment.systemPackages = [
-    (pkgs.writeDashBin "flixmenu" ''
-      set -efu
-      cd "${flixLocation}/download"
-
-      [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
-
-      ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" < ${cacheLocation}/${indexFilename} \
-        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
-    '')
-  ];
-
-}
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -1,35 +1,19 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
+  niveum.fonts = {
+    ui = {
+      name = "Sans";
+      size = 9;
+    };
+    terminal = {
+      name = "Monospace";
+      size = 9;
+    };
+  };
+
  fonts = {
    enableDefaultFonts = true;
    enableFontDir = true;
-    fonts = with pkgs; [
-      corefonts
-      eb-garamond
-      fira
-      font-awesome-ttf
-      ibm-plex
-      inconsolata
-      iosevka
-      libertine
-      lmodern
-      noto-fonts
-      roboto
-      roboto-mono
-      roboto-slab
-      source-code-pro
-      source-serif-pro
-      source-sans-pro
-      ubuntu_font_family
-      gfs-fonts
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
-    ];
-    fontconfig.defaultFonts = {
-      monospace = [ "JetBrains Mono" ];
-      serif = [ "Source Serif Pro" ];
-      sansSerif = [ "Source Sans Pro" ];
-      emoji = [ "JoyPixels" ];
-    };
+    fonts = with pkgs; [ corefonts eb-garamond fira libertine lmodern noto-fonts roboto ubuntu_font_family ];
  };
 }
--- a/configs/fzf.nix
+++ b/configs/fzf.nix
@@ -1,32 +0,0 @@
-{ pkgs, lib, ... }: {
-  environment = {
-    systemPackages = [ pkgs.fzf ];
-    variables = {
-      FZF_DEFAULT_OPTS =
-        lib.escapeShellArgs [ "--height=40%" "--layout=reverse" ];
-      FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
-      FZF_ALT_C_OPTS = lib.escapeShellArgs [
-        "--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
-        "--bind=space:toggle-preview"
-        "--preview-window=hidden"
-      ];
-      FZF_CTRL_T_COMMAND = "${pkgs.fd}/bin/fd --type f";
-      FZF_CTRL_T_OPTS =
-        lib.escapeShellArgs [ "--preview='${pkgs.bat}/bin/bat \"{}\"'" ];
-    };
-  };
-
-  programs.zsh.interactiveShellInit = ''
-    if [[ $options[zle] = on ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.zsh
-      . ${pkgs.fzf}/share/fzf/key-bindings.zsh
-    fi
-  '';
-
-  programs.bash.interactiveShellInit = ''
-    if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.bash
-      . ${pkgs.fzf}/share/fzf/key-bindings.bash
-    fi
-  '';
-}
--- a/configs/gaslight.nix
+++ b/configs/gaslight.nix
@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "gaslight-stream" ''
-      ${pkgs.ffmpeg}/bin/ffmpeg -r 14 -s 640x480 -f video4linux2 -i /dev/video0 -f alsa -i default -c:v libx264 -preset ultrafast -c:a aac -f avi -
-    '')
-    (pkgs.writers.writeDashBin "gaslight-say" ''
-      voices="de
-      de+whisper"
-
-      echo "$@" | ${pkgs.espeak}/bin/espeak -v "$(echo "$voices" | ${pkgs.coreutils}/bin/shuf -n1)"
-    '')
-    (pkgs.writers.writeDashBin "gaslight-play" ''
-      set -o noglob
-      ${pkgs.mpv}/bin/mpv --no-video "$1"
-    '')
-  ];
-}
-
-/*
-
-ssh machine gaslight-stream | mpv -
-ssh machine gaslight-say "blablabla"
-
-*/
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -1,64 +1,25 @@
-{ pkgs, config, lib, ... }:
-let
-  inherit (import <niveum/lib>) kieran ignorePaths;
-in
+{ pkgs, config, ... }:
 {
  environment.systemPackages = [
    pkgs.mr
    pkgs.git
-    pkgs.gitAndTools.gitflow
    pkgs.gitAndTools.hub
-    pkgs.gitAndTools.gh
    pkgs.gitAndTools.git-extras
-    pkgs.gitAndTools.git-trim
    pkgs.gitstats
    pkgs.patch
    pkgs.patchutils
+    pkgs.git-quick-stats
    pkgs.git-preview
  ];

-  environment.shellAliases = {
-    gf = "git-flow";
-    g = "git";
-  };
-
  home-manager.users.me = {
-    home.file.".mrconfig".text = let
-      prependPath = prefix:
-        lib.attrsets.mapAttrs'
-        (path: lib.attrsets.nameValuePair "${prefix}/${path}");
-      git = url: { checkout = "git clone ${url}"; };
-      github = owner: repo: git "git@github.com:${owner}/${repo}";
-      keybase = owner: repo: git "keybase://private/${owner}/${repo}";
-    in lib.generators.toINI { } ({
-      DEFAULT = { git_gc = ''git gc "$@"''; };
-    } // prependPath "projects" {
-      "menstruation.rs" = github "kmein" "menstruation.rs";
-      brockman = github "kmein" "brockman";
-      challenges = github "kmein" "challenges";
-      conlangs = github "kmein" "conlangs";
-      ledger = keybase "kmein" "ledger";
-      mahlzeit = github "kmein" "mahlzeit";
-      menstruation-telegram = github "kmein" "menstruation-telegram";
-      meteora = github "kmein" "meteora";
-      modernizr = github "kmein" "modernizr";
-      niveum = github "kmein" "niveum";
-      nixpkgs = github "NixOS" "nixpkgs";
-      poetry = github "kmein" "poetry";
-      quotes = github "kmein" "quotes";
-      sphinx = github "kmein" "sphinx";
-      stockholm = git "https://cgit.krebsco.de/stockholm";
-      telebots = github "kmein" "telebots";
-      traadfri = github "kmein" "traadfri";
-      wissen = github "kmein" "wissen";
-      zen = github "kmein" "zen";
-    });
+    home.file.".mrconfig".text = builtins.readFile <dot/mrconfig.ini>;

    programs.git = {
      enable = true;
      package = pkgs.gitAndTools.gitFull;
-      userName = kieran.name;
-      userEmail = kieran.email;
+      userName = config.niveum.user.name;
+      userEmail = config.niveum.user.email;
      aliases = {
        br = "branch";
        co = "checkout";
@@ -70,32 +31,9 @@ in
        diffs = "diff --staged";
        last = "log -1 HEAD";
        logs = "log --pretty=oneline";
-        graph =
-          "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
-      };
-      ignores = ignorePaths;
-      extraConfig = {
-        pull.ff = "only";
-        core.pager =
-          "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
-        color = {
-          ui = true;
-          diff = {
-            meta = "11";
-            frag = "magenta bold";
-            commit = "yellow bold";
-            old = "red bold";
-            new = "green bold";
-            whitespace = "red reverse";
-          };
-          diff-highlight = {
-            oldNormal = "red bold";
-            oldHighlight = "red bold 52";
-            newNormal = "green bold";
-            newHighlight = "green bold 22";
-          };
-        };
+        graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
      };
+      ignores = config.niveum.ignore;
    };
  };
 }
--- a/configs/gollum.nix
+++ b/configs/gollum.nix
@@ -0,0 +1,5 @@
+{
+  services.gollum = {
+    enable = true;
+  };
+}
--- a/configs/haskell/default.nix
+++ b/configs/haskell/default.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, ... }:
+{
+  home-manager.users.me.home.file = {
+    ".ghc/ghci.conf".text = ''
+      :set editor vim
+      :def hoogle \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --count=15 \"" ++ s ++ "\""
+      :def doc \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --info \"" ++ s ++ "\""
+      :def pl \x -> return $ ":!${pkgs.haskellPackages.pointfree}/bin/pointfree -v \"" ++ x ++ "\""
+      :set prompt "\o033[1m%s\o033[1;34m λ\o033[0m "
+      :set -Wall
+    '';
+      # :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
+    ".stack/config.yaml".text = let user = config.niveum.user; in ''
+      templates:
+        params:
+          author-name: ${user.name}
+          author-email: ${user.email}
+          copyright: 'Copyright: (c) 2019 ${user.name}'
+          github-username: ${user.github}
+    '';
+  };
+
+  services.hoogle = {
+    enable = true;
+    packages = import ./packages.nix;
+    port = 8091;
+  };
+
+  environment.systemPackages = with pkgs; [
+    cabal2nix
+    stack2nix
+    cabal-install
+    hlint
+    # haskellPackages.brittany
+    (haskellPackages.ghcWithHoogle (import ./packages.nix))
+  ] ++ map haskell.lib.justStaticExecutables [
+    haskellPackages.ghcid
+    haskellPackages.hakyll
+    # haskellPackages.hfmt
+    haskellPackages.hasktags
+    haskellPackages.hindent
+    haskellPackages.pointfree
+    # haskellPackages.pointful
+    haskellPackages.hpack
+  ];
+}
--- a/configs/packages/haskell/packages.nix
+++ b/configs/packages/haskell/packages.nix
@@ -1,5 +1,7 @@
 haskellPackages:
 with haskellPackages; [
+  blessings
+  scanner
  HTTP
  HUnit
  MissingH
@@ -57,14 +59,13 @@ with haskellPackages; [
  mono-traversable
  mtl
  network
+  pandoc
  parallel
  parsec
  persistent
  pipes
  pointed
-  pretty
  pretty-show
-  prettyprinter
  primitive
  process
  profunctors
@@ -91,6 +92,7 @@ with haskellPackages; [
  unix-time
  unordered-containers
  vector
+  vinyl
  void
  vty
  warp
--- a/configs/hass/default.nix
+++ b/configs/hass/default.nix
@@ -1,61 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  inherit (import ./lib.nix) triggers;
-  inherit (import <niveum/lib>) localAddresses;
-in
-{
-  imports = [
-    ./zigbee.nix
-    ./frontend.nix
-  ];
-
-  services.home-assistant = {
-    enable = true;
-    configWritable = true;
-    lovelaceConfigWritable = true;
-    openFirewall = true;
-    config = {
-      homeassistant = {
-        name = "Toum";
-        latitude = config.location.latitude;
-        longitude = config.location.longitude;
-        elevation = 90; # TODO find out how high I live
-        unit_system = "metric";
-        time_zone = config.time.timeZone;
-      };
-      config = {};
-      discovery = {};
-      system_health = {};
-      history = {};
-      # tradfri.host = localAddresses.tradfri; # dont use until python3Packages.pytradfri is packaged
-      sun = {};
-      mobile_app = {};
-      shopping_list = {};
-      sensor = [
-        {
-          platform = "dwd_weather_warnings";
-          region_name = "Berlin";
-        }
-      ];
-      mqtt = {
-        broker = "localhost";
-        port = 1883;
-        client_id = "home-assistant";
-        username = "albrecht";
-        password = lib.strings.fileContents <system-secrets/mosquitto>;
-        keepalive = 60;
-        protocol = "3.1";
-
-        discovery = true;
-        birth_message = {
-          topic = "/hass/status";
-          payload = "online";
-        };
-        will_message = {
-          topic = "/hass/status";
-          payload = "offline";
-        };
-      };
-    };
-  };
-}
--- a/configs/hass/frontend.nix
+++ b/configs/hass/frontend.nix
@@ -1,37 +0,0 @@
-let
-  inherit (import ./lib.nix) triggers;
-in
-{
-  services.home-assistant.config = {
-    frontend = {
-      themes = {
-        day_theme = import ./themes/clear.nix;
-        night_theme = import ./themes/clear-dark.nix;
-      };
-    };
-    automation = [
-      {
-        alias = "Night Theme";
-        hide_entity = true;
-        trigger = triggers.night;
-        action = [
-          {
-            service = "frontend.set_theme";
-            data.name = "night_theme";
-          }
-        ];
-      }
-      {
-        alias = "Day Theme";
-        hide_entity = true;
-        trigger = triggers.day;
-        action = [
-          {
-            service = "frontend.set_theme";
-            data.name = "day_theme";
-          }
-        ];
-      }
-    ];
-  };
-}
--- a/configs/hass/lib.nix
+++ b/configs/hass/lib.nix
@@ -1,16 +0,0 @@
-{
-  triggers = {
-    night = {
-      platform = "numeric_state";
-      entity_id = "sun.sun";
-      value_template = "{{ state.attributes.elevation }}";
-      below = -4.0;
-    };
-    day = {
-      platform = "numeric_state";
-      entity_id = "sun.sun";
-      value_template = "{{ state.attributes.elevation }}";
-      above = 0;
-    };
-  };
-}
--- a/configs/hass/themes/clear-dark.nix
+++ b/configs/hass/themes/clear-dark.nix
@@ -1,72 +0,0 @@
-rec {
-# Colors
- text-color = "#DADADB"; # Grey text
- text-medium-light-color = "#A0A2A8"; # Medium-light grey text
- text-medium-color = "#80828A"; # Medium grey text
- text-dark-color = "#6A6B74"; # Dark grey text
- accent-color = "#008bef"; # Blue
- accent-medium-color = "#2484C9"; # Decent blue
- background-color = "#3b4049"; # Dark grey background
- background-color-2 = "#484E59"; # Light grey background
- background-card-color = "#434952"; # Grey background
- border-color = "#383C46"; # Grey border
-
- # Header
- app-header-background-color = "#363941"; # Background color
-
- # Text
- primary-color = text-color;
- text-primary-color = text-color;
-
- # Left Menu
- paper-listbox-background-color = background-color; # Background
- sidebar-icon-color = text-medium-color; # icons
- sidebar-selected-icon-color = text-medium-light-color; # Selected row icon and background (15%)
- sidebar-selected-text-color = text-color; # Selected row label
-
- # UI
- paper-card-header-color = text-color; # Title in settings
- primary-background-color = background-color; # Background (also title background in left menu)
- mdc-theme-primary = accent-medium-color; # Action Buttons (save, restart etc.)
- card-background-color = background-card-color; # Entity Registry Background
-
- # Card
- paper-card-background-color = background-card-color; # Background
- dark-primary-color = text-color;
- primary-text-color = text-color;
- paper-listbox-color = text-color;
- light-primary-color = text-dark-color;
- secondary-text-color = text-medium-color;
- disabled-text-color = text-dark-color;
- paper-dialog-button-color = text-color;
- secondary-background-color = background-color-2; # Background more info title
-
- # Icons
- paper-item-icon-color = text-dark-color; # Off
- paper-item-icon-active-color = accent-color; # On
-
- # Switches
- switch-checked-button-color = text-medium-light-color; # Knob On
- switch-unchecked-button-color = text-medium-light-color; # Knob Off
- switch-checked-track-color = "#009FFF"; # Background On
- switch-unchecked-track-color = "#767682"; # Background Off
-
- # Slider
- paper-slider-active-color = accent-color; # Line On
- paper-slider-knob-color = text-medium-light-color; # Knob On
- paper-slider-container-color = text-dark-color; # Line Off
- paper-slider-knob-start-color = text-medium-light-color; # Knob Off
-
- # Badges
- label-badge-text-color = text-color;
- label-badge-background-color = "rgba(54, 57, 65, 0.6)";
-
- # Shadows
- ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
-
- # HACS
- hacs-badge-color = accent-color; # New Badge
- hacs-status-installed = text-color; # Installed Icon
- hacs-status-pending-restart = text-dark-color; # Restart Icon
- hacs-status-pending-update = accent-color;
-}
--- a/configs/hass/themes/clear.nix
+++ b/configs/hass/themes/clear.nix
@@ -1,52 +0,0 @@
-rec {
-  text-color = "#636B75"; # Grey text
-  text-medium-color = "#8c96a5"; # Medium grey text
-  text-light-color = "#BAC0C6"; # Light grey text
-  accent-color = "#00a1ff"; # Blue
-  background-color = "#F7F8F9"; # Light grey background
-  background-color-2 = "#F4F5F6"; # Light grey background
-  background-card-color = "rgba(255,255,255,1.0)"; # White background
-  border-color = "#E8E8E8"; # Light grey border
-
-  # Header
-  primary-color = text-color; # Background
-  text-primary-color = "#FFF"; # Text
-
-  # Left Menu
-  paper-listbox-background-color = background-color; # Background
-  # TODO = Text and Icons
-
-  # UI
-  paper-card-header-color = text-color; # Title in settings
-  primary-background-color = background-color; # Background color (also title background in left menu)
-
-  # Card
-  paper-card-background-color = background-card-color; # Background
-  dark-primary-color = text-color;
-  primary-text-color = text-color;
-  paper-listbox-color = text-color;
-  light-primary-color = text-light-color;
-  secondary-text-color = text-medium-color;
-  disabled-text-color = text-light-color;
-  paper-dialog-button-color = text-color;
-  secondary-background-color = background-color-2; # Background more info title
-
-  # Icons
-  paper-item-icon-color = text-light-color; # Off
-  paper-item-icon-active-color = accent-color; # On
-
-  # Switches
-  switch-checked-button-color = "#FFF"; # Knob On
-  switch-unchecked-button-color = "#FFF"; # Knob Off
-  switch-checked-track-color = "#0077FF"; # Background On
-  switch-unchecked-track-color = disabled-text-color; # Background Off
-
-  # Slider
-  paper-slider-active-color = accent-color; # Line On
-  paper-slider-container-color = "#e5e7ea"; # Line Off
-  paper-slider-knob-color = text-light-color; # Knob On
-  paper-slider-knob-start-color = text-light-color; # Knob Off
-
-  # Shadows
-  ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
-}
--- a/configs/hass/zigbee.nix
+++ b/configs/hass/zigbee.nix
@@ -1,102 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  inherit (import <niveum/lib>) localAddresses;
-in
-{
-  services.zigbee2mqtt = {
-    enable = true;
-    config = {
-      permit_join = false;
-      homeassistant = true;
-      serial = {
-        port = "/dev/ttyACM0";
-        disable_led = true;
-      };
-      mqtt = {
-        discovery = true;
-        base_topic = "zigbee";
-        server = "mqtt://${localAddresses.toum}";
-        user = "albrecht";
-        password = lib.strings.fileContents <system-secrets/mosquitto>;
-      };
-    };
-  };
-
-  services.mosquitto = {
-    enable = true;
-    host = "0.0.0.0";
-    allowAnonymous = false;
-    checkPasswords = true;
-    users."albrecht" = {
-      password = lib.strings.fileContents <system-secrets/mosquitto>;
-      acl = [ "topic readwrite #" ];
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 1883 ];
-
-  environment.systemPackages = [ pkgs.mosquitto ];
-
-  services.home-assistant = {
-    config = {
-      switch = [
-        {
-          platform = "mqtt";
-          name = "zigbee2mqtt_join";
-          state_topic = "/zigbee2mqtt/bridge/config/permit_join";
-          command_topic = "/zigbee2mqtt/bridge/config/permit_join";
-          payload_on = "true";
-          payload_off = "false";
-        }
-      ];
-      timer.zigbee_permit_join = {
-        name = "Zigbee Time remaining";
-        duration = 120;
-      };
-      automation = [
-        # Automation to start timer when enable join is turned on
-        {
-          id = "zigbee_join_enabled";
-          alias = "";
-          hide_entity = "true";
-          trigger = {
-            platform = "state";
-            entity_id = "switch.zigbee2mqtt_join";
-            to = "on";
-          };
-          action = {
-            service = "timer.start";
-            entity_id = "timer.zigbee_permit_join";
-          };
-        }
-        # Automation to stop timer when switch turned off and turn off switch when timer finished
-        {
-          id = "zigbee_join_disabled";
-          hide_entity = "true";
-          trigger = [
-            {
-              platform = "event";
-              event_type = "timer.finished";
-              event_data.entity_id = "timer.zigbee_permit_join";
-            }
-            {
-              platform = "state";
-              entity_id = "switch.zigbee2mqtt_join";
-              to = "off";
-            }
-          ];
-          action = [
-            {
-              service = "timer.cancel";
-              data.entity_id = "timer.zigbee_permit_join";
-            }
-            {
-              service = "switch.turn_off";
-              entity_id = "switch.zigbee2mqtt_join";
-            }
-          ];
-        }
-      ];
-    };
-  };
-}
--- a/configs/hledger.nix
+++ b/configs/hledger.nix
@@ -1,14 +1,15 @@
-{ config, pkgs, ... }: {
-  imports = [ <niveum/modules/hledger.nix> ];
+{ config, pkgs, ... }:
+{
+  imports = [ <modules/hledger.nix> ];

  niveum.hledger = {
    enable = true;
-    ledgerFile = "$HOME/projects/ledger/all.journal";
+    ledgerFile = "$HOME/prog/git/ledger/current.journal";
    server = {
      enable = false;
      user = config.users.users.me;
-      package = pkgs.hledger-web;
+      package = pkgs.unstable.hledger-web;
    };
-    package = pkgs.hledger;
+    package = pkgs.unstable.hledger;
  };
 }
--- a/configs/home-assistant.nix
+++ b/configs/home-assistant.nix
@@ -0,0 +1,7 @@
+{
+  services.home-assistant = {
+    enable = true;
+    configWritable = true;
+    lovelaceConfigWritable = true;
+  };
+}
--- a/configs/htop.nix
+++ b/configs/htop.nix
@@ -23,22 +23,10 @@
      updateProcessNames = false;
      meters = {
        left = [
-          {
-            kind = "LeftCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "RightCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "Memory";
-            mode = 1;
-          }
-          {
-            kind = "Swap";
-            mode = 1;
-          }
+          { kind = "LeftCPUs2"; mode = 1; }
+          { kind = "RightCPUs2"; mode = 1; }
+          { kind = "Memory"; mode = 1; }
+          { kind = "Swap"; mode = 1; }
        ];
        right = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
      };
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -1,10 +1,8 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 let
-  inherit (lib.strings) fileContents;
-  inherit (import <niveum/lib>) sshPort;
  eduroam = {
-    identity = fileContents <secrets/eduroam/identity>;
-    password = fileContents <secrets/eduroam/password>;
+    identity = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/identity>);
+    password = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/password>);
  };
  eduroamAuth = ''
    key_mgmt=WPA-EAP
@@ -14,13 +12,10 @@ let
    anonymous_identity="anonymous@wlan.hu-berlin.de"
    altsubject_match="DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de"
    password="${eduroam.password}"
-    ca_cert="${
-      pkgs.fetchurl {
-        url =
-          "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
-        sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
-      }
-    }"
+    ca_cert="${pkgs.fetchurl {
+      url = https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem;
+      sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
+    }}"
    phase2="auth=PAP"
  '';
 in {
@@ -29,57 +24,20 @@ in {
    eduroam.auth = eduroamAuth;
  };

-  fileSystems."/mnt/moodle" = {
-    device = "moodle@toum.r:/var/lib/moodle";
-    fsType = "fuse.sshfs";
-    options = [
-      "IdentityFile=/root/.ssh/id_rsa"
-      "Port=${toString sshPort}"
-      "_netdev"
-      "allow_other"
-      "default_permissions"
-      "gid=100"
-      "idmap=user"
-      # "noatime"
-      "noauto"
-      # "nodiratime"
-      "x-systemd.nofail"
-      "reconnect"
-      "ro"
-      "uid=1000"
-      "x-systemd.automount"
-      "x-systemd.device-timeout=1s"
-      "x-systemd.idle-timeout=1min"
-      "x-systemd.mount-timeout=1s"
-      "x-systemd.requires=tinc.retiolum.service"
-      "x-systemd.requires=wpa_supplicant.service"
-    ];
-  };
-
-
-  environment.systemPackages = [
-    pkgs.sshfsFuse
-
-    (pkgs.writers.writeDashBin "hu-vpn" ''
-      ${pkgs.openfortivpn}/bin/openfortivpn -p "${eduroam.password}" -c ${pkgs.writeText "hu-berlin.config" ''
-        host = forti-ssl.vpn.hu-berlin.de
-        port = 443
-        trusted-cert = e5a7d56543002ffe1e8962caa5fd6d94053aa702381458247b670877a66f3c6f
-        username = ${eduroam.identity}
-      ''}
-    '')
-  ];
-
-  services.openvpn.servers.hu-berlin = {
-    autoStart = false;
-    authUserPass = {
-      username = eduroam.identity;
-      password = eduroam.password;
+  services.openvpn.servers = {
+    hu-berlin = {
+      config = ''
+        config ${pkgs.fetchurl {
+          url = https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn;
+          sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
+        }}
+        # route-nopull
+        # route 141.20.0.0 255.255.0.0
+      '';
+      authUserPass = {
+        username = eduroam.identity;
+        password = eduroam.password;
+      };
    };
-    config = fileContents (pkgs.fetchurl {
-      url =
-        "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
-      sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
-    });
  };
 }
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -1,142 +1,56 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (import <niveum/lib>) defaultApplications colours;
-  klem = import <niveum/packages/scripts/klem.nix> {
-    inherit pkgs lib;
-    config.scripts = {
-      "p.r" = pkgs.writers.writeDash "p.r" ''
-        ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
-          | ${pkgs.coreutils}/bin/tail --lines=1 \
-          | ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
-      '';
-      "ix.io" = pkgs.writers.writeDash "ix.io" ''
-        ${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
-      '';
-      "go.r" = pkgs.writers.writeDash "go.r" ''
-        ${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
-      '';
-      "0x0.st" = pkgs.writers.writeDash "0x0.st" ''
-        ${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
-      '';
-      "rot13" = pkgs.writers.writeDash "rot13" ''
-        ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
-      '';
-      "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${pkgs.scripts.ipa}/bin/ipa
-      '';
-      "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${pkgs.scripts.betacode}/bin/betacode
-      '';
-    };
-  };
-
-  new-workspace = pkgs.writers.writeDash "new-workspace" ''
+  new-workspace = pkgs.unstable.writers.writeDash "new-workspace" ''
    i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
  '';
-  move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
+  move-to-new-workspace = pkgs.unstable.writers.writeDash "new-workspace" ''
    i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
  '';
-
-  # https://github.com/LukeSmithxyz/voidrice/blob/9fe6802122f6e0392c7fe20eefd30437771d7f8e/.local/bin/dmenuunicode
-  emoji-menu = let
-    emoji-file = pkgs.fetchurl {
-      url =
-        "https://raw.githubusercontent.com/LukeSmithxyz/voidrice/master/.local/share/larbs/emoji";
-      sha256 = "03fv69ah8msh2j6i3lm4sdkckqq8jwn1kj43j98dh0xjpzazsy46";
-    };
-  in with pkgs;
-  writers.writeDashBin "emoji-menu" ''
-    PATH=${lib.makeBinPath [ coreutils dmenu gnused libnotify xclip xdotool ]}
-    chosen=$(cut -d ';' -f1 ${emoji-file} | dmenu -i -l 10 | sed "s/ .*//")
-
-    [ "$chosen" != "" ] || exit
-
-    echo "$chosen" | tr -d '\n' | xclip -selection clipboard
-
-    if [ -n "$1" ]; then
-      xdotool key Shift+Insert
-    else
-      notify-send --app-name="emoji-menu" "'$chosen' copied to clipboard." &
-    fi
-  '';
-
-in {
+in with config.niveum; {
  services.xserver = {
-    displayManager.defaultSession = "none+i3";
-    windowManager.i3 = {
-      enable = true;
-      package = pkgs.i3-gaps;
-    };
+    windowManager.default = "i3";
+    windowManager.i3.enable = true;
  };

  home-manager.users.me.xsession.windowManager.i3 = {
    enable = true;
    config = rec {
-      fonts = [ "Monospace 10" ];
+      fonts = [ "${config.niveum.fonts.ui.name} ${toString config.niveum.fonts.ui.size}" ];
      modifier = "Mod4";
      window = {
        titlebar = false;
        border = 1;
        hideEdgeBorders = "smart";
-        commands = [
-          {
-            criteria = { class = "floating"; };
-            command = "floating enable";
-          }
-          {
-            criteria = { class = "fzfmenu"; };
-            command = "floating enable";
-          }
-          {
-            criteria = { class = "mpv"; };
-            command = lib.strings.concatStringsSep ", " [
-              "floating enable"
-              "sticky enable"
-              "fullscreen disable"
-              "resize set 640 480"
-              "move position mouse"
-            ];
-          }
-        ];
      };
-      gaps.inner = 4;
      floating = {
        titlebar = false;
        border = 1;
      };
-      colors = let
-        scheme = {
-          background = colours.background;
-          text = colours.foreground;
+      colors =
+        let scheme = { background = colours.background; text = colours.foreground; };
+        in rec {
+          focused = scheme // {
+            border = colours.background;
+            indicator = colours.background;
+            childBorder = colours.background;
+          };
+          focusedInactive = focused;
+          unfocused = focused;
+          urgent = scheme // {
+            border = colours.red.bright;
+            indicator = colours.red.bright;
+            childBorder = colours.red.bright;
+          };
+          placeholder = scheme // {
+            border = colours.green.bright;
+            indicator = colours.green.bright;
+            childBorder = colours.green.bright;
+          };
        };
-      in rec {
-        focused = scheme // {
-          border = colours.foreground;
-          indicator = colours.foreground;
-          childBorder = colours.foreground;
-        };
-        unfocused = scheme // {
-          border = colours.background;
-          indicator = colours.background;
-          childBorder = colours.background;
-        };
-        focusedInactive = unfocused;
-        urgent = scheme // {
-          border = colours.red.bright;
-          indicator = colours.red.bright;
-          childBorder = colours.red.bright;
-        };
-        placeholder = scheme // {
-          border = colours.green.bright;
-          indicator = colours.green.bright;
-          childBorder = colours.green.bright;
-        };
-      };
      bars = [{
        workspaceButtons = false;
-        fonts = [ "Monospace 8" ];
-        mode = "hide"; # "dock"
-        position = "bottom";
+        fonts = [ "${config.niveum.fonts.terminal.name} ${toString config.niveum.fonts.terminal.size}" ];
+        mode = "hide";
        colors = rec {
          background = colours.background;
          separator = background;
@@ -147,121 +61,108 @@ in {
            text = colours.foreground;
          };
        };
-        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
-            pkgs.writeTOML (import <niveum/lib/i3status-rust.nix> {
-              inherit (config.niveum) batteryName wirelessInterface;
-              inherit colours;
-              inherit pkgs;
-            })
-          }";
+        statusCommand = "${pkgs.i3status}/bin/i3status -c ${pkgs.writeText "i3status.conf" ''
+          general {
+            colors = true
+            color_good = "${colours.green.dark}"
+            color_bad = "${colours.red.dark}"
+            color_degraded = "${colours.white.dark}"
+            interval = 5
+            separator = " "
+          }
+
+          # order += "run_watch retiolum"
+          order += "path_exists openvpn"
+          order += "wireless ${networkInterfaces.wireless}"
+          order += "battery all"
+          order += "volume master"
+          order += "load"
+          order += "tztime local"
+
+          wireless ${networkInterfaces.wireless} {
+            format_up = "%essid"
+            format_down = "offline"
+          }
+
+          # run_watch retiolum {
+          #   pidfile = "/var/run/tinc.retiolum.pid"
+          #   format = "%title"
+          # }
+
+          path_exists openvpn {
+            path = "/proc/sys/net/ipv4/conf/tun0"
+            format = "%title"
+          }
+
+          battery all {
+            format = "%status%percentage"
+            format_down = "No battery"
+            status_chr = "↑"
+            status_bat = "↓"
+            status_unk = ""
+            status_full = "↯"
+            path = "/sys/class/power_supply/BAT%d/uevent"
+            low_threshold = 15
+            threshold_type = "percentage"
+            integer_battery_capacity = true
+          }
+
+          volume master {
+            format = "%volume"
+            format_muted = "%volume"
+            device = "default"
+            mixer = "Master"
+            mixer_idx = 0
+          }
+
+          tztime local {
+            format = "%Y-%m-%d %H:%M"
+          }
+
+          load {
+            format = "%1min"
+          }''}";
      }];
-      modes.resize = {
-        "Escape" = ''mode "default"'';
-        "Return" = ''mode "default"'';
-        "h" = "resize shrink width 10 px or 5 ppt";
-        "j" = "resize grow height 10 px or 5 ppt";
-        "k" = "resize shrink height 10 px or 5 ppt";
-        "l" = "resize grow width 10 px or 5 ppt";
-      };
      keybindings = {
-        "${modifier}+Shift+h" = "move left";
-        "${modifier}+Shift+j" = "move down";
-        "${modifier}+Shift+k" = "move up";
-        "${modifier}+Shift+l" = "move right";
+        "${modifier}+Down" = "focus down";
+        "${modifier}+Left" = "focus left";
+        "${modifier}+Return" = "exec ${applications.terminal}";
+        "${modifier}+Right" = "focus right";
+        "${modifier}+Shift+Down" = "move down";
+        "${modifier}+Shift+Left" = "move left";
+        "${modifier}+Shift+Right" = "move right";
+        "${modifier}+Shift+Up" = "move up";
+        "${modifier}+Shift+b" = "move window to workspace prev";
+        "${modifier}+Shift+c" = "reload";
+        "${modifier}+Shift+n" = "move window to workspace next";
+        "${modifier}+Shift+q" = "kill";
+        "${modifier}+Shift+r" = "restart";
+        "${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
+        "${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
+        "${modifier}+Shift+z" = "floating toggle";
+        "${modifier}+Up" = "focus up";
+        "${modifier}+a" = "exec ${pkgs.rofi}/bin/rofi -display-window — -show window";
+        "${modifier}+b" = "workspace prev";
+        "${modifier}+c" = "split h";
+        "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -display-run — -show run";
+        "${modifier}+e" = "layout toggle split";
+        "${modifier}+f" = "fullscreen toggle";
        "${modifier}+h" = "focus left";
        "${modifier}+j" = "focus down";
        "${modifier}+k" = "focus up";
        "${modifier}+l" = "focus right";
-
-        "${modifier}+Menu" = "exec ${klem}/bin/klem";
-
-        "${modifier}+Shift+b" = "move window to workspace prev";
-        "${modifier}+Shift+n" = "move window to workspace next";
-        "${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
-        "${modifier}+b" = "workspace prev";
        "${modifier}+n" = "workspace next";
-        "${modifier}+x" = "exec --no-startup-id ${new-workspace}";
-
-        "${modifier}+Shift+c" = "reload";
-        "${modifier}+Shift+q" = "kill";
-        "${modifier}+Shift+r" = "restart";
-
-        "${modifier}+Shift+s" = "sticky toggle";
-        "${modifier}+Shift+z" = "floating toggle";
-        "${modifier}+c" = "split h";
-        "${modifier}+e" = "layout toggle split";
-        "${modifier}+f" = "fullscreen toggle";
+        "${modifier}+p" = "exec ${pkgs.rofi-pass}/bin/rofi-pass";
        "${modifier}+r" = "mode resize";
        "${modifier}+s" = "layout stacking";
+        "${modifier}+t" = "exec ${applications.fileManager}";
        "${modifier}+v" = "split v";
        "${modifier}+w" = "layout tabbed";
-
-        # "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
-        "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
-        "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
-        "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
-
-        "${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
-        "${modifier}+a" =
-          "exec --no-startup-id ${pkgs.rofi}/bin/rofi -display-window — -show window";
-        "${modifier}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
-        "${modifier}+Shift+d" = "exec ${
-            pkgs.writers.writeDash "notemenu" ''
-              set -efu
-              PATH=$PATH:${
-                lib.makeBinPath [ pkgs.dmenu pkgs.findutils pkgs.coreutils ]
-              }
-
-              cd ~/notes
-              note_file=$(find . -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2 | dmenu -i)
-              if test "$note_file"
-              then
-                i3-sensible-terminal -e "$EDITOR" "$note_file"
-              fi
-            ''
-          }";
-        "${modifier}+p" = "exec --no-startup-id ${pkgs.pass}/bin/passmenu -l 5";
-        "${modifier}+u" = "exec ${emoji-menu}/bin/emoji-menu";
-
-        "${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
-        "${modifier}+F8" = "exec ${pkgs.xorg.xkill}/bin/xkill";
-        "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
-        "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
-        "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
-
-        "Print" = "exec flameshot-once";
-        "XF86AudioLowerVolume" =
-          "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
+        "${modifier}+x" = "exec --no-startup-id ${new-workspace}";
+        "${modifier}+y" = "exec ${applications.browser}";
+        "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
        "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
-        "XF86AudioRaiseVolume" =
-          "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
-        "XF86Calculator" =
-          "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
-        "XF86AudioPause" =
-          "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl pause";
-        "XF86AudioPlay" =
-          "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl play-pause";
-        "XF86AudioNext" =
-          "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
-        "XF86AudioPrev" =
-          "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
-        "XF86ScreenSaver" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
-
-        "XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";
-
-        # key names detected with xorg.xev:
-        # XF86WakeUp (fn twice)
-        # XF86Battery (fn f3)
-        # XF86Sleep (fn f4) - actually suspends
-        # XF86WLAN
-        # XF86WebCam (fn f6)
-        # XF86TouchpadToggle (fn f8)
-        # XF86Suspend (fn f12) - actually suspends to disk
-        # Num_Lock (fn Roll) - numlocks
-        # XF86Audio{Prev,Next,Mute,Play,Stop}
-        # XF86Forward
-        # XF86Back
-        # XF86Launch1 (thinkvantage)
+        "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
      };
    };
  };
--- a/configs/kdeconnect.nix
+++ b/configs/kdeconnect.nix
@@ -1,13 +1,7 @@
 {
  networking.firewall = {
-    allowedTCPPortRanges = [{
-      from = 1714;
-      to = 1764;
-    }];
-    allowedUDPPortRanges = [{
-      from = 1714;
-      to = 1764;
-    }];
+    allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
+    allowedUDPPortRanges = [ { from = 1714; to = 1764; } ];
  };

  home-manager.users.me = {
--- a/configs/keybase.nix
+++ b/configs/keybase.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
  services.keybase.enable = true;

  services.kbfs = {
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -1,17 +1,11 @@
-{ pkgs, lib, ... }:
-let commaSep = builtins.concatStringsSep ",";
-in {
+with import <lib>;
+{
  services.xserver = {
-    layout = commaSep [ "de" "gr" ];
-    xkbVariant = commaSep [ "T3" "polytonic" ];
-    xkbOptions =
-      commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
+    layout = commaSep [ "de" "gr" "ru" ];
+    xkbVariant = commaSep [ "T3" "polytonic" "phonetic_winkeys" ];
+    xkbOptions = commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
    libinput.enable = true;
  };

-  console.keyMap = "de";
-
-  # improve held key rate
-  services.xserver.displayManager.sessionCommands =
-    "${pkgs.xorg.xset}/bin/xset r rate 300 50";
+  i18n.consoleKeyMap = "de";
 }
--- a/configs/kleiter.nix
+++ b/configs/kleiter.nix
@@ -1,13 +0,0 @@
-{ ... }:
-let ssid = "Kleiter Gast";
-in {
-  networking.wireless.networks.${ssid}.psk = "Kleiter-Gast";
-
-  # fix dns
-  systemd.network.networks.kleiter = {
-    dns = [ "8.8.8.8" "8.8.4.4" ];
-    networkConfig.DHCP = "yes";
-    matchConfig.Name = "wlp3s0";
-    matchConfig.SSID = ssid;
-  };
-}
--- a/configs/mail.nix
+++ b/configs/mail.nix
@@ -1,245 +1,58 @@
-{ config, pkgs, lib, ... }:
-let
-  inherit (import <niveum/lib>) kieran;
-
-  nixpkgs-much = import (pkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "7c2a362b58a1c2ba72d24aa3869da3b1a91d39e1";
-    sha256 = "0gl4xndyahasa9dv5mi3x9w8s457wl2xh9lcldizcn1irjvkrzs4";
-  }) {
-    overlays = [
-      (import <stockholm/krebs/5pkgs/haskell>)
-    ];
-  };
-  much-pkg = nixpkgs-much.haskellPackages.callCabal2nix "much" <niveum/submodules/much> {};
-  much = nixpkgs-much.haskell.lib.dontHaddock much-pkg;
-
-  tagRules = [
-    {
-      query = "to:miaengiadina-pwa@noreply.github.com AND subject:\"PR run failed\"";
-      tags = [ "-new" "+deleted" ];
-    }
-    {
-      query = lib.concatStringsSep " OR " [
-        "from:noreply-local-guides@google.com"
-        "from:google-maps-noreply@google.com"
-        "subject:fd-noti"
-        "from:nebenan.de"
-        "to:miaengiadina-pwa@noreply.github.com"
-      ];
-      tags = [ "-new" ];
-    }
-    {
-      query = "tag:new";
-      tags = [ "-new" "+inbox" ];
-    }
-  ];
-
-  # turns out we have to escape $ because, if the password contains a $, it will get interpolated as a variable by the msmtp `passwordeval` which does: `bash -c "COMMAND; echo"`
-  pass_ = file: "echo ${lib.escape ["$"] (lib.escapeShellArg (lib.strings.fileContents file))}";
-
-  generateTaggingScript = filters:
-    let
-      template = { tags, query, message ? "tagging ${query} -> ${lib.concatStringsSep " " tags}", ... }: ''
-        echo '${message}'
-        ${pkgs.notmuch}/bin/notmuch tag ${lib.concatStringsSep " " tags} -- "${query}"
-      '';
-    in lib.concatStringsSep "\n" (map template filters);
-
-  enableDefaults = lib.recursiveUpdate {
-    mbsync = {
-      enable = true;
-      create = "both";
-      expunge = "both";
-    };
-    msmtp.enable = true;
-    notmuch.enable = true;
-  };
-
-  mail-sync = pkgs.writers.writeDashBin "mail-sync" ''
-    ${pkgs.isync}/bin/mbsync --all
-    ${pkgs.notmuch}/bin/notmuch new
-  '';
-in {
-  environment.variables.NOTMUCH_CONFIG = config.home-manager.users.me.home.sessionVariables.NOTMUCH_CONFIG;
-
-  systemd.services.mail-sync = {
-    enable = true;
-    wants = [ "network-online.target" ];
-    startAt = "*:0/15";
-    serviceConfig.User = "kfm";
-    serviceConfig.Type = "oneshot";
-    environment.NOTMUCH_CONFIG = config.home-manager.users.me.home.sessionVariables.NOTMUCH_CONFIG;
-    script = ''
-      export PATH=${lib.makeBinPath [ pkgs.muchsync pkgs.notmuch mail-sync ]}
-      mail-sync
-      muchsync
-    '';
-  };
-
+{ config, pkgs, ... }:
+{
  environment.systemPackages = [
+    pkgs.notmuch
+    pkgs.offlineimap
+    pkgs.msmtp
    pkgs.neomutt
-
-    pkgs.notmuch-addrlookup
-
-    mail-sync
-
-    pkgs.muchsync
-
-    (pkgs.writers.writeDashBin "mua" ''
-      if [ $# -eq 0 ]; then
-        ${much}/bin/much-kmein
-      else
-        ${much}/bin/much-kmein -q "$*"
-      fi
-    '')
-
-    (pkgs.writers.writeDashBin "mail-clean" ''
-      ${pkgs.notmuch}/bin/notmuch search --output files --format=text0 tag:deleted | ${pkgs.findutils}/bin/xargs -r0 rm
-      ${pkgs.notmuch}/bin/notmuch new
-    '')
  ];
-
-
  home-manager.users.me = {
-    services.muchsync.remotes =
-    let
-      muchsyncConfig = host: {
-        name = host;
-        value = {
-          frequency = "*:0/10";
-          remote.host = host;
-          remote.checkForModifiedFiles = false;
-          local.checkForModifiedFiles = false;
-          # don't run `notmuch new` locally nor remotely because muchsync is only regularly run after `mail-sync`
-          remote.importNew = false;
-          local.importNew = false;
-        };
-      };
-    in lib.listToAttrs (map muchsyncConfig [
-      "wilde"
-      "manakish"
-    ]);
-
-    programs.msmtp.enable = true;
-
-    programs.mbsync.enable = true;
-
-    programs.notmuch = {
+    programs.astroid = {
      enable = true;
-      new.tags = [ "new" ];
-      search.excludeTags = [ "deleted" "spam" ];
-      hooks.postNew = generateTaggingScript tagRules;
-      extraConfig.muchsync.and_tags = "inbox;unread";
+      externalEditor = "urxvt -embed %3 -e nvim %1";
+      pollScript = "offlineimap";
    };

    accounts.email.maildirBasePath = "${config.users.users.me.home}/mail";

-    accounts.email.accounts = {
-      fysi = enableDefaults {
-        primary = false;
-        smtp = {
-          host = "smtp.fastmail.com";
-          port = 465;
-          tls.enable = true;
-        };
-        imap = {
-          host = "imap.fastmail.com";
-          port = 993;
-          tls.enable = true;
-        };
-        userName = "kieran@fysi.tech";
-        address = "kieran@fysi.tech";
-        realName = kieran.name;
-        passwordCommand = pass_ <secrets/mail/fastmail>;
-      };
-      cock = enableDefaults {
-        primary = false;
-        smtp = {
-          host = "mail.cock.li";
-          port = 587;
-          tls = {
-            enable = true;
-            useStartTls = true;
-          };
-        };
-        imap = {
-          host = "mail.cock.li";
-          port = 993;
-          tls.enable = true;
-        };
-        userName = "2210@cock.li";
-        address = "2210@cock.li";
-        realName = "2210";
-        passwordCommand = pass_ <secrets/mail/cock>;
-      };
-      kieran-gmail = enableDefaults {
-        primary = false;
-        flavor = "gmail.com";
-        address = "kieran.meinhardt@gmail.com";
-        realName = kieran.name;
-        userName = "kieran.meinhardt";
-        passwordCommand = pass_ <secrets/mail/gmail/kieran.meinhardt>;
-        folders = {
-          drafts = "[Gmail]/Entw&APw-rfe";
-          sent = "[Gmail]/Gesendet";
-          trash = "[Gmail]/Papierkorb";
-        };
-      };
-      amroplay = enableDefaults {
-        primary = false;
-        flavor = "gmail.com";
-        address = "amroplay@gmail.com";
-        realName = kieran.name;
-        userName = "amroplay";
-        passwordCommand = pass_ <secrets/mail/gmail/amroplay>;
-        folders = {
-          drafts = "[Gmail]/Drafts";
-          sent = "[Gmail]/Sent Mail";
-          trash = "[Gmail]/Bin";
-        };
-      };
-      posteo = enableDefaults {
-        primary = true;
-        smtp = {
-          host = "posteo.de";
-          port = 587;
-          tls = {
-            enable = true;
-            useStartTls = true;
-          };
-        };
-        imap = {
-          host = "posteo.de";
-          port = 993;
-          tls.enable = true;
-        };
-        address = "kieran.meinhardt@posteo.net";
-        realName = kieran.name;
-        userName = "kieran.meinhardt@posteo.net";
-        passwordCommand = pass_ <secrets/mail/posteo>;
-      };
-      hu-berlin = enableDefaults {
-        primary = false;
-        address = "meinhark@hu-berlin.de";
-        realName = kieran.name;
-        userName = "meinhark";
-        passwordCommand = pass_ <secrets/eduroam/password>;
-        smtp = {
-          host = "mailhost.cms.hu-berlin.de";
-          port = 25;
-          tls = {
-            enable = true;
-            useStartTls = true;
-          };
-        };
-        imap = {
-          host = "mailbox.cms.hu-berlin.de";
-          port = 993;
-          tls.enable = true;
-        };
+    accounts.email.accounts.amroplay = {
+      astroid.enable = true;
+      address = "amroplay@gmail.com";
+      userName = "amroplay";
+      flavor = "gmail.com";
+      realName = config.niveum.user.name;
+      msmtp.enable = true;
+      notmuch.enable = true;
+      offlineimap = {
+        enable = true;
+        postSyncHookCommand = "notmuch new";
      };
    };
+
+    accounts.email.accounts.hu-berlin = {
+      astroid.enable = true;
+      address = "meinhark@hu-berlin.de";
+      userName = "meinhark";
+      realName = config.niveum.user.name;
+      imap = {
+        host = "mailbox.cms.hu-berlin.de";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "mailhost.cms.hu-berlin.de";
+        port = 25;
+        tls.enable = true;
+      };
+      msmtp.enable = true;
+      notmuch.enable = true;
+      offlineimap = {
+        enable = true;
+        postSyncHookCommand = "notmuch new";
+      };
+      primary = true;
+    };
+
+    programs.offlineimap.enable = true;
  };
 }
--- a/configs/matterbridge.nix
+++ b/configs/matterbridge.nix
@@ -1,53 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
-  config = {
-    general = {
-      RemoteNickFormat = "[{NOPINGNICK}] ";
-      Charset = "utf-8";
-    };
-    telegram.kmein.Token = bridgeBotToken;
-    irc.freenode = {
-      Server = "irc.freenode.net:6667";
-      Nick = "tg_bridge";
-    };
-    gateway = [
-      {
-        name = "krebs-bridge";
-        enable = true;
-        inout = [
-          {
-            account = "irc.freenode";
-            channel = "#krebs";
-          }
-          {
-            account = "telegram.kmein";
-            channel = "-330372458";
-          }
-        ];
-      }
-      {
-        name = "myengadin-bridge";
-        enable = true;
-        inout = [
-          {
-            account = "irc.freenode";
-            channel = "##myengadin";
-          }
-          {
-            account = "telegram.kmein";
-            channel = "-425759153";
-          }
-        ];
-      }
-    ];
-  };
-in
-{
-  nixpkgs.overlays = [ (import <niveum/overlays/toml.nix>) ];
-
-  services.matterbridge = {
-    enable = true;
-    configPath = toString (pkgs.writeTOML config);
-  };
-}
--- a/configs/mime.nix
+++ b/configs/mime.nix
@@ -1,26 +0,0 @@
-{
-  home-manager.users.me = {
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/epub+zip" = "org.pwmt.zathura.desktop";
-        "application/pdf" = "org.pwmt.zathura.desktop";
-        "application/vnd.oasis.opendocument.text" = "writer.desktop";
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
-        "image/jpeg" = "sxiv.desktop";
-        "image/png" = "sxiv.desktop";
-        "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
-        "text/html" = "brave-browser.desktop";
-        "text/markdown" = "nvim.desktop";
-        "text/plain" = "nvim.desktop";
-        "x-scheme-handler/about" = "brave-browser.desktop";
-        "x-scheme-handler/http" = "brave-browser.desktop";
-        "x-scheme-handler/https" = "brave-browser.desktop";
-        "x-scheme-handler/mailto" = "brave-browser.desktop";
-        "x-scheme-handler/unknown" = "brave-browser.desktop";
-        "x-scheme-handler/webcal" = "brave-browser.desktop";
-      };
-
-    };
-  };
-}
--- a/configs/moodle-dl.nix
+++ b/configs/moodle-dl.nix
@@ -1,64 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  inherit (import <niveum/lib>) kieran;
-
-  moodle-dl = pkgs.callPackage <niveum/packages/moodle-dl> {};
-
-  moodle-dl-config = {
-    telegram = {
-      token = lib.strings.fileContents <system-secrets/telegram/moodle-dl.token>;
-      chat_id = "18980945";
-      send_error_msg = true;
-    };
-    token = lib.strings.fileContents <system-secrets/moodle.token>;
-    moodle_domain = "moodle.hu-berlin.de";
-    moodle_path = "/";
-    download_course_ids = [
-      99881 # Dialektologie
-      100183 # Onomastik
-      100353 # Sanskrit I
-      100692 # Sanskrit Tutorium
-      99832 # Germanisch
-      99823 # Gotisch
-      99813 # Altalbanisch
-      98681 # Geistliche Lyrik von Luther bis Lehnert
-      99667 # Antike Mythologie
-    ];
-    download_submissions = true;
-    download_descriptions = false;
-    download_links_in_descriptions = false;
-    download_databases = false;
-    download_forums = false;
-    download_linked_files = false;
-    download_also_with_cookie = false;
-  };
-
-  moodle-dl-json = pkgs.writeText "moodle-dl.json" (builtins.toJSON moodle-dl-config);
-in
-{
-  users.extraUsers.moodle = {
-    isNormalUser = false;
-    home = "/var/lib/moodle";
-    createHome = true;
-    openssh.authorizedKeys.keys = [
-      # for sshfs mount
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtIFmbspaBHaSkLEx43V0uaVd7l9NUFiwt2VOP++KzLjvRMLkyF2hg2HjmogTjUvTyoDs7RHwEH/cHZlJ5JQkM1jRqQpnYwGfkZEwYvmXAl6LY9+vQMP36gNPfXmKX3y3LelO7oD2uhUs0guTtg0tHUyN5/UY5u+VinyD6djxDkHaCUn3S7CS/odBcs/4flXT654wsvzgYicnSKH9R4W+7C0YsckZ/NoIkA4jnuwtWZYWrUkxd4/290buX6pAc5+zVVZqyy0sI4i8s6pO9RL5W7xvYt+w+U0u0dMxm5ckiRmLVKfIbMN4YtDxsZbZDajlQ1nDbOsEsrSXWz4H4cSNot7J820x1qh5SSxL4GSQlcT+6xCFk9kKyflxoS3oLoPLttx3rmOMkZKJWxF/IKLW47orxV6wkG5mHxdeR3cf6jX4j3nkwFVyC9R+WG4w2Z4vKONVE7uWGYU3y4OpR1e6MGHVShkNKqEvC/Kjcc/6v7I7AKRAuPZB0WEw36tA65/8= root@wilde"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFFPHt+FPQ6gq8Ev65YsBZrafdtpWGpCNnlVvy67S1BK root@manakish"
-    ];
-    useDefaultShell = true;
-  };
-
-  system.activationScripts.moodle-dl-config = "ln -sfn ${toString moodle-dl-json} ${config.users.extraUsers.moodle.home}/config.json";
-
-  systemd.services.moodle-dl = {
-    enable = true;
-    startAt = "hourly";
-    serviceConfig = {
-      Type = "oneshot";
-      User = config.users.extraUsers.moodle.name;
-      WorkingDirectory = config.users.extraUsers.moodle.home;
-    };
-    wants = [ "network-online.target" ];
-    script = "${moodle-dl}/bin/moodle-dl";
-  };
-}
--- a/configs/mopidy.nix
+++ b/configs/mopidy.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+let secrets = import <dot/secrets.nix>;
+in {
+  services.mopidy = {
+    enable = true;
+    extensionPackages = [
+      pkgs.mopidy-gmusic
+      pkgs.mopidy-iris
+      pkgs.mopidy-moped
+      pkgs.mopidy-mopify
+      pkgs.mopidy-soundcloud
+      pkgs.mopidy-spotify
+      pkgs.mopidy-spotify-tunigo
+      pkgs.mopidy-youtube
+    ];
+    configuration = ''
+      [mpd]
+      hostname = ::
+
+      [spotify]
+      username = ${secrets.spotify.username}
+      password = ${secrets.spotify.password}
+      client_id = ${secrets.spotify.clientId}
+      client_secret = ${secrets.spotify.clientSecret}
+
+      [soundcloud]
+      auth_token = ${secrets.soundcloud.authToken}
+    '';
+  };
+}
--- a/configs/mpd.nix
+++ b/configs/mpd.nix
@@ -1,28 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  playlists = import <niveum/lib/playlists.nix>;
-  playlistFiles = lib.mapAttrs (name: {tracks, ...}: pkgs.writeText "${name}.m3u" (builtins.concatStringsSep "\n" (map ({url, ...}: url) tracks))) playlists;
-  linkPlaylist = name: file: ''
-    ln -sfn "${toString file}" "/var/lib/mpd/playlists/${name}.m3u"
-  '';
-  linkPlaylists = lib.concatStringsSep "\n" (lib.mapAttrsToList linkPlaylist playlistFiles);
-in
-{
-  system.activationScripts.mpd-playlists = ''
-    rm -rf /var/lib/mpd/playlists
-    install -d /var/lib/mpd/playlists
-    ${linkPlaylists}
-  '';
-
-  environment.systemPackages = [ pkgs.ncmpcpp pkgs.mpc_cli ];
-
-  services.mpd.enable = true;
-  services.ympd.enable = true;
-
-  # dont let anyone outside localhost or local network in
-  networking.firewall.extraCommands = let ympdPort = config.services.ympd.webPort; in ''
-    ${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -s 192.168.0.0/16 -j ACCEPT
-    ${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -s 127.0.0.0/8 -j ACCEPT
-    ${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -j DROP
-  '';
-}
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -1,25 +1,17 @@
-{ pkgs, ... }: let
-  swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
-in {
-  environment.shellAliases.mpv = swallow "mpv";
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.mpv pkgs.mpv-poll ];

-  home-manager.users.me = {
-    programs.mpv = {
-      enable = true;
-      config = {
-        force-window = "yes";
-        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
-      };
-      bindings = {
-        "Alt+RIGHT" = "add video-rotate 90";
-        "Alt+LEFT" = "add video-rotate -90";
-        "Alt+-" = "add video-zoom -0.25";
-        "Alt+=" = "add video-zoom 0.25";
-        "Alt+l" = "add video-pan-x -0.05";
-        "Alt+h" = "add video-pan-x 0.05";
-        "Alt+k" = "add video-pan-y 0.05";
-        "Alt+j" = "add video-pan-y -0.05";
-      };
-    };
+  home-manager.users.me.xdg.configFile = {
+    "mpv/input.conf".text = ''
+      Alt+RIGHT add video-rotate 90
+      Alt+LEFT add video-rotate -90
+      Alt+- add video-zoom -0.25
+      Alt+= add video-zoom 0.25
+      Alt+l add video-pan-x -0.05
+      Alt+h add video-pan-x 0.05
+      Alt+k add video-pan-y 0.05
+      Alt+j add video-pan-y -0.05
+    '';
  };
 }
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -1,77 +1,109 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
  environment.shellAliases.vi = "nvim";
  environment.shellAliases.vim = "nvim";
  environment.shellAliases.view = "nvim -R";

-  nixpkgs.config.packageOverrides = pkgs: {
-    vimPlugins = pkgs.vimPlugins // {
-      cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> { };
-      vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> { };
-      vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> { };
-      vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> { };
-      icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> { };
-      todo-txt-vim = pkgs.callPackage <niveum/packages/vimPlugins/todo-txt-vim.nix> { };
-      jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> { };
-      vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> { };
-      vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> { };
-      vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> { };
-    };
-  };
-
  environment.systemPackages = [
    (pkgs.neovim.override {
      configure = {
-        customRC = builtins.readFile <niveum/lib/vim/init.vim>;
+        customRC = builtins.readFile <dot/vimrc>;
        packages.nvim = with pkgs.vimPlugins; {
-          start = [
-            # cheat-sh-vim
-            # deoplete-nvim
-            # vim-abolish
+          start = with pkgs.vimPlugins; [
            ale
+            deoplete-nvim
            fzf-vim
            fzfWrapper
-            goyo
            supertab
-            undotree
            tabular
-            vimwiki
-            vim-256noir
-            vim-colors-paramount
+            vim-abolish
            vim-commentary
-            vim-css-color
            vim-eunuch
-            vim-fetch
            vim-fugitive
            vim-gitgutter
-            vim-pandoc
-            vim-pandoc-syntax # vim-pandoc-after
+            vim-pandoc vim-pandoc-after vim-pandoc-syntax
            vim-repeat
            vim-sensible
-            # vim-startify
+            vim-startify
            vim-surround
-            vim-mail
+            (pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+              name = "vim-fetch";
+              src = pkgs.fetchFromGitHub {
+                owner = "wsdjeg";
+                repo = "vim-fetch";
+                rev = "76c08586e15e42055c9c21321d9fca0677442ecc";
+                sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz";
+              };
+            })
+            (pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+              name = "vim-colors-paramount";
+              src = pkgs.fetchFromGitHub {
+                owner = "owickstrom";
+                repo = "vim-colors-paramount";
+                rev = "a5601d36fb6932e8d1a6f8b37b179a99b1456798";
+                sha256 = "0rjn9vjb0xrxbiqyfclda2ridcbl3nfn4svs32mvmv8als6crncg";
+              };
+            })
+            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+              name = "vim-256noir";
+              src = pkgs.fetchFromGitHub {
+                owner = "andreasvc";
+                repo = "vim-256noir";
+                rev = "e8668a18a4a90272c1cae87e655f8bddc5ac3665";
+                sha256 = "1kpn379f5dgbsgb73g6d1nlmz9vz0j3ihi500mcdx4yg56fvkr0x";
+              };
+            })
          ];
          opt = [
            csv
            dhall-vim
            elm-vim
-            emmet-vim
            haskell-vim
-            icalendar-vim
            idris-vim
-            jq-vim
-            purescript-vim
            rust-vim
-            todo-txt-vim
            typescript-vim
-            vim-fsharp
            vim-javascript
-            vim-ledger
            vim-nix
-            vim-reason-plus
            vim-toml
            vimtex
+            vim-ledger
+            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+              name = "todo.txt-vim";
+              src = pkgs.fetchFromGitHub {
+                owner = "freitass";
+                repo = "todo.txt-vim";
+                rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
+                sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
+              };
+            })
+            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+              name = "jq.vim";
+              src = pkgs.fetchFromGitHub {
+                owner = "vito-c";
+                repo = "jq.vim";
+                rev = "5baf8ed192cf267d30b84e3243d9aab3d4912e60";
+                sha256 = "1ykaxlli7b9wmhr8lpdalqxh7l4940jwhwm9pwlraga425h4r6z4";
+              };
+            })
+            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+              name = "vim-fsharp";
+              src = pkgs.fetchFromGitHub {
+                owner = "fsharp";
+                repo = "vim-fsharp";
+                rev = "627db7d701747e8fd7924b6505c61e16a369fb72";
+                sha256 = "00hhgn2p54faysx1ddccyhl9jnvddgxsczhv0np3mgzza6ls4838";
+              };
+            })
+            (pkgs.vimUtils.buildVimPluginFrom2Nix {
+              name = "emmet-vim";
+              src = pkgs.fetchFromGitHub {
+                owner = "mattn";
+                repo = "emmet-vim";
+                rev = "d698f1658770ca5fa58c87e80421c8d65bbe9065";
+                sha256 = "0vl4267hh8g1vkvc3awlqyypgz4m1r43d47sldl80yamiafiviaj";
+              };
+            })
          ];
        };
      };
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,73 +0,0 @@
-{ pkgs, config, ... }:
-let
-  ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
-
-  newsboat-home =
-    "${config.users.users.me.home}/cloud/syncthing/common/newsboat";
-  linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
-
-  newsboat-config = pkgs.writeText "config" ''
-    auto-reload no
-    prepopulate-query-feeds yes
-
-    # dont keep a search history
-    history-limit 0
-
-    datetime-format %F
-
-    text-width 85
-
-    external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler-bin} {}'"
-    browser ${linkhandler-bin}
-    macro , open-in-browser
-    macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler-bin}
-    macro v set browser "${pkgs.utillinux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler-bin}
-    macro y set browser "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata" ; open-in-browser ; set browser ${linkhandler-bin}
-
-    bind-key j down
-    bind-key k up
-    bind-key j next articlelist
-    bind-key k prev articlelist
-    bind-key J next-feed articlelist
-    bind-key K prev-feed articlelist
-    bind-key G end
-    bind-key g home
-    bind-key d pagedown
-    bind-key u pageup
-    bind-key l open
-    bind-key h quit
-    bind-key a toggle-article-read
-    bind-key n next-unread
-    bind-key N prev-unread
-    bind-key D pb-download
-    bind-key U show-urls
-    bind-key x pb-delete
-
-    save-path ${newsboat-home}/saved/
-
-    highlight all "---.*---" yellow default
-    highlight feedlist ".*(0/0))" black default
-    highlight article "^Title:.*" yellow default bold
-    highlight article "^Author:.*" yellow default
-    highlight article "^Flags:.*" red default
-    highlight article "\\[[0-9][0-9]*\\]" color66 default bold
-    highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
-    highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold
-
-    color background white default
-    color listnormal white default
-    color listnormal_unread white default bold
-    color listfocus blue default
-    color listfocus_unread blue default bold
-    color info red default bold
-    color article white default
-  '';
-in {
-  nixpkgs.config.packageOverrides = pkgs: {
-    newsboat = pkgs.writers.writeDashBin "newsboat" ''
-      ${pkgs.newsboat}/bin/newsboat -C ${newsboat-config} -c ${newsboat-home}/cache.db -u ${newsboat-home}/urls "$@"
-    '';
-  };
-
-  environment.systemPackages = [ pkgs.newsboat ];
-}
--- a/configs/nextcloud.nix
+++ b/configs/nextcloud.nix
@@ -1,55 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  inherit (import <niveum/lib>) localAddresses;
-in
-{
-  services.nextcloud = {
-    enable = true;
-    package = pkgs.nextcloud20;
-
-    https = true;
-
-    autoUpdateApps = {
-      enable = true;
-      startAt = "05:00:00";
-    };
-
-    hostName = "cloud.xn--kiern-0qa.de";
-
-    config = {
-      overwriteProtocol = "https";
-
-      dbtype = "pgsql";
-      dbuser = "nextcloud";
-      dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
-      dbname = "nextcloud";
-      dbpass = lib.strings.fileContents <system-secrets/nextcloud/database>;
-      adminpass = lib.strings.fileContents <system-secrets/nextcloud/admin>;
-      adminuser = "admin";
-      # extraTrustedDomains = [ "toum.r" ];
-    };
-  };
-
-  services.postgresql = {
-    enable = true;
-    ensureDatabases = [ "nextcloud" ];
-    ensureUsers = [
-      {
-        name = "nextcloud";
-        ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
-      }
-    ];
-  };
-
-
-  services.nginx.virtualHosts."cloud.xn--kiern-0qa.de" = {
-    enableACME = true;
-    addSSL = true;
-  };
-
-  # Ensure that postgres is running before running the setup
-  systemd.services."nextcloud-setup" = {
-    requires = ["postgresql.service"];
-    after = ["postgresql.service"];
-  };
-}
--- a/configs/nixpkgs-unstable.nix
+++ b/configs/nixpkgs-unstable.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  nixpkgs.config.packageOverrides = pkgs: {
+    unstable = import <nixos-unstable> {
+      config = config.nixpkgs.config;
+    };
+  };
+}
--- a/configs/packages/default.nix
+++ b/configs/packages/default.nix
@@ -1,144 +1,107 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }:
+{
  imports = [
    ./krebs.nix
+    ./programming.nix
    ./writing.nix
-    ./python.nix
-    ./haskell
    {
-      environment.systemPackages = let
-        # nightly = pkgs.rustChannelOf {
-        #   date = "2019-12-27";
-        #   channel = "nightly";
-        # };
-      in with pkgs; [
-        htmlTidy
-        nodePackages.csslint
-        nodePackages.jsonlint
-        nodePackages.prettier
-        nodePackages.typescript
-        nodePackages.yarn
-        nodejs
-        nodePackages.javascript-typescript-langserver
-
-        tokei # count lines of code
-        gnumake
-        binutils # for strip, ld, ...
-        # nightly.rust
-        shellcheck
+      environment.systemPackages = with pkgs; [
+      ] ++ [ # internet
+        aria2
+        firefox
+        tor-browser-bundle-bin
+        thunderbird
+        tdesktop
+        w3m
+        wget
+        httpie
+        whois
+        ddgr
+        python3Packages.instaloader
+        mtr # my traceroute
+      ] ++ [ # media
+        ffmpeg
+        imagemagick
+        sxiv
+      ] ++ [ # archive
+        unzip
+        unrar
+        p7zip
+        zip
+      ] ++ [ # monitor
+        htop
+        iotop
+        iftop
+        lsof
+        psmisc
+      ] ++ [ # shell
+        bat
+        dos2unix
+        ncdu
+        du-dust
+        fd
+        file
+        jq # json manipulation
+        jo # json creation
+        kmein.nav # json navigation
+        xsv
+        xmlstarlet
+        manpages
+        posix_man_pages
+        moreutils
+        ranger
+        ripgrep
+        rlwrap
+        progress # display progress bars for pipes
+        up # universal plumber (piping tool)
+      ] ++ [ # hardware
+        usbutils
+        pciutils
+        lshw
+      ] ++ [ # graphical
+        arandr
+        libnotify
+        xclip
+        xorg.xkill
+      ] ++ [ # programming
+        nix-prefetch-git
+      ] ++ [ # media
+        audacity
+        calibre
+        inkscape
+        xpdf
+        pdfgrep
+        pdftk
+        spotify
+        python3Packages.spotify-cli-linux
+        youtubeDL
+      ] ++ [ # math
+        bc
+      ] ++ [ # shell
+        (pass.withExtensions (ext: [ext.pass-otp]))
+        fzf
+        gnupg
+        kmein.haskellPackages.mnemosyne
+        kmein.autorenkalender
+        kmein.bvg
+        kmein.daybook
+        kmein.depp
+        kmein.font-size
+        kmein.genius
+        kmein.instaget
+        kmein.literature-quote
+        kmein.n
+        kmein.odyssey
+        kmein.wttr
+        kmein.slide
+        memo
+        nix-git
+        par
+        qrencode
+        unstable.hugo
+        unstable.zola
+        wtf
      ];
    }
  ];
-
-  environment.systemPackages = with pkgs; [
-    # INTERNET
-    aria2
-    firefox
-    tdesktop
-    w3m
-    wget
-    httpie
-    whois
-    ddgr
-    ix
-    nur.repos.kmein.python3Packages.instaloader
-    dnsutils
-    # mtr # my traceroute
-    # FILE MANAGERS
-    ranger
-    gnome3.nautilus
-    # MEDIA
-    ffmpeg
-    imagemagick
-    scrot
-    # ARCHIVE TOOLS
-    unzip
-    unrar
-    p7zip
-    zip
-    # MONITORS
-    htop
-    iotop # I/O load monitor
-    iftop # interface bandwidth monitor
-    lsof # list open files
-    psmisc # for killall, pstree
-    # SHELL
-    bat # better cat
-    du-dust # better du
-    fd # better find
-    file # determine file type
-    dos2unix
-    trash-cli
-    ncdu # ncurses disk usage
-    python3Packages.jsonschema # json validation
-    jq # json toolkit
-    jo # json creation
-    xsv # csv toolkit
-    xmlstarlet # xml toolkit
-    manpages
-    posix_man_pages
-    # moreutils # for parallel, sponge, combine
-    parallel # for parallel, since moreutils shadows task spooler
-    ripgrep # better grep
-    rlwrap
-    progress # display progress bars for pipes
-    up # universal plumber (piping tool)
-    # HARDWARE TOOLS
-    usbutils # for lsusb
-    pciutils # for lspci
-    lshw # for lshw
-    arandr # xrandr for noobs
-    libnotify # for notify-send
-    xclip # clipboard CLI
-    dragon-drop # drag and drop
-    xorg.xkill # kill by clicking
-    audacity
-    calibre
-    inkscape
-    zoom-us # video conferencing
-    pdfgrep # search in pdf
-    pdftk # pdf toolkit
-    evince # for viewing pdf annotations
-    xournal # for annotating pdfs
-    youtubeDL
-    bc # calculator
-    scripts.default-gateway
-    scripts.showkeys-toggle
-    scripts.favicon
-    scripts.ipa # XSAMPA to IPA converter
-    scripts.betacode # ancient greek betacode to unicode converter
-    nur.repos.kmein.mahlzeit
-    # nur.repos.kmein.slide
-    nur.repos.kmein.vimv
-    scripts.swallow # window swallowing
-    scripts.genius
-    scripts.instaget
-    scripts.literature-quote
-    scripts.nav # json navigation
-    scripts.n
-    scripts.notetags
-    scripts.booksplit
-    scripts.dmenurandr
-    scripts.interdimensional-cable
-    scripts.dmenubluetooth
-    scripts.manual-sort
-    scripts.much-scripts
-    scripts.dns-sledgehammer
-    ts
-    scripts.vg
-    scripts.fkill
-    scripts.wttr
-    # kmein.slide
-    scripts.tolino-screensaver
-    nix-prefetch-git
-    scripts.nix-git
-    nixfmt
-    par
-    qrencode
-    wtf
-
-    spotify
-    spotify-tui
-    playerctl
-  ];
-
 }
--- a/configs/packages/haskell/default.nix
+++ b/configs/packages/haskell/default.nix
@@ -1,46 +0,0 @@
-{ config, pkgs, ... }: {
-  home-manager.users.me.home.file = {
-    ".ghc/ghci.conf".text = ''
-      :set editor vim
-      :def hoogle \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --count=15 \"" ++ s ++ "\""
-      :def doc \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --info \"" ++ s ++ "\""
-      :set prompt "\o033[1m%s\o033[1;34m λ\o033[0m "
-      :set -Wall
-      :set -XOverloadedStrings
-    '';
-    # :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
-      # :def pl \x -> return $ ":!${pkgs.haskellPackages.pointfree}/bin/pointfree -v \"" ++ x ++ "\""
-    ".stack/config.yaml".text = let inherit (import <niveum/lib>) kieran;
-    in builtins.toJSON {
-      templates.params = {
-        author-name = kieran.name;
-        author-email = kieran.email;
-        copyright = "Copyright: (c) 2020 ${kieran.name}";
-        github-username = kieran.github;
-      };
-    };
-  };
-
-  services.hoogle = {
-    enable = false;
-    packages = import ./packages.nix;
-    port = 8091;
-  };
-
-  environment.systemPackages = with pkgs;
-    [
-      cabal2nix
-      cabal-install
-      hlint
-      haskellPackages.brittany
-      # haskellPackages.hfmt
-      (haskellPackages.ghcWithHoogle (import ./packages.nix))
-    ] ++ map haskell.lib.justStaticExecutables [
-      haskellPackages.ghcid
-      haskellPackages.hasktags
-      # haskellPackages.hindent
-      # haskellPackages.pointfree
-      # haskellPackages.pointful
-      haskellPackages.hpack
-    ];
-}
--- a/configs/packages/krebs.nix
+++ b/configs/packages/krebs.nix
@@ -1,24 +1,19 @@
 { lib, pkgs, ... }:
-let
-  krebs-packages = pkgs: {
-    dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> { };
-    yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> { };
-    acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> { };
-    urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> { };
-    mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> { };
-    untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> { };
-    kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> { };
-    krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> { };
-    bepasty-client-cli =
-      pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> { };
-    irc-announce =
-      pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> { };
-    git-preview =
-      pkgs.callPackage <stockholm/krebs/5pkgs/simple/git-preview> { };
-  };
+let krebs-packages = pkgs: {
+  dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> {};
+  yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> {};
+  acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> {};
+  urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> {};
+  mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> {};
+  untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
+  kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
+  krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> {};
+  bepasty-client-cli = pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> {};
+  irc-announce = pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {};
+  git-preview = pkgs.callPackage <stockholm/krebs/5pkgs/simple/git-preview> {};
+};
 in {
  nixpkgs.config.packageOverrides = krebs-packages;

-  environment.systemPackages =
-    map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
+  environment.systemPackages = map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
 }
--- a/configs/packages/programming.nix
+++ b/configs/packages/programming.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+{
+  imports = [
+    {
+      environment.systemPackages = with pkgs; [
+        htmlTidy
+        nodePackages_10_x.csslint
+        nodePackages_10_x.jsonlint
+        nodePackages_10_x.prettier
+        nodePackages_10_x.typescript
+        nodePackages_10_x.yarn
+        nodejs-10_x
+      ];
+    }
+  ];
+
+  environment.systemPackages = with pkgs; [
+    tokei # count lines of code
+    gnumake
+    gcc
+    binutils # strip, ld, ...
+    iolanguage
+    ruby
+    rubocop
+    rustup
+    shellcheck
+  ];
+}
--- a/configs/packages/python.nix
+++ b/configs/packages/python.nix
@@ -1,23 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = [
-    (pkgs.python3.withPackages (py: [
-      py.black
-      py.python-language-server
-      py.pyls-mypy
-      py.pyls-black
-      py.pyls-isort
-      py.flake8
-      py.flask
-      py.pygments
-      py.docopt
-      py.schema
-      py.ansicolors
-      py.virtualenv
-    ]))
-  ];
-
-  home-manager.users.me.xdg.configFile."pycodestyle".text = ''
-    [pycodestyle]
-    max-line-length = 110
-  '';
-}
--- a/configs/packages/writing.nix
+++ b/configs/packages/writing.nix
@@ -1,79 +1,17 @@
-{ pkgs, lib, config, ... }:
-let
-  inherit (import <niveum/lib>) nixpkgs-unstable;
-
-  unstable = import nixpkgs-unstable {};
-
-  zoteroStyle = { name, sha256 }: {
-    name = "${name}.csl";
-    path = pkgs.fetchurl {
-      url = "https://www.zotero.org/styles/${name}";
-      inherit sha256;
-    };
-  };
-
-  cslDirectory = pkgs.linkFarm "citation-styles" [
-    (zoteroStyle {
-      name = "chicago-author-date-de";
-      sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
-    })
-    (zoteroStyle {
-      name = "din-1505-2";
-      sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
-    })
-    (zoteroStyle {
-      name = "apa";
-      sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
-    })
-  ];
-
-  makeStardictDataDir = dicts:
-    pkgs.linkFarm "dictionaries" (map ({ name, path }: {
-      name = "dic/${name}";
-      inherit path;
-    }) dicts);
-in {
-  environment.variables.STARDICT_DATA_DIR = toString (makeStardictDataDir [
-    {
-      name = "gr-de";
-      path = pkgs.fetchurl {
-        url = "http://tovotu.de/data/stardict/pape_gr-de.zip";
-        sha256 = "1d705y47b40vp0mg79vbwasw4y0i8fmnlwvf4x4ri0dkfqng9sky";
-      };
-    }
-    {
-      name = "la-de";
-      path = pkgs.fetchurl {
-        url = "http://tovotu.de/data/stardict/georges_lat-de.zip";
-        sha256 = "12n26nzwg28wn4zwv45mv0wkgy1jh1d8p0k6haamz9601cqq7hkj";
-      };
-    }
-    {
-      name = "de-la";
-      path = pkgs.fetchurl {
-        url = "http://tovotu.de/data/stardict/georges_de-lat.zip";
-        sha256 = "0inm6xn1lcnb851cj329n0v2vbfc1z1bxwhgsd8fnm0zxy3f3ifq";
-      };
-    }
-  ]);
-
-  home-manager.users.me.home.file = {
-    ".csl".source = cslDirectory;
-    ".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
-  };
-
+{ pkgs, ... }:
+{
  environment.systemPackages = with pkgs; [
-    texlive.combined.scheme-full
-    (aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
+    (texlive.combine {
+      inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo;
+      pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo";
+    })
+    # haskellPackages.patat
+    (aspellWithDicts (dict: [dict.de dict.en dict.la dict.en-computers dict.ru]))
    haskellPackages.pandoc-citeproc
-    nur.repos.kmein.text2pdf
-    abiword
-    gnumeric
-    dia
-    unstable.pandoc
-    # proselint
-    asciidoctor
+    libreoffice
+    pandoc
+    proselint
+    unstable.asciidoctor
    wordnet
-    sdcv # stardict cli
  ];
 }
--- a/configs/printing.nix
+++ b/configs/printing.nix
@@ -1,35 +1,9 @@
 { pkgs, ... }:
-let
-  inherit (import <niveum/lib>) localAddresses;
-  hp-driver = pkgs.hplipWithPlugin;
-in {
+{
  services.printing = {
    enable = true;
-    drivers = [ hp-driver ];
+    drivers = [ pkgs.hplipWithPlugin ];
  };

-  hardware.sane = {
-    enable = true;
-    extraBackends = [ hp-driver ];
-  };
-
-  users.users.me.extraGroups = [ "scanner" ];
-
-  hardware.printers.ensurePrinters = [{
-    name = "OfficeJet";
-    location = "Zimmer";
-    deviceUri = "https://${localAddresses.officejet}";
-    model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd";
-    ppdOptions = {
-      Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None
-      PageSize = "A4"; # A4 A4.FB A4.Duplex
-      MediaType = "Plain";
-      OutputMode = "Normal";
-      ColorModel = "KGray"; # RGB CMYGray KGray
-    };
-  }];
+  networking.hosts."192.168.178.27" = [ "officejet" ];
 }
-
-/* HP/hp-officejet_4650_series.ppd.gz
-   drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
-*/
--- a/configs/python.nix
+++ b/configs/python.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    (pkgs.python3.withPackages
+      (py: [
+        py.black
+        py.python-language-server
+        py.pyls-mypy
+        py.pyls-black
+        py.pyls-isort
+        py.flake8
+        py.flask
+        py.pygments
+        py.docopt
+        py.schema
+        py.ansicolors
+        py.virtualenv
+        py.spacy
+        py.spacy_models
+      ])
+    )
+  ];
+
+  home-manager.users.me.xdg.configFile."pycodestyle".text = ''
+    [pycodestyle]
+    max-line-length = 110
+  '';
+}
--- a/configs/random-background.nix
+++ b/configs/random-background.nix
@@ -0,0 +1,9 @@
+{
+  home-manager.users.me = {
+    services.random-background = {
+      enable = true;
+      imageDirectory = toString <art>;
+      interval = "2h";
+    };
+  };
+}
--- a/configs/redshift.nix
+++ b/configs/redshift.nix
@@ -1 +1,7 @@
-{ services.redshift.enable = false; }
+{
+  services.redshift = {
+    enable = true;
+    latitude = "52";
+    longitude = "13";
+  };
+}
--- a/configs/retiolum.nix
+++ b/configs/retiolum.nix
@@ -1,10 +1,37 @@
-{ config, pkgs, ... }: {
-  imports = [ <niveum/modules/retiolum.nix> ];
+{ config, pkgs, ... }:
+{
+  imports = [ <modules/retiolum.nix> ];

-  networking.hosts = { "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ]; };
+  fileSystems."/mnt/lassulusflix" = {
+    device = "prism.r:/export";
+    fsType = "nfs";
+  };
+
+  networking.hosts = {
+    "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ];
+  };
+
+  networking.retiolum = {
+    scardanelli = {
+      ipv4 = "10.243.2.2";
+      ipv6 = "42:0:3c46:4007:5bce:f1bc:606b:2b18";
+    };
+    homeros = {
+      ipv4 = "10.243.2.1";
+      ipv6 = "42:0:3c46:53e:e63d:e62a:56ea:c705";
+    };
+    catullus = {
+      ipv4 = "10.243.2.3";
+      ipv6 = "42:0:3c46:3ec0:7aad:d1d5:9842:da4c";
+    };
+    wilde = {
+      ipv4 = "10.243.2.4";
+      ipv6 = "42:0:3c46:907c:1fb8:b74f:c59b:1ee3";
+    };
+  }.${config.networking.hostName};

  environment.etc."tinc/retiolum/rsa_key.priv" = {
-    text = builtins.readFile <system-secrets/retiolum.key>;
+    text = builtins.readFile <secrets/retiolum.key>;
    mode = "400";
  };
 }
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -1,14 +1,13 @@
 { config, ... }:
-let
-  inherit (import <niveum/lib>) colours;
-in{
+with config.niveum; {
  home-manager.users.me.programs.rofi = {
    enable = true;
    separator = "solid";
    scrollbar = false;
+    terminal = applications.terminal;
    borderWidth = 0;
    lines = 5;
-    font = "Monospace 10";
+    font = "${fonts.terminal.name} ${toString (fonts.terminal.size + 1)}";
    colors = rec {
      window = rec {
        background = colours.foreground;
@@ -20,28 +19,19 @@ in{
          background = window.background;
          backgroundAlt = window.background;
          foreground = colours.background;
-          highlight = {
-            foreground = colours.cyan.dark;
-            inherit (window) background;
-          };
+          highlight = { foreground = colours.cyan.dark; inherit (window) background; };
        };
        active = {
          background = window.background;
          backgroundAlt = window.background;
          foreground = colours.yellow.dark;
-          highlight = {
-            foreground = colours.green.dark;
-            inherit (window) background;
-          };
+          highlight = { foreground = colours.green.dark; inherit (window) background; };
        };
        urgent = {
          background = window.background;
          backgroundAlt = window.background;
          foreground = colours.red.dark;
-          highlight = {
-            foreground = colours.magenta.dark;
-            inherit (window) background;
-          };
+          highlight = { foreground = colours.magenta.dark; inherit (window) background; };
        };
      };
    };
--- a/configs/save-space.nix
+++ b/configs/save-space.nix
@@ -3,7 +3,6 @@
  documentation.enable = false;
  documentation.info.enable = false;
  documentation.man.enable = false;
-  documentation.man.generateCaches = false;
  fonts.fontconfig.enable = false;
  nix.gc.automatic = true;
  nix.optimise.automatic = true;
--- a/configs/sncli.nix
+++ b/configs/sncli.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+let secrets = import <dot/secrets.nix>;
+in {
+  environment.systemPackages = [ pkgs.python3Packages.sncli ];
+
+  home-manager.users.me = {
+    home.file.".snclirc".text = ''
+      [sncli]
+      cfg_sn_username = ${secrets.simplenote.username}
+      cfg_sn_password = ${secrets.simplenote.password}
+    '';
+  };
+}
--- a/configs/spacetime.nix
+++ b/configs/spacetime.nix
@@ -1,7 +0,0 @@
-{
-  time.timeZone = "Europe/Berlin";
-  location = {
-    latitude = 52.517;
-    longitude = 13.3872;
-  };
-}
--- a/configs/spotifyd.nix
+++ b/configs/spotifyd.nix
@@ -1,12 +0,0 @@
-{ lib, ... }:
-{
-  services.spotifyd = {
-    enable = true;
-    config = lib.generators.toINI { } {
-      global = {
-        username = lib.strings.fileContents <secrets/spotify/username>;
-        password = lib.strings.fileContents <secrets/spotify/password>;
-      };
-    };
-  };
-}
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -1,38 +1,52 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, config, ... }:
 let
-  inherit (import <niveum/lib>) sshPort kieran;
+  sshPort = 22022;
+  sshKey = {
+    homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com";
+    scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com";
+    wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
+  };
 in {
  services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";

  programs.ssh.startAgent = true;

-  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  services.openssh = {
+    ports = [ sshPort ];
+    enable = true;
+    passwordAuthentication = false;
+  };
+
+  users.motd = "Welcome to ${config.networking.hostName}!";
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    sshKey.homeros
+    sshKey.scardanelli
+    sshKey.wilde
+  ];
+
+  users.users.me.openssh.authorizedKeys.keys = [
+    sshKey.homeros
+    sshKey.scardanelli
+    sshKey.wilde
+  ];

  home-manager.users.me.programs.ssh = {
    enable = true;
    matchBlocks = {
-      "github.com" = {
-        hostname = "ssh.github.com";
-        port = 443;
-      };
-      zaatar = {
-        hostname = "zaatar.r";
-        user = "root";
-        port = sshPort;
-      };
-      makanek = {
-        hostname = "makanek.r";
-        user = "root";
-        port = sshPort;
-      };
-      manakish = {
-        hostname = "manakish.r";
+      scardanelli = {
+        hostname = "scardanelli.r";
        user = "kfm";
        port = sshPort;
      };
-      toum = {
-        hostname = "toum.r";
-        user = "root";
+      homeros = {
+        hostname = "homeros.r";
+        user = "kfm";
+        port = sshPort;
+      };
+      catullus = {
+        hostname = "catullus.r";
+        user = "kfm";
        port = sshPort;
      };
      wilde = {
@@ -40,6 +54,17 @@ in {
        user = "kfm";
        port = sshPort;
      };
+      menstruation-logs = {
+        user = "root";
+        hostname = "v22017123717457389.megasrv.de";
+        port = 49123;
+      };
+      irc = {
+        user = "kmein";
+        hostname = "prism.r";
+        extraOptions.RemoteCommand = "tmux a";
+      };
+      "gitlab.peixdev.net".port = 999;
    };
  };
 }
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) sshPort kieran;
-in
-{
-  users.motd = "Welcome to ${config.networking.hostName}!";
-
-  services.openssh = {
-    enable = true;
-    ports = [ sshPort ];
-    passwordAuthentication = false;
-    forwardX11 = true;
-  };
-
-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
-}
--- a/configs/sway.nix
+++ b/configs/sway.nix
@@ -0,0 +1,3 @@
+{
+  programs.sway.enable = true;
+}
--- a/configs/sxiv.nix
+++ b/configs/sxiv.nix
@@ -1,64 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  important-directories = pkgs.writeText "directories" ''
-    h	~/
-    d	~/cloud/Dropbox/
-    g	~/cloud/gdrive/
-    s	~/cloud/Seafile/
-    kk	~/cloud/keybase/private/kmein/
-    kp	~/cloud/keybase/public/kmein/
-    t	/tmp
-    D	~/Downloads
-    cf	''${XDG_CONFIG_HOME:-$HOME/.config}
-  '';
-in {
-  environment.systemPackages = [ pkgs.sxiv ];
-
-  # TODO fix
-  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source =
-    pkgs.writers.writeDash "key-handler" ''
-      PATH=$PATH:${
-        lib.makeBinPath [
-          pkgs.gnused
-          pkgs.gawk
-          pkgs.dmenu
-          pkgs.coreutils
-          pkgs.libnotify
-          pkgs.imagemagick
-          pkgs.xclip
-        ]
-      }
-
-      echo >&2 key "$1" pressed
-      while read file; do
-          case "$1" in
-          "c")
-            [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
-            [ -z "$destdir" ] && exit
-            [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
-            cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." &
-            ;;
-          "m")
-            [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
-            [ -z "$destdir" ] && exit
-            [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
-            mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." &
-            ;;
-          "r")
-            convert -rotate 90 "$file" "$file" ;;
-          "R")
-            convert -rotate -90 "$file" "$file" ;;
-          "f")
-            convert -flop "$file" "$file" ;;
-          "y")
-            echo -n "$file" | xclip -selection clipboard &&
-            notify-send "$file copied to clipboard" & ;;
-          "Y")
-            readlink -f "$file" | xclip -selection clipboard &&
-              notify-send "$(readlink -f "$file") copied to clipboard" & ;;
-          "d")
-            [ "$(printf "No\\nYes" | dmenu -i -p "Really delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
-          esac
-        done
-    '';
-}
--- a/configs/themes/antares.nix
+++ b/configs/themes/antares.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { bright = "#151515"; dark = "#000000"; };
+    red = { bright = "#de575c"; dark = "#de575c"; };
+    yellow = { bright = "#ebe971"; dark = "#ebe971"; };
+    green = { bright = "#00b853"; dark = "#00b853"; };
+    blue = { bright = "#90d0f0"; dark = "#7fc6f0"; };
+    magenta = { bright = "#cf9ffa"; dark = "#cf9ffa"; };
+    cyan = { bright = "#4ae5e8"; dark = "#4ae5e8"; };
+    white = { bright = "#ffffff"; dark = "#bbbbbb"; };
+    background = black.dark;
+    foreground = white.dark;
+    cursor = green.bright;
+  };
+}
--- a/configs/themes/apprentice.nix
+++ b/configs/themes/apprentice.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = {
+    black = { bright = "#444444"; dark = "#1c1c1c"; };
+    red = { bright = "#ff8700"; dark = "#af5f5f"; };
+    green = { bright = "#87af87"; dark = "#5f875f"; };
+    yellow = { bright = "#ffffaf"; dark = "#87875f"; };
+    blue = { bright = "#8fafd7"; dark = "#5f87af"; };
+    magenta = { bright = "#8787af"; dark = "#5f5f87"; };
+    cyan = { bright = "#5fafaf"; dark = "#5f8787"; };
+    white = { bright = "#999999"; dark = "#6c6c6c"; };
+    background = "#262626";
+    foreground = "#bcbcbc";
+    cursor = "#bcbcbc";
+  };
+}
--- a/configs/themes/connermcd.nix
+++ b/configs/themes/connermcd.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { bright = "#454545"; dark = "#222222"; };
+    red = { bright = "#FA8072"; dark = "#B22222"; };
+    green = { bright = "#779A3E"; dark = "#556B2F"; };
+    yellow = { bright = "#DAA520"; dark = "#B8860B"; };
+    blue = { bright = "#6495ED"; dark = "#4682B4"; };
+    magenta = { bright = "#DA70D6"; dark = "#9932CC"; };
+    cyan = { bright = "#B0E0E6"; dark = "#87CEEB"; };
+    white = { bright = "#FFFFFF"; dark = "#C0C0C0"; };
+    background = "#000000";
+    foreground = "#AAAAAA";
+    cursor = green.bright;
+  };
+}
--- a/configs/themes/mac-os.nix
+++ b/configs/themes/mac-os.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { bright = "#818383"; dark = "#000000"; };
+    red = { bright = "#fc391f"; dark = "#c23621"; };
+    yellow = { bright = "#eaec23"; dark = "#adad27"; };
+    green = { bright = "#31e722"; dark = "#25bc24"; };
+    blue = { bright = "#5833ff"; dark = "#492ee1"; };
+    magenta = { bright = "#f935f8"; dark = "#d338d3"; };
+    cyan = { bright = "#14f0f0"; dark = "#33bbc8"; };
+    white = { bright = "#e9ebeb"; dark = "#cbcccd"; };
+    background = black.dark;
+    foreground = white.dark;
+    cursor = green.bright;
+  };
+}
--- a/configs/themes/owickstrom-dark.nix
+++ b/configs/themes/owickstrom-dark.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { bright = "#4b4b4b"; dark = "#242424"; };
+    red = { bright = "#fc1c18"; dark = "#d71c15"; };
+    green = { bright = "#6bc219"; dark = "#5aa513"; };
+    yellow = { bright = "#fec80e"; dark = "#fdb40c"; };
+    blue = { bright = "#0955ff"; dark = "#063b8c"; };
+    magenta = { bright = "#fb0050"; dark = "#e40038"; };
+    cyan = { bright = "#3ea8fc"; dark = "#2595e1"; };
+    white = { bright = "#8c00ec"; dark = "#efefef"; };
+    background = "#181818";
+    foreground = white.dark;
+    cursor = "#bbbbbb";
+  };
+}
--- a/configs/themes/owickstrom.nix
+++ b/configs/themes/owickstrom.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { bright = "#282c34"; dark = "#282c34"; };
+    red = { bright = "#e06c75"; dark = "#e06c75"; };
+    green = { bright = "#98c379"; dark = "#98c379"; };
+    yellow = { bright = "#e5c07b"; dark = "#e5c07b"; };
+    blue = { bright = "#61afef"; dark = "#61afef"; };
+    magenta = { bright = "#c678dd"; dark = "#c678dd"; };
+    cyan = { bright = "#56b6c2"; dark = "#56b6c2"; };
+    white = { bright = "#dcdfe4"; dark = "#dcdfe4"; };
+    background = black.dark;
+    foreground = white.bright;
+    cursor = "#a3b3cc";
+  };
+}
--- a/configs/themes/solarized-dark.nix
+++ b/configs/themes/solarized-dark.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { dark = "#073642"; bright = "#002b36"; };
+    red = { dark = "#dc322f"; bright = "#cb4b16"; };
+    yellow = { dark = "#b58900"; bright = "#657b83"; };
+    green = { dark = "#859900"; bright = "#586e75"; };
+    blue = { dark = "#268bd2"; bright = "#839496"; };
+    magenta = { dark = "#d33682"; bright = "#6c71c4"; };
+    cyan = { dark = "#2aa198"; bright = "#93a1a1"; };
+    white = { dark = "#eee8d5"; bright = "#fdf6e3"; };
+    background = black.bright;
+    foreground = blue.bright;
+    cursor = cyan.bright;
+  };
+}
--- a/configs/themes/solarized-light.nix
+++ b/configs/themes/solarized-light.nix
@@ -0,0 +1,15 @@
+{
+  niveum.colours = rec {
+    black = { dark = "#073642"; bright = "#002b36"; };
+    red = { dark = "#dc322f"; bright = "#cb4b16"; };
+    yellow = { dark = "#b58900"; bright = "#657b83"; };
+    green = { dark = "#859900"; bright = "#586e75"; };
+    blue = { dark = "#268bd2"; bright = "#839496"; };
+    magenta = { dark = "#d33682"; bright = "#6c71c4"; };
+    cyan = { dark = "#2aa198"; bright = "#93a1a1"; };
+    white = { dark = "#eee8d5"; bright = "#fdf6e3"; };
+    background = white.bright;
+    foreground = yellow.bright;
+    cursor = green.bright;
+  };
+}
--- a/configs/theming.nix
+++ b/configs/theming.nix
@@ -1,13 +1,22 @@
-{ lib, config, pkgs, ... }:
-let
-  theme = (import <niveum/lib>).theme pkgs;
-in {
-  environment.systemPackages =
-    [ theme.gtk.package theme.icon.package theme.cursor.package ];
+{ lib, config, ... }:
+with config.niveum; {
+  i18n.consoleColors = map (c: lib.strings.removePrefix "#" c) colourPalette;
+
+  environment.systemPackages = [
+    theme.gtk.package
+    theme.icon.package
+    theme.cursor.package
+  ];

  services.xserver.displayManager.lightdm.greeters.gtk = {
-    theme = { inherit (theme.gtk) name package; };
-    iconTheme = { inherit (theme.icon) name package; };
+    theme = {
+      name = theme.gtk.name;
+      package = theme.gtk.package;
+    };
+    iconTheme = {
+      name = theme.icon.name;
+      package = theme.icon.package;
+    };
  };

  home-manager.users.me = {
@@ -18,7 +27,7 @@ in {
    };
    qt = {
      enable = true;
-      platformTheme = "gtk";
+      useGtkTheme = true;
    };
    xsession.pointerCursor = theme.cursor // { size = 16; };
  };
--- a/Show More
+++ b/Show More