Merge remote-tracking branch 'lass/master'

author: makefu <github@syntax-fehler.de> 2022-12-12 19:44:00 +0100
committer: makefu <github@syntax-fehler.de> 2022-12-12 19:44:00 +0100
commit: aa1e058ba6e8c3e701a2503d65ddb3c83d5c4f47 (patch)
tree: ea3e3bbc78c78f39b2a8e123901867e1e68c21c7
parent: 3a65e49a98fc1721cbc34859a18d324789abfeee (diff)
parent: c0378866356b182206aa7ad47f1139cf37f697f4 (diff)
163 files changed, 629 insertions, 5477 deletions
diff --git a/jeschli/1systems/bolide/config.nix b/jeschli/1systems/bolide/config.nix
deleted file mode 100644
index 49b8147..0000000
--- a/jeschli/1systems/bolide/config.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, lib, ... }:
-let
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in
-{
-  imports =
-    [
-      ./hardware-configuration.nix
-      <stockholm/jeschli>
-      <stockholm/jeschli/2configs/urxvt.nix>
-      <stockholm/jeschli/2configs/i3.nix>
-      <stockholm/jeschli/2configs/emacs.nix>
-      <stockholm/jeschli/2configs/rust.nix>
-    ];
-
-  krebs.build.host = config.krebs.hosts.bolide;
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  # boot.loader.grub.efiSupport = true;
-  # boot.loader.grub.efiInstallAsRemovable = true;
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "/dev/sdb"; # or "nodev" for efi only
-  boot.initrd.luks.devices = [ {
-    name = "bla";
-    device = "/dev/disk/by-uuid/53f1eeaf-a7ac-456c-a2af-778dd8b8d5b0";
-    preLVM = true;
-    allowDiscards = true;
-  } ];
-#  networking.hostName = "bolide"; # Define your hostname.
-#  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;
-  networking.enableB43Firmware = true; #new
-
-  # Select internationalisation properties.
-  # i18n = {
-  #   consoleFont = "Lat2-Terminus16";
-  #   consoleKeyMap = "us";
-  #   defaultLocale = "en_US.UTF-8";
-  # };
-
-  # Set your time zone.
-  # time.timeZone = "Europe/Amsterdam";
-
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.shellAliases = {
-    n = "nix-shell";
-    stocki = pkgs.writeDash "deploy" ''
-      cd ~/stockholm
-      exec nix-shell -I stockholm="$PWD" --run 'deploy  --system="bolide"'
-    '';
-  };
-  nixpkgs.config.allowUnfree = true;
-  environment.systemPackages = with pkgs; [
-    rofi
-    wget vim
-  # system helper
-    ag
-    curl
-    copyq
-    dmenu
-    git
-    i3lock
-    keepass
-    networkmanagerapplet
-    rsync
-    terminator
-    tmux
-    wget
-  #  rxvt_unicode
-  # editors
-    emacs
-  # internet
-    thunderbird
-    chromium
-    google-chrome
-  # programming languages
-    vscode
-    go
-    gcc9
-    ccls
-    unstable.clang_8
-    ghc
-    python37
-    python37Packages.pip
-  # go tools
-    golint
-    gotools
-  # dev tools
-    elmPackages.elm
-    gnumake
-    jetbrains.pycharm-professional
-    jetbrains.webstorm
-    jetbrains.goland
-  # document viewer
-    zathura
-  ];
-
-
- # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-users.extraUsers.jeschli = {
-    isNormalUser = true;
-    extraGroups = ["docker" "vboxusers" "audio"];
-    uid = 1000;
-  };
-
-  hardware.pulseaudio.enable = true;
- # This value determines the NixOS release with which your system is to be
- # compatible, in order to avoid breaking some software such as database
- # servers. You should change this only after NixOS release notes say you
- # should.
- system.stateVersion = "17.09"; # Did you read the comment?
-
-}
-
diff --git a/jeschli/1systems/bolide/hardware-configuration.nix b/jeschli/1systems/bolide/hardware-configuration.nix
deleted file mode 100644
index 042b746..0000000
--- a/jeschli/1systems/bolide/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.kernelModules = [ "kvm-intel" "wl" ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-
-  fileSystems."/" =
-    { device = "/dev/bolide-pool/bolide-root";
-      fsType = "ext4";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/bolide-pool/bolide-home";
-      fsType = "ext4";
-    };
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3aeb67c4-5b6e-4df2-8013-607fe0fb8525";
-      fsType = "ext4";
-    };
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = "powersave";
-  hardware.pulseaudio.enable = true;
-}
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
deleted file mode 100644
index 860c5d1..0000000
--- a/jeschli/1systems/brauerei/config.nix
+++ /dev/null
@@ -1,200 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  mainUser = config.krebs.build.user.name;
-  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
-in
-{
-  imports = [
-    <stockholm/jeschli>
-    ./hardware-configuration.nix
-    <home-manager/nixos>
-    <stockholm/jeschli/2configs/emacs.nix>
-    <stockholm/jeschli/2configs/urxvt.nix>
-    <stockholm/jeschli/2configs/steam.nix>
-    <stockholm/jeschli/2configs/virtualbox.nix>
-   ];
-  krebs.build.host = config.krebs.hosts.brauerei;
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.efiSupport = true;
-  # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "/dev/sda";
-  # or "nodev" for efi only
-  boot.initrd.luks.devices = [ {
-    name = "root";
-    device = "/dev/sda2";
-    preLVM = true;
-    allowDiscards = true;
-  } ];
-  networking.networkmanager.enable = true;
-  time.timeZone = "Europe/Amsterdam";
-
-  nixpkgs.config.allowUnfree = true;
-
-  environment.shellAliases = {
-    # emacs aliases
-    ed = "emacsclient";
-    edc = "emacsclient --create-frame";
-    # nix aliases
-    ns = "nix-shell";
-    # krops
-    deploy = pkgs.writeDash "deploy" ''
-      set -eu
-      export SYSTEM="$1"
-      $(nix-build $HOME/stockholm/jeschli/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
-    '';
- };
-
-  environment.systemPackages = with pkgs; [
-    # system helper
-    acpi
-    ag
-    copyq
-    curl
-    dmenu
-    aspell
-    ispell
-    rofi
-    xdotool
-    git
-    gnupg
-    i3lock
-    keepass
-    networkmanagerapplet
-    pavucontrol
-    rsync
-    terminator
-    tmux
-    wget
-  # editors
-    emacs
-  # internet
-    chromium
-    firefox
-    google-chrome
-    thunderbird
-  # programming languages
-    elixir
-    elmPackages.elm
-    exercism
-    gcc9
-    ccls
-    unstable.clang_8
-    ghc
-    go
-    python37
-    python37Packages.pip
-    pipenv
-  # dev tools
-    gnumake
-    jetbrains.clion
-    jetbrains.goland
-    jetbrains.pycharm-professional
-    jetbrains.webstorm
-    vscode
-  # document viewer
-    evince
-    zathura
-  # go tools
-    golint
-    gotools
-  # rust
-    cargo
-    rustracer
-    rustup
-  # orga tools
-    taskwarrior
-  # xorg
-    xorg.xbacklight
-  # tokei
-    tokei
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.bash.enableCompletion = true;
-  # programs.mtr.enable = true;
-  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-
-#  home-manager.useUserPackages = true;
-#  home-manager.users.jeschli = {
-#    home.stateVersion = "19.03";
-#  };
-#  home-manager.enable = true;
-
-#  home-manager.users.jeschli.home.file = {
-#     ".emacs.d" = {
-#       source = pkgs.fetchFromGitHub {
-#         owner = "jeschli";
-#         repo = "emacs.d";
-#         rev = "8ed6c40";
-#         sha256 = "1q2y478srwp9f58l8cixnd2wj51909gp1z68k8pjlbjy2mrvibs0";
-#       };
-#       recursive = true;
-#     };
-#  };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-#  services.emacs.enable = true;
-
-  virtualisation.docker.enable = true;
-
-  services.xserver = {
-    enable = true;
-
-    desktopManager = {
-      xfce.enable = true;
-      gnome3.enable = true;
-    };
-
-  };
-
-  services.xserver.windowManager.i3.enable = true;
-
-  users.extraUsers.jeschli = { # TODO: define as krebs.users
-    isNormalUser = true;
-    extraGroups = ["docker" "vboxusers" "audio"];
-    uid = 1000;
-  };
-  users.extraUsers.blafoo = {
-    isNormalUser = true;
-    extraGroups = ["audio"];
-    uid = 1002;
-  };
-  users.extraUsers.jamie = {
-    isNormalUser = true;
-    uid = 1001; # TODO genid
-  };
-  users.users.dev = {
-    isNormalUser = true;
-    openssh.authorizedKeys.keys = [
-      config.krebs.users.lass.pubkey
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB0d0JA20Vqn7I4lCte6Ne2EOmLZyMJyS9yIKJYXNLjbLwkQ4AYoQKantPBkTxR75M09E7d3j5heuWnCjWH45TrfQfe1EOSSC3ppCI6C6aIVlaNs+KhAYZS0m2Y8WkKn+TT5JLEa8yybYVN/RlZPOilpj/1QgjU6CQK+eJ1k/kK+QFXcwN82GDVh5kbTVcKUNp2tiyxFA+z9LY0xFDg/JHif2ROpjJVLQBJ+YPuOXZN5LDnVcuyLWKThjxy5srQ8iDjoxBg7dwLHjby5Mv41K4W61Gq6xM53gDEgfXk4cQhJnmx7jA/pUnsn2ZQDeww3hcc7vRf8soogXXz2KC9maiq0M/svaATsa9Ul4hrKnqPZP9Q8ScSEAUX+VI+x54iWrnW0p/yqBiRAzwsczdPzaQroUFTBxrq8R/n5TFdSHRMX7fYNOeVMjhfNca/gtfw9dYBVquCvuqUuFiRc0I7yK44rrMjjVQRcAbw6F8O7+04qWCmaJ8MPlmApwu2c05VMv9hiJo5p6PnzterRSLCqF6rIdhSnuOwrUIt1s/V+EEZXHCwSaNLaQJnYL0H9YjaIuGz4c8kVzxw4c0B6nl+hqW5y5/B2cuHiumnlRIDKOIzlv8ufhh21iN7QpIsPizahPezGoT1XqvzeXfH4qryo8O4yTN/PWoA+f7o9POU7L6hQ== lhebendanz@nixos"
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgHR1ZPDBMUjGWar/QmI2GiUkZM8pAXRyBDh8j3hGlxlS+0lsBV6bTAI5F13iyzTC4pCuEuDO2OlFB0scwjcOATci8phd8jTjOIDodqDaeQZXbshyuUBfyiAV6q0Sc+cUDV3D6GhzigH3t8EiQmvXmUGm916yFotT12o0dm83SCOh1nAf9ZveC1Hz/eEUTvgWvIb58OdUR5F/S5OVBnIIJZ8tcp0BP9lyjjJCcANWkYJlwaVcNNb0UarCRhvRtptFj+e/EPqQxSCaS2QcxW4zBsQ6C81TFf7WrdH+pwtFg0owlWsxv547sRLLiPf2h2YuQgSoAaW24N0SHhUqvOXd+JyaYw7MAF8Qh3jHm2iJQRgXNuIN0msFi1alwAevilL2mnfAt2biQ9sS9g+CVvQCwX3mg09E4Y3UmFLzvsJafD9meKVrjnDCcXySeAfts59eFmwKtMQ0qrEWaclzUiA6Ay3uD1zma8x1XELGTf8nxnXCGl8s2i2APn7y1Tcwep69DlENWSaReF5zBLIkCtIUDd+8xBFTF3yu5CpyRrRMKGa0QX/MtsQl4SGJWadOTwpM8joIbrIVfKkTNB2McxAjvo0iaRoBDm409gi2Ycy+NSoUV/KAIUG7OysAQZ62hr+E/Kw1ocJCIVI+9vzKx/EnEIHkCSwhYKl5393W7CShVJjJUcKcZddqX2smSShXq8rXPzhIHk1dAVn5Ff/vGZT9z9R0QN3z6Oa9QN5t5TjTdUDToqHTudqOpDxPl2c2yXK9wV+aoHFoML9AmbzTT1U1mKU7GXSoFACiKNzhDzkovyJGpWRyvisX5t75IfuVqvGGI8n3u8OhPMdyyOHRylVaciDzBMZ00xnIHB+dJG9IeYaMm9bW1Li4Jo0CWnogo2+olfHPMLijBuu+bsa5Kp6kFkccJYR/xqcSq0lVXkpGm692JI4dnMGjchipXEGh1gXof9jXHemMMBwjpLFGty+D0r5KdA33m+mIqc9hi0ShquA9nA7E1IxDlgE0gQg+P5ZOeeIN7q54AQmT8iCCCRyne2Kw57XxaGgZoLfj7VjjaeRlzBUglmtyq8B7/c0J3y41vt9Hxhj4sKD+vufZu+M9E6E936KsJlIi+3U0PtopM/b8L4jcH1JYpPljapsys8wkJZ1ymHf6Kj/0FHyi1V+GvquiVrlFN+aHECIzNlCiSMO4MqfPUO1A+s9zkG2ZgPNNv+LoZqnokjbmKM4kdxexMxaL/Eo9Nd/bzdYiFYXlllEL7Uox+yV0N3loQ2juh4zn+ctCnwHi+V9X4l4rB8amW96WrXiJ/WqEK2UO8St8dcQWhCsUUm2OawSrbYYZw5HhJwz/Rhz2UsdSc56s5OUiQLJqpILYvCnqSLlF4iZdRSdDQNpKn+le3CeGUl5UUuvK2BpKGrbPKx0i/2ZSEMxNA5GnDMx/NyiNyDBcoPu/XOlNi8VWsEbCtoTQRamvqHjOmNcPrxCxds+TaF8c0wMR720yj5sWq8= jeschli@nixos"
-      "ssh-rsa AAAAB4NzaC1yc2EAAAADAQABAAACAQC1x9+OtNfwv6LxblnLHeBElxoxLfaYUyvqMrBgnrlkaPjylPv711bvPslnt+YgdPsZQLCoQ2t5f0x0j7ZOMYE9eyRrnr67ITO+Od05u3eCypWOZulekkDL0ZDeYdvoZKOWnbKWnQVRfYuLOEL/g5/9E7MLtIdID8e98b/qHzs/+wmuuDR3zHCNic0BKixgET/EgFvLWezWxJ6D/TTv/5sDAfrC+RUN8ad14sxjKIkS3nkAlm8bhrCxQKaHLUcCJWiweW0gPWYSlp64VHS5lchvqCJlPYQdx0XbwolvlLYru0w74ljLbi3eL35GFFyHSeEjQ73EtVwo53uVKTy7SAORU7JNg6xL9H3ChOLOknN9oHs1K7t/maMsATle0HAFcTuaOhELUmHM8dCJh3nPVWIkzHQ4o3fyaogrpt7/V5j6R1/Ozn7P9n4OdqrjiaWqHlz/XHeYNNWte+a0EW+NubC83yS0Cu3uhZ36C3RET2vNM25CyYOBn4ccClAozayQIb6Cif0tCafMRPgkSlogQd8+SqNZpTnmtllIT3VnT5smgrufy6HETDkrHjApDrsqLtMCFY83RFwt4QLv/L93O7IsGifzmEfD9qD7YBSMNs8ihBIUXPk9doHXvYS506YroxWOxe/C0rzzbaogxQT6JMd1ozfXitRD9v7iBIFAT4Kzjw== christopher.kilian@dcso.de"
-    ];
-  };
-
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgHR1ZPDBMUjGWar/QmI2GiUkZM8pAXRyBDh8j3hGlxlS+0lsBV6bTAI5F13iyzTC4pCuEuDO2OlFB0scwjcOATci8phd8jTjOIDodqDaeQZXbshyuUBfyiAV6q0Sc+cUDV3D6GhzigH3t8EiQmvXmUGm916yFotT12o0dm83SCOh1nAf9ZveC1Hz/eEUTvgWvIb58OdUR5F/S5OVBnIIJZ8tcp0BP9lyjjJCcANWkYJlwaVcNNb0UarCRhvRtptFj+e/EPqQxSCaS2QcxW4zBsQ6C81TFf7WrdH+pwtFg0owlWsxv547sRLLiPf2h2YuQgSoAaW24N0SHhUqvOXd+JyaYw7MAF8Qh3jHm2iJQRgXNuIN0msFi1alwAevilL2mnfAt2biQ9sS9g+CVvQCwX3mg09E4Y3UmFLzvsJafD9meKVrjnDCcXySeAfts59eFmwKtMQ0qrEWaclzUiA6Ay3uD1zma8x1XELGTf8nxnXCGl8s2i2APn7y1Tcwep69DlENWSaReF5zBLIkCtIUDd+8xBFTF3yu5CpyRrRMKGa0QX/MtsQl4SGJWadOTwpM8joIbrIVfKkTNB2McxAjvo0iaRoBDm409gi2Ycy+NSoUV/KAIUG7OysAQZ62hr+E/Kw1ocJCIVI+9vzKx/EnEIHkCSwhYKl5393W7CShVJjJUcKcZddqX2smSShXq8rXPzhIHk1dAVn5Ff/vGZT9z9R0QN3z6Oa9QN5t5TjTdUDToqHTudqOpDxPl2c2yXK9wV+aoHFoML9AmbzTT1U1mKU7GXSoFACiKNzhDzkovyJGpWRyvisX5t75IfuVqvGGI8n3u8OhPMdyyOHRylVaciDzBMZ00xnIHB+dJG9IeYaMm9bW1Li4Jo0CWnogo2+olfHPMLijBuu+bsa5Kp6kFkccJYR/xqcSq0lVXkpGm692JI4dnMGjchipXEGh1gXof9jXHemMMBwjpLFGty+D0r5KdA33m+mIqc9hi0ShquA9nA7E1IxDlgE0gQg+P5ZOeeIN7q54AQmT8iCCCRyne2Kw57XxaGgZoLfj7VjjaeRlzBUglmtyq8B7/c0J3y41vt9Hxhj4sKD+vufZu+M9E6E936KsJlIi+3U0PtopM/b8L4jcH1JYpPljapsys8wkJZ1ymHf6Kj/0FHyi1V+GvquiVrlFN+aHECIzNlCiSMO4MqfPUO1A+s9zkG2ZgPNNv+LoZqnokjbmKM4kdxexMxaL/Eo9Nd/bzdYiFYXlllEL7Uox+yV0N3loQ2juh4zn+ctCnwHi+V9X4l4rB8amW96WrXiJ/WqEK2UO8St8dcQWhCsUUm2OawSrbYYZw5HhJwz/Rhz2UsdSc56s5OUiQLJqpILYvCnqSLlF4iZdRSdDQNpKn+le3CeGUl5UUuvK2BpKGrbPKx0i/2ZSEMxNA5GnDMx/NyiNyDBcoPu/XOlNi8VWsEbCtoTQRamvqHjOmNcPrxCxds+TaF8c0wMR720yj5sWq8= jeschli@nixos"
-  ];
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "17.09"; # Did you read the comment?
-
-  hardware.trackpoint = {
-    enable = true;
-    sensitivity = 220;
-    speed = 0;
-    emulateWheel = true;
-  };
-
-}
diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix
deleted file mode 100644
index 2cb3e66..0000000
--- a/jeschli/1systems/brauerei/hardware-configuration.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sdhci_pci" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e264fc21-45bb-4224-93fc-b0e19c2c3478";
-      fsType = "ext4";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/bd0846ce-7d39-4329-bcb4-7c76becd6ab1";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/42BF-0795";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  hardware.pulseaudio.enable = true;
-  nix.maxJobs = lib.mkDefault 4;
-}
diff --git a/jeschli/1systems/enklave/config.nix b/jeschli/1systems/enklave/config.nix
deleted file mode 100644
index 86d21f7..0000000
--- a/jeschli/1systems/enklave/config.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    <stockholm/jeschli>
-    <stockholm/jeschli/2configs/retiolum.nix>
-    <stockholm/jeschli/2configs/IM.nix>
-    <stockholm/jeschli/2configs/git.nix>
-    <stockholm/jeschli/2configs/os-templates/CentOS-7-64bit.nix>
-    {
-      networking.dhcpcd.allowInterfaces = [
-        "enp*"
-        "eth*"
-        "ens*"
-      ];
-    }
-    {
-      services.openssh.enable = true;
-    }
-    {
-      sound.enable = false;
-    }
-    {
-      users.extraUsers = {
-        root.initialPassword = "pfeife123";
-        root.openssh.authorizedKeys.keys = [
-          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgHR1ZPDBMUjGWar/QmI2GiUkZM8pAXRyBDh8j3hGlxlS+0lsBV6bTAI5F13iyzTC4pCuEuDO2OlFB0scwjcOATci8phd8jTjOIDodqDaeQZXbshyuUBfyiAV6q0Sc+cUDV3D6GhzigH3t8EiQmvXmUGm916yFotT12o0dm83SCOh1nAf9ZveC1Hz/eEUTvgWvIb58OdUR5F/S5OVBnIIJZ8tcp0BP9lyjjJCcANWkYJlwaVcNNb0UarCRhvRtptFj+e/EPqQxSCaS2QcxW4zBsQ6C81TFf7WrdH+pwtFg0owlWsxv547sRLLiPf2h2YuQgSoAaW24N0SHhUqvOXd+JyaYw7MAF8Qh3jHm2iJQRgXNuIN0msFi1alwAevilL2mnfAt2biQ9sS9g+CVvQCwX3mg09E4Y3UmFLzvsJafD9meKVrjnDCcXySeAfts59eFmwKtMQ0qrEWaclzUiA6Ay3uD1zma8x1XELGTf8nxnXCGl8s2i2APn7y1Tcwep69DlENWSaReF5zBLIkCtIUDd+8xBFTF3yu5CpyRrRMKGa0QX/MtsQl4SGJWadOTwpM8joIbrIVfKkTNB2McxAjvo0iaRoBDm409gi2Ycy+NSoUV/KAIUG7OysAQZ62hr+E/Kw1ocJCIVI+9vzKx/EnEIHkCSwhYKl5393W7CShVJjJUcKcZddqX2smSShXq8rXPzhIHk1dAVn5Ff/vGZT9z9R0QN3z6Oa9QN5t5TjTdUDToqHTudqOpDxPl2c2yXK9wV+aoHFoML9AmbzTT1U1mKU7GXSoFACiKNzhDzkovyJGpWRyvisX5t75IfuVqvGGI8n3u8OhPMdyyOHRylVaciDzBMZ00xnIHB+dJG9IeYaMm9bW1Li4Jo0CWnogo2+olfHPMLijBuu+bsa5Kp6kFkccJYR/xqcSq0lVXkpGm692JI4dnMGjchipXEGh1gXof9jXHemMMBwjpLFGty+D0r5KdA33m+mIqc9hi0ShquA9nA7E1IxDlgE0gQg+P5ZOeeIN7q54AQmT8iCCCRyne2Kw57XxaGgZoLfj7VjjaeRlzBUglmtyq8B7/c0J3y41vt9Hxhj4sKD+vufZu+M9E6E936KsJlIi+3U0PtopM/b8L4jcH1JYpPljapsys8wkJZ1ymHf6Kj/0FHyi1V+GvquiVrlFN+aHECIzNlCiSMO4MqfPUO1A+s9zkG2ZgPNNv+LoZqnokjbmKM4kdxexMxaL/Eo9Nd/bzdYiFYXlllEL7Uox+yV0N3loQ2juh4zn+ctCnwHi+V9X4l4rB8amW96WrXiJ/WqEK2UO8St8dcQWhCsUUm2OawSrbYYZw5HhJwz/Rhz2UsdSc56s5OUiQLJqpILYvCnqSLlF4iZdRSdDQNpKn+le3CeGUl5UUuvK2BpKGrbPKx0i/2ZSEMxNA5GnDMx/NyiNyDBcoPu/XOlNi8VWsEbCtoTQRamvqHjOmNcPrxCxds+TaF8c0wMR720yj5sWq8= jeschli@nixos"
-        ];
-        jeschli = {
-          name = "jeschli";
-          uid = 1000;
-          home = "/home/jeschli";
-          group = "users";
-          createHome = true;
-          useDefaultShell = true;
-          extraGroups = [
-          ];
-          openssh.authorizedKeys.keys = [
-"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgHR1ZPDBMUjGWar/QmI2GiUkZM8pAXRyBDh8j3hGlxlS+0lsBV6bTAI5F13iyzTC4pCuEuDO2OlFB0scwjcOATci8phd8jTjOIDodqDaeQZXbshyuUBfyiAV6q0Sc+cUDV3D6GhzigH3t8EiQmvXmUGm916yFotT12o0dm83SCOh1nAf9ZveC1Hz/eEUTvgWvIb58OdUR5F/S5OVBnIIJZ8tcp0BP9lyjjJCcANWkYJlwaVcNNb0UarCRhvRtptFj+e/EPqQxSCaS2QcxW4zBsQ6C81TFf7WrdH+pwtFg0owlWsxv547sRLLiPf2h2YuQgSoAaW24N0SHhUqvOXd+JyaYw7MAF8Qh3jHm2iJQRgXNuIN0msFi1alwAevilL2mnfAt2biQ9sS9g+CVvQCwX3mg09E4Y3UmFLzvsJafD9meKVrjnDCcXySeAfts59eFmwKtMQ0qrEWaclzUiA6Ay3uD1zma8x1XELGTf8nxnXCGl8s2i2APn7y1Tcwep69DlENWSaReF5zBLIkCtIUDd+8xBFTF3yu5CpyRrRMKGa0QX/MtsQl4SGJWadOTwpM8joIbrIVfKkTNB2McxAjvo0iaRoBDm409gi2Ycy+NSoUV/KAIUG7OysAQZ62hr+E/Kw1ocJCIVI+9vzKx/EnEIHkCSwhYKl5393W7CShVJjJUcKcZddqX2smSShXq8rXPzhIHk1dAVn5Ff/vGZT9z9R0QN3z6Oa9QN5t5TjTdUDToqHTudqOpDxPl2c2yXK9wV+aoHFoML9AmbzTT1U1mKU7GXSoFACiKNzhDzkovyJGpWRyvisX5t75IfuVqvGGI8n3u8OhPMdyyOHRylVaciDzBMZ00xnIHB+dJG9IeYaMm9bW1Li4Jo0CWnogo2+olfHPMLijBuu+bsa5Kp6kFkccJYR/xqcSq0lVXkpGm692JI4dnMGjchipXEGh1gXof9jXHemMMBwjpLFGty+D0r5KdA33m+mIqc9hi0ShquA9nA7E1IxDlgE0gQg+P5ZOeeIN7q54AQmT8iCCCRyne2Kw57XxaGgZoLfj7VjjaeRlzBUglmtyq8B7/c0J3y41vt9Hxhj4sKD+vufZu+M9E6E936KsJlIi+3U0PtopM/b8L4jcH1JYpPljapsys8wkJZ1ymHf6Kj/0FHyi1V+GvquiVrlFN+aHECIzNlCiSMO4MqfPUO1A+s9zkG2ZgPNNv+LoZqnokjbmKM4kdxexMxaL/Eo9Nd/bzdYiFYXlllEL7Uox+yV0N3loQ2juh4zn+ctCnwHi+V9X4l4rB8amW96WrXiJ/WqEK2UO8St8dcQWhCsUUm2OawSrbYYZw5HhJwz/Rhz2UsdSc56s5OUiQLJqpILYvCnqSLlF4iZdRSdDQNpKn+le3CeGUl5UUuvK2BpKGrbPKx0i/2ZSEMxNA5GnDMx/NyiNyDBcoPu/XOlNi8VWsEbCtoTQRamvqHjOmNcPrxCxds+TaF8c0wMR720yj5sWq8= jeschli@nixos"
-          ];
-        };
-      };
-    }
-    {
-      services.taskserver = {
-        enable = true;
-        fqdn = "enklave.r";
-        listenHost = "::";
-        listenPort = 53589;
-        organisations.lass.users = [ "jeschli" ];
-      };
-      networking.firewall.allowedTCPPorts = [ 53589 8001 ];
-    }
-  ];
-
-  krebs.build.host = config.krebs.hosts.enklave;
-}
diff --git a/jeschli/1systems/enklave/taskserver.nix b/jeschli/1systems/enklave/taskserver.nix
deleted file mode 100644
index 23b235d..0000000
--- a/jeschli/1systems/enklave/taskserver.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-    {
-      services.taskserver = {
-        enable = true;
-        fqdn = "enklave.r";
-        listenHost = "::";
-        listenPort = 53589;
-        organisations.lass.users = [ "jeschli" ];
-      };
-      networking.firewall.allowedTCPPorts = [ 53589 ];
-    }
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
deleted file mode 100644
index dec6956..0000000
--- a/jeschli/1systems/reagenzglas/config.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [
-    <stockholm/jeschli>
-    <stockholm/jeschli/2configs/emacs.nix>
-    <stockholm/jeschli/2configs/firefox.nix>
-    <stockholm/jeschli/2configs/rust.nix>
-    <stockholm/jeschli/2configs/steam.nix>
-    <stockholm/jeschli/2configs/python.nix>
-       ./desktop.nix
-       ./i3-configuration.nix
-       ./hardware-configuration.nix
-    ];
-
-  # EFI systemd boot loader
-  boot.loader.systemd-boot.enable = true;
-
-  # Wireless network with network manager
-  krebs.build.host = config.krebs.hosts.reagenzglas;
-  # networking.hostName = "nixos"; # Define your hostname.
-  networking.networkmanager.enable = true;
-
-  # Allow unfree
-  nixpkgs.config.allowUnfree = true;
-
-  # Select internationalisation properties.
-  i18n = {
-    consoleKeyMap = "us";
-    defaultLocale = "en_US.UTF-8";
-  };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    ag
-    alacritty
-    google-chrome
-    chromium
-    copyq
-    direnv
-    go
-    git
-    gitAndTools.hub
-    sbcl
-    rofi
-    vim
-    wget
-  ];
-
-  users.users.ombi = {
-     isNormalUser = true;
-     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-  };
-
-  users.users.jeschli = {
-    isNormalUser = true;
-    extraGroups = [ "audio" ];
-  };
-
-#  services.xserver.synaptics.enable = true;
-  services.xserver.libinput.enable = true;
-  services.xserver.libinput.disableWhileTyping = true;
-
-  hardware.pulseaudio.enable = true;
-
-  #Enable ssh daemon
-  services.openssh.enable = true;
-
-  #Enable clight
-  services.clight.enable = true;
-  services.geoclue2.enable = true;
-  location.provider = "geoclue2";
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM1xtX/SF2IzfAIzrXvH4HsW05eTBX8U8MYlEPadq0DS/nHC45hW2PSEUOVsH0UhBRAB+yClVLyN+JAYsuOoQacQqAVq9R7HAoFITdYTMJCxVs4urSRv0pWwTopRIh1rlI+Q0QfdMoeVtO2ZKG3KoRM+APDy2dsX8LTtWjXmh/ZCtpGl1O8TZtz2ZyXyv9OVDPnQiFwPU3Jqs2Z036c+kwxWlxYc55FRuqwRtQ48c/ilPMu+ZvQ22j1Ch8lNuliyAg1b8pZdOkMJF3R8b46IQ8FEqkr3L1YQygYw2M50B629FPgHgeGPMz3mVd+5lzP+okbhPJjMrUqZAUwbMGwGzZ ombi@nixos"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFXgtbgeivxlMKkoEJ4ANhtR+LRMSPrsmL4U5grFUME jeschli@nixos"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG7C3bgoL9VeVl8pgu8sp3PCOs6TXk4R9y7JKJAHGsfm root@baeckerei"
-  ];
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "19.03"; # Did you read the comment?
-
-}
diff --git a/jeschli/1systems/reagenzglas/desktop.nix b/jeschli/1systems/reagenzglas/desktop.nix
deleted file mode 100644
index 88eae08..0000000
--- a/jeschli/1systems/reagenzglas/desktop.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for the desktop environment
-
-{ config, lib, pkgs, ... }:
-{
-  # Configure basic X-server stuff:
-  services.xserver = {
-    enable = true;
-    xkbOptions = "caps:super";
-    exportConfiguration = true;
-
-    displayManager.lightdm.enable = true;
-  };
-
-  # Configure fonts
-  fonts = {
-    fonts = with pkgs; [
-      corefonts
-      font-awesome-ttf
-      noto-fonts-cjk
-      noto-fonts-emoji
-      powerline-fonts
-      helvetica-neue-lt-std
-    ];
-  };
-}
diff --git a/jeschli/1systems/reagenzglas/hardware-configuration.nix b/jeschli/1systems/reagenzglas/hardware-configuration.nix
deleted file mode 100644
index 55f5532..0000000
--- a/jeschli/1systems/reagenzglas/hardware-configuration.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.initrd.luks.devices = [
-  {
-    name = "root";
-    device = "/dev/nvme0n1p8";
-    preLVM = true;
-  }
-  ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4d01936e-c876-42c3-962a-d4a20ad0e2e0";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D455-E4CC";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}
diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
deleted file mode 100644
index 88f6342..0000000
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{pkgs, environment, config, lib, ... }:
-
-with pkgs;
-
-let
-  i3_config_file = pkgs.writeText "config" ''
-    set $mod Mod4
-
-    font pango:monospace 8
-
-    #font pango:DejaVu Sans Mono 8
-
-    # Before i3 v4.8, we used to recommend this one as the default:
-    # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-    # The font above is very space-efficient, that is, it looks good, sharp and
-    # clear in small sizes. However, its unicode glyph coverage is limited, the old
-    # X core fonts rendering does not support right-to-left and this being a bitmap
-    # font, it doesn’t scale on retina/hidpi displays.
-
-    # Use Mouse+$mod to drag floating windows to their wanted position
-    floating_modifier $mod
-
-    # start a terminal
-    bindsym $mod+Return exec alacritty
-
-    # kill focused window
-    bindsym $mod+Shift+q kill
-
-    # start dmenu (a program launcher)
-    # bindsym $mod+d exec dmenu_run
-
-    # start dmenu (a program launcher)
-    bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
-
-    bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
-
-    bindsym $mod+F1 exec xinput --list | grep Touchpad | sed 's/.*id=\([0-9][0-9]\).*/\1/' | xargs xinput disable
-    bindsym $mod+F2 exec xinput --list | grep Touchpad | sed 's/.*id=\([0-9][0-9]\).*/\1/' | xargs xinput enable
-
-    # There also is the (new) i3-dmenu-desktop which only displays applications
-    # shipping a .desktop file. It is a wrapper around dmenu, so you need that
-    # installed.
-    # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-    # change focus
-    bindsym $mod+j focus left
-    bindsym $mod+k focus down
-    bindsym $mod+l focus up
-    bindsym $mod+semicolon focus right
-
-    # alternatively, you can use the cursor keys:
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # move focused window
-    bindsym $mod+Shift+j move left
-    bindsym $mod+Shift+k move down
-    bindsym $mod+Shift+l move up
-    bindsym $mod+Shift+colon move right
-
-    # alternatively, you can use the cursor keys:
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-
-    # split in horizontal orientation
-    bindsym $mod+h split h
-
-    # split in vertical orientation
-    bindsym $mod+v split v
-
-    # enter fullscreen mode for the focused container
-    bindsym $mod+f fullscreen toggle
-
-    # change container layout (stacked, tabbed, toggle split)
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # toggle tiling / floating
-    bindsym $mod+Shift+space floating toggle
-
-    # change focus between tiling / floating windows
-    bindsym $mod+space focus mode_toggle
-
-    # focus the parent container
-    bindsym $mod+a focus parent
-
-    # focus the child container
-    #bindsym $mod+d focus child
-
-    # Define names for default workspaces for which we configure key bindings later on.
-    # We use variables to avoid repeating the names in multiple places.
-    set $ws1 "1"
-    set $ws2 "2"
-    set $ws3 "3"
-    set $ws4 "4"
-    set $ws5 "5"
-    set $ws6 "6"
-    set $ws7 "7"
-    set $ws8 "8"
-    set $ws9 "9"
-    set $ws10 "10"
-
-    # switch to workspace
-    bindsym $mod+1 workspace $ws1
-    bindsym $mod+2 workspace $ws2
-    bindsym $mod+3 workspace $ws3
-    bindsym $mod+4 workspace $ws4
-    bindsym $mod+5 workspace $ws5
-    bindsym $mod+6 workspace $ws6
-    bindsym $mod+7 workspace $ws7
-    bindsym $mod+8 workspace $ws8
-    bindsym $mod+9 workspace $ws9
-    bindsym $mod+0 workspace $ws10
-
-    # move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace $ws1
-    bindsym $mod+Shift+2 move container to workspace $ws2
-    bindsym $mod+Shift+3 move container to workspace $ws3
-    bindsym $mod+Shift+4 move container to workspace $ws4
-    bindsym $mod+Shift+5 move container to workspace $ws5
-    bindsym $mod+Shift+6 move container to workspace $ws6
-    bindsym $mod+Shift+7 move container to workspace $ws7
-    bindsym $mod+Shift+8 move container to workspace $ws8
-    bindsym $mod+Shift+9 move container to workspace $ws9
-    bindsym $mod+Shift+0 move container to workspace $ws10
-
-    # reload the configuration file
-    bindsym $mod+Shift+c reload
-    # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-    bindsym $mod+Shift+r restart
-    # exit i3 (logs you out of your X session)
-    bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-    # resize window (you can also use the mouse for that)
-    mode "resize" {
-            # These bindings trigger as soon as you enter the resize mode
-
-            # Pressing left will shrink the window’s width.
-            # Pressing right will grow the window’s width.
-            # Pressing up will shrink the window’s height.
-            # Pressing down will grow the window’s height.
-            bindsym j resize shrink width 10 px or 10 ppt
-            bindsym k resize grow height 10 px or 10 ppt
-            bindsym l resize shrink height 10 px or 10 ppt
-            bindsym semicolon resize grow width 10 px or 10 ppt
-
-            # same bindings, but for the arrow keys
-            bindsym Left resize shrink width 10 px or 10 ppt
-            bindsym Down resize grow height 10 px or 10 ppt
-            bindsym Up resize shrink height 10 px or 10 ppt
-            bindsym Right resize grow width 10 px or 10 ppt
-
-            # back to normal: Enter or Escape or $mod+r
-            bindsym Return mode "default"
-            bindsym Escape mode "default"
-            bindsym $mod+r mode "default"
-    }
-
-    bindsym $mod+r mode "resize"
-
-    # Start i3bar to display a workspace bar (plus the system information i3status
-    # finds out, if available)
-    bar {
-            status_command i3status
-    }
-  '';
-
-in {
-
-  services.xserver.windowManager.i3 = {
-    enable = true;
-    package = pkgs.i3;
-    configFile = i3_config_file;
-  };
-
-}
diff --git a/jeschli/2configs/IM.nix b/jeschli/2configs/IM.nix
deleted file mode 100644
index 2366726..0000000
--- a/jeschli/2configs/IM.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-with (import <stockholm/lib>);
-{ config, lib, pkgs, ... }:
-let
-  tmux = pkgs.writeDashBin "tmux" ''
-    export TERM=xterm-256color
-    exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
-      set-option -g default-terminal screen-256color
-    ''} "$@"
-  '';
-in {
-
-  services.bitlbee = {
-    enable = true;
-    portNumber = 6666;
-    plugins = [
-      pkgs.bitlbee-facebook
-      pkgs.bitlbee-steam
-      pkgs.bitlbee-discord
-    ];
-    libpurple_plugins = [ pkgs.telegram-purple ];
-  };
-
-  users.extraUsers.chat = {
-    home = "/home/chat";
-    uid = genid "chat";
-    useDefaultShell = true;
-    createHome = true;
-    openssh.authorizedKeys.keys = with config.krebs.users; [
-      jeschli.pubkey
-      jeschli-bln.pubkey
-      jeschli-brauerei.pubkey
-      jeschli-bolide.pubkey
-    ];
-    packages = [ tmux ];
-  };
-
-
-  systemd.services.chat = {
-    description = "chat environment setup";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    restartIfChanged = false;
-
-    path = [
-      pkgs.rxvt_unicode.terminfo
-    ];
-
-    serviceConfig = {
-      User = "chat";
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${tmux}/bin/tmux -2 new-session -d -s IM ${pkgs.weechat}/bin/weechat";
-      ExecStop = "${tmux}/bin/tmux kill-session -t IM";
-    };
-  };
-}
diff --git a/jeschli/2configs/default.nix b/jeschli/2configs/default.nix
deleted file mode 100644
index 8b61fa2..0000000
--- a/jeschli/2configs/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
-  imports = [
-#    ./vim.nix
-    ./retiolum.nix
-    ./zsh.nix
-    <stockholm/lass/2configs/security-workarounds.nix>
-    {
-      environment.variables = {
-        NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
-      };
-    }
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-
-  environment.systemPackages = with pkgs; [
-  #stockholm
-    git
-    gnumake
-    jq
-    parallel
-    proot
-    populate
-
-  # aliases
-    (writeDashBin "irc" "ssh chat@enklave -t tmux a")
-
-  #style
-    most
-    rxvt_unicode.terminfo
-
-  #monitoring tools
-    htop
-    iotop
-
-  #network
-    iptables
-    iftop
-
-  #stuff for dl
-    aria2
-
-  #neat utils
-    file
-    kpaste
-    krebspaste
-    mosh
-    pciutils
-    psmisc
-   # q
-   # rs
-    tmux
-    untilport
-    usbutils
-  #  logify
-    goify
-    vim
-  #unpack stuff
-    p7zip
-    unzip
-    unrar
-
-    (pkgs.writeDashBin "sshn" ''
-      ${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"
-    '')
-  ];
-
-  krebs.enable = true;
-  networking.hostName = config.krebs.build.host.name;
-}
diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
deleted file mode 160000
-Subproject 279d6a01f5abbab5d28d3a57549b7fec800a510
diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
deleted file mode 100644
index 0420dc4..0000000
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ /dev/null
@@ -1,2025 +0,0 @@
-let
-  modifiedBerndHansen = ''
-;; Based on http://doc.norang.ca/org-mode.html
-;; Organize your life in plain text
-;; TODO: minimize this section
-(if (boundp 'org-mode-user-lisp-path)
-    (add-to-list 'load-path org-mode-user-lisp-path)
-  (add-to-list 'load-path (expand-file-name "~/git/org-mode/lisp")))
-
-(add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
-(require 'org)
-
-(add-to-list 'org-modules 'org-habit)
-
-;;
-;; Standard key bindings
-(global-set-key "\C-cl" 'org-store-link)
-(global-set-key "\C-ca" 'org-agenda)
-(global-set-key "\C-cb" 'org-iswitchb)
-
-;; The following setting is different from the document so that you
-;; can override the document org-agenda-files by setting your
-;; org-agenda-files in the variable org-user-agenda-files
-;;
-;; (if (boundp 'org-user-agenda-files)
-;;     (setq org-agenda-files org-user-agenda-files)
-;;   (setq org-agenda-files (quote ("~/git/org"))))
-
-;; Custom Key Bindings
-(global-set-key (kbd "<f12>") 'org-agenda)
-(global-set-key (kbd "<S-f5>") 'bh/widen)
-(global-set-key (kbd "<f9> <f9>") 'bh/show-org-agenda)
-(global-set-key (kbd "<f9> b") 'bbdb)
-(global-set-key (kbd "<f9> c") 'calendar)
-(global-set-key (kbd "<f9> f") 'boxquote-insert-file)
-(global-set-key (kbd "<f9> g") 'gnus)
-(global-set-key (kbd "<f9> h") 'bh/hide-other)
-(global-set-key (kbd "<f9> n") 'bh/toggle-next-task-display)
-
-(global-set-key (kbd "<f9> I") 'bh/punch-in)
-(global-set-key (kbd "<f9> O") 'bh/punch-out)
-
-(global-set-key (kbd "<f9> o") 'bh/make-org-scratch)
-
-(global-set-key (kbd "<f9> r") 'boxquote-region)
-(global-set-key (kbd "<f9> s") 'bh/switch-to-scratch)
-
-(global-set-key (kbd "<f9> t") 'bh/insert-inactive-timestamp)
-(global-set-key (kbd "<f9> T") 'bh/toggle-insert-inactive-timestamp)
-
-(global-set-key (kbd "<f9> v") 'visible-mode)
-(global-set-key (kbd "<f9> l") 'org-toggle-link-display)
-(global-set-key (kbd "<f9> SPC") 'bh/clock-in-last-task)
-(global-set-key (kbd "C-<f9>") 'previous-buffer)
-(global-set-key (kbd "M-<f9>") 'org-toggle-inline-images)
-(global-set-key (kbd "C-x n r") 'narrow-to-region)
-(global-set-key (kbd "C-<f10>") 'next-buffer)
-(global-set-key (kbd "<f11>") 'org-clock-goto)
-(global-set-key (kbd "C-<f11>") 'org-clock-in)
-(global-set-key (kbd "C-s-<f12>") 'bh/save-then-publish)
-(global-set-key (kbd "C-c c") 'org-capture)
-
-(defun bh/hide-other ()
-  (interactive)
-  (save-excursion
-    (org-back-to-heading 'invisible-ok)
-    (hide-other)
-    (org-cycle)
-    (org-cycle)
-    (org-cycle)))
-
-(defun bh/set-truncate-lines ()
-  "Toggle value of truncate-lines and refresh window display."
-  (interactive)
-  (setq truncate-lines (not truncate-lines))
-  ;; now refresh window display (an idiom from simple.el):
-  (save-excursion
-    (set-window-start (selected-window)
-                      (window-start (selected-window)))))
-
-(defun bh/make-org-scratch ()
-  (interactive)
-  (find-file "/tmp/publish/scratch.org")
-  (gnus-make-directory "/tmp/publish"))
-
-(defun bh/switch-to-scratch ()
-  (interactive)
-  (switch-to-buffer "*scratch*"))
-
-(setq org-todo-keywords
-      (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
-              (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" "PHONE" "MEETING"))))
-
-(setq org-todo-keyword-faces
-      (quote (("TODO" :foreground "red" :weight bold)
-              ("NEXT" :foreground "blue" :weight bold)
-              ("DONE" :foreground "forest green" :weight bold)
-              ("WAITING" :foreground "orange" :weight bold)
-              ("HOLD" :foreground "magenta" :weight bold)
-              ("CANCELLED" :foreground "forest green" :weight bold)
-              ("MEETING" :foreground "forest green" :weight bold)
-              ("PHONE" :foreground "forest green" :weight bold))))
-
-(setq org-use-fast-todo-selection t)
-
-(setq org-treat-S-cursor-todo-selection-as-state-change nil)
-
-(setq org-todo-state-tags-triggers
-      (quote (("CANCELLED" ("CANCELLED" . t))
-              ("WAITING" ("WAITING" . t))
-              ("HOLD" ("WAITING") ("HOLD" . t))
-              (done ("WAITING") ("HOLD"))
-              ("TODO" ("WAITING") ("CANCELLED") ("HOLD"))
-              ("NEXT" ("WAITING") ("CANCELLED") ("HOLD"))
-              ("DONE" ("WAITING") ("CANCELLED") ("HOLD")))))
-
-(setq org-directory "~/projects/notes_privat")
-(setq org-default-notes-file "~/projects/notes_privat/refile.org")
-
-;; I use C-c c to start capture mode
-(global-set-key (kbd "C-c c") 'org-capture)
-
-;; Capture templates for: TODO tasks, Notes, appointments, phone calls, meetings, and org-protocol
-(setq org-capture-templates
-      (quote (("t" "todo" entry (file org-default-notes-file)
-               "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t)
-              ("r" "respond" entry (file org-default-notes-file)
-               "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t)
-              ("n" "note" entry (file org-default-notes-file)
-               "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
-              ("j" "Journal" entry (file+datetree "~/git/org/diary.org")
-               "* %?\n%U\n" :clock-in t :clock-resume t)
-              ("w" "org-protocol" entry (file org-default-notes-file)
-               "* TODO Review %c\n%U\n" :immediate-finish t)
-              ("m" "Meeting" entry (file org-default-notes-file)
-               "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
-              ("p" "Phone call" entry (file org-default-notes-file)
-               "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
-              ("h" "Habit" entry (file org-default-notes-file)
-               "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n"))))
-
-;; Remove empty LOGBOOK drawers on clock out
-(defun bh/remove-empty-drawer-on-clock-out ()
-  (interactive)
-  (save-excursion
-    (beginning-of-line 0)
-    (org-remove-empty-drawer-at (point))))
-
-(add-hook 'org-clock-out-hook 'bh/remove-empty-drawer-on-clock-out 'append)
-
-; Targets include this file and any file contributing to the agenda - up to 9 levels deep
-(setq org-refile-targets (quote ((nil :maxlevel . 9)
-                                 (org-agenda-files :maxlevel . 9))))
-
-; Use full outline paths for refile targets - we file directly with IDO
-(setq org-refile-use-outline-path t)
-
-; Targets complete directly with IDO
-(setq org-outline-path-complete-in-steps nil)
-
-; Allow refile to create parent tasks with confirmation
-(setq org-refile-allow-creating-parent-nodes (quote confirm))
-
-; Use IDO for both buffer and file completion and ido-everywhere to t
-; (setq org-completion-use-ido t)
-; (setq ido-everywhere t)
-; (setq ido-max-directory-size 100000)
-; (ido-mode (quote both))
-; ; Use the current window when visiting files and buffers with ido
-; (setq ido-default-file-method 'selected-window)
-; (setq ido-default-buffer-method 'selected-window)
-; ; Use the current window for indirect buffer display
-(setq org-indirect-buffer-display 'current-window)
-
-;;;; Refile settings
-; Exclude DONE state tasks from refile targets
-(defun bh/verify-refile-target ()
-  "Exclude todo keywords with a done state from refile targets"
-  (not (member (nth 2 (org-heading-components)) org-done-keywords)))
-
-(setq org-refile-target-verify-function 'bh/verify-refile-target)
-
-;; Do not dim blocked tasks
-(setq org-agenda-dim-blocked-tasks nil)
-
-;; Compact the block agenda view
-(setq org-agenda-compact-blocks t)
-
-;; Custom agenda command definitions
-(setq org-agenda-custom-commands
-      (quote (("N" "Notes" tags "NOTE"
-               ((org-agenda-overriding-header "Notes")
-                (org-tags-match-list-sublevels t)))
-              ("h" "Habits" tags-todo "STYLE=\"habit\""
-               ((org-agenda-overriding-header "Habits")
-                (org-agenda-sorting-strategy
-                 '(todo-state-down effort-up category-keep))))
-              (" " "Agenda"
-               ((agenda "" nil)
-                (tags "REFILE"
-                      ((org-agenda-overriding-header "Tasks to Refile")
-                       (org-tags-match-list-sublevels nil)))
-                (tags-todo "-CANCELLED/!"
-                           ((org-agenda-overriding-header "Stuck Projects")
-                            (org-agenda-skip-function 'bh/skip-non-stuck-projects)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "-HOLD-CANCELLED/!"
-                           ((org-agenda-overriding-header "Projects")
-                            (org-agenda-skip-function 'bh/skip-non-projects)
-                            (org-tags-match-list-sublevels 'indented)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "-CANCELLED/!NEXT"
-                           ((org-agenda-overriding-header (concat "Project Next Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-projects-and-habits-and-single-tasks)
-                            (org-tags-match-list-sublevels t)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(todo-state-down effort-up category-keep))))
-                (tags-todo "-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Project Subtasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Standalone Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "-CANCELLED+WAITING|HOLD/!"
-                           ((org-agenda-overriding-header (concat "Waiting and Postponed Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-tasks)
-                            (org-tags-match-list-sublevels nil)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)))
-                (tags "-REFILE/"
-                      ((org-agenda-overriding-header "Tasks to Archive")
-                       (org-agenda-skip-function 'bh/skip-non-archivable-tasks)
-                       (org-tags-match-list-sublevels nil))))
-               nil)
-              ("1" "Agenda (@buero|@vpn|WORK)"
-               ((agenda "" nil)
-                (tags "REFILE"
-                      ((org-agenda-overriding-header "Tasks to Refile")
-                       (org-tags-match-list-sublevels nil)))
-                (tags-todo "@buero|@vpn|WORK-CANCELLED/!"
-                           ((org-agenda-overriding-header "Stuck Projects")
-                            (org-agenda-skip-function 'bh/skip-non-stuck-projects)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@buero|@vpn|WORK-HOLD-CANCELLED/!"
-                           ((org-agenda-overriding-header "Projects")
-                            (org-agenda-skip-function 'bh/skip-non-projects)
-                            (org-tags-match-list-sublevels 'indented)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@buero|@vpn|WORK-CANCELLED/!NEXT"
-                           ((org-agenda-overriding-header (concat "Project Next Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-projects-and-habits-and-single-tasks)
-                            (org-tags-match-list-sublevels t)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(todo-state-down effort-up category-keep))))
-                (tags-todo "@buero|@vpn|WORK-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Project Subtasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@buero|@vpn|WORK-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Standalone Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@buero|@vpn|WORK-CANCELLED+WAITING|HOLD/!"
-                           ((org-agenda-overriding-header (concat "Waiting and Postponed Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-tasks)
-                            (org-tags-match-list-sublevels nil)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)))
-                (tags "@buero|@vpn|WORK-REFILE/"
-                      ((org-agenda-overriding-header "Tasks to Archive")
-                       (org-agenda-skip-function 'bh/skip-non-archivable-tasks)
-                       (org-tags-match-list-sublevels nil))))
-               nil)
-               ("2" "Agenda (@inet|@home))"
-               ((agenda "" nil)
-                (tags "REFILE"
-                      ((org-agenda-overriding-header "Tasks to Refile")
-                       (org-tags-match-list-sublevels nil)))
-                (tags-todo "@inet|@home-CANCELLED/!"
-                           ((org-agenda-overriding-header "Stuck Projects")
-                            (org-agenda-skip-function 'bh/skip-non-stuck-projects)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@inet|@home-HOLD-CANCELLED/!"
-                           ((org-agenda-overriding-header "Projects")
-                            (org-agenda-skip-function 'bh/skip-non-projects)
-                            (org-tags-match-list-sublevels 'indented)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@inet|@home-CANCELLED/!NEXT"
-                           ((org-agenda-overriding-header (concat "Project Next Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-projects-and-habits-and-single-tasks)
-                            (org-tags-match-list-sublevels t)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(todo-state-down effort-up category-keep))))
-                (tags-todo "@inet|@home-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Project Subtasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@inet|@home-REFILE-CANCELLED-WAITING-HOLD/!"
-                           ((org-agenda-overriding-header (concat "Standalone Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-project-tasks)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-with-date bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-sorting-strategy
-                             '(category-keep))))
-                (tags-todo "@inet|@home-CANCELLED+WAITING|HOLD/!"
-                           ((org-agenda-overriding-header (concat "Waiting and Postponed Tasks"
-                                                                  (if bh/hide-scheduled-and-waiting-next-tasks
-                                                                      ""
-                                                                    " (including WAITING and SCHEDULED tasks)")))
-                            (org-agenda-skip-function 'bh/skip-non-tasks)
-                            (org-tags-match-list-sublevels nil)
-                            (org-agenda-todo-ignore-scheduled bh/hide-scheduled-and-waiting-next-tasks)
-                            (org-agenda-todo-ignore-deadlines bh/hide-scheduled-and-waiting-next-tasks)))
-                (tags "@inet|@home-REFILE/"
-                      ((org-agenda-overriding-header "Tasks to Archive")
-                       (org-agenda-skip-function 'bh/skip-non-archivable-tasks)
-                       (org-tags-match-list-sublevels nil))))
-               nil)
-              )))
-
-(defun bh/org-auto-exclude-function (tag)
-  "Automatic task exclusion in the agenda with / RET"
-  (and (cond
-        ((string= tag "hold")
-         t)
-        ((string= tag "farm")
-         t))
-       (concat "-" tag)))
-
-(setq org-agenda-auto-exclude-function 'bh/org-auto-exclude-function)
-
-;;
-;; Resume clocking task when emacs is restarted
-(org-clock-persistence-insinuate)
-;;
-;; Show lot of clocking history so it's easy to pick items off the C-F11 list
-(setq org-clock-history-length 23)
-;; Resume clocking task on clock-in if the clock is open
-(setq org-clock-in-resume t)
-;; Change tasks to NEXT when clocking in
-(setq org-clock-in-switch-to-state 'bh/clock-in-to-next)
-;; Separate drawers for clocking and logs
-(setq org-drawers (quote ("PROPERTIES" "LOGBOOK")))
-;; Save clock data and state changes and notes in the LOGBOOK drawer
-(setq org-clock-into-drawer t)
-;; Sometimes I change tasks I'm clocking quickly - this removes clocked tasks with 0:00 duration
-(setq org-clock-out-remove-zero-time-clocks t)
-;; Clock out when moving task to a done state
-(setq org-clock-out-when-done t)
-;; Save the running clock and all clock history when exiting Emacs, load it on startup
-(setq org-clock-persist t)
-;; Do not prompt to resume an active clock
-(setq org-clock-persist-query-resume nil)
-;; Enable auto clock resolution for finding open clocks
-(setq org-clock-auto-clock-resolution (quote when-no-clock-is-running))
-;; Include current clocking task in clock reports
-(setq org-clock-report-include-clocking-task t)
-
-(setq bh/keep-clock-running nil)
-
-(defun bh/clock-in-to-next (kw)
-  "Switch a task from TODO to NEXT when clocking in.
-Skips capture tasks, projects, and subprojects.
-Switch projects and subprojects from NEXT back to TODO"
-  (when (not (and (boundp 'org-capture-mode) org-capture-mode))
-    (cond
-     ((and (member (org-get-todo-state) (list "TODO"))
-           (bh/is-task-p))
-      "NEXT")
-     ((and (member (org-get-todo-state) (list "NEXT"))
-           (bh/is-project-p))
-      "TODO"))))
-
-(defun bh/find-project-task ()
-  "Move point to the parent (project) task if any"
-  (save-restriction
-    (widen)
-    (let ((parent-task (save-excursion (org-back-to-heading 'invisible-ok) (point))))
-      (while (org-up-heading-safe)
-        (when (member (nth 2 (org-heading-components)) org-todo-keywords-1)
-          (setq parent-task (point))))
-      (goto-char parent-task)
-      parent-task)))
-
-(defun bh/punch-in (arg)
-  "Start continuous clocking and set the default task to the
-selected task.  If no task is selected set the Organization task
-as the default task."
-  (interactive "p")
-  (setq bh/keep-clock-running t)
-  (if (equal major-mode 'org-agenda-mode)
-      ;;
-      ;; We're in the agenda
-      ;;
-      (let* ((marker (org-get-at-bol 'org-hd-marker))
-             (tags (org-with-point-at marker (org-get-tags-at))))
-        (if (and (eq arg 4) tags)
-            (org-agenda-clock-in '(16))
-          (bh/clock-in-organization-task-as-default)))
-    ;;
-    ;; We are not in the agenda
-    ;;
-    (save-restriction
-      (widen)
-      ; Find the tags on the current task
-      (if (and (equal major-mode 'org-mode) (not (org-before-first-heading-p)) (eq arg 4))
-          (org-clock-in '(16))
-        (bh/clock-in-organization-task-as-default)))))
-
-(defun bh/punch-out ()
-  (interactive)
-  (setq bh/keep-clock-running nil)
-  (when (org-clock-is-active)
-    (org-clock-out))
-  (org-agenda-remove-restriction-lock))
-
-(defun bh/clock-in-default-task ()
-  (save-excursion
-    (org-with-point-at org-clock-default-task
-      (org-clock-in))))
-
-(defun bh/clock-in-parent-task ()
-  "Move point to the parent (project) task if any and clock in"
-  (let ((parent-task))
-    (save-excursion
-      (save-restriction
-        (widen)
-        (while (and (not parent-task) (org-up-heading-safe))
-          (when (member (nth 2 (org-heading-components)) org-todo-keywords-1)
-            (setq parent-task (point))))
-        (if parent-task
-            (org-with-point-at parent-task
-              (org-clock-in))
-          (when bh/keep-clock-running
-            (bh/clock-in-default-task)))))))
-
-(defvar bh/organization-task-id "eb155a82-92b2-4f25-a3c6-0304591af2f9")
-
-(defun bh/clock-in-organization-task-as-default ()
-  (interactive)
-  (org-with-point-at (org-id-find bh/organization-task-id 'marker)
-    (org-clock-in '(16))))
-
-(defun bh/clock-out-maybe ()
-  (when (and bh/keep-clock-running
-             (not org-clock-clocking-in)
-             (marker-buffer org-clock-default-task)
-             (not org-clock-resolving-clocks-due-to-idleness))
-    (bh/clock-in-parent-task)))
-
-(add-hook 'org-clock-out-hook 'bh/clock-out-maybe 'append)
-
-(require 'org-id)
-(defun bh/clock-in-task-by-id (id)
-  "Clock in a task by id"
-  (org-with-point-at (org-id-find id 'marker)
-    (org-clock-in nil)))
-
-(defun bh/clock-in-last-task (arg)
-  "Clock in the interrupted task if there is one
-Skip the default task and get the next one.
-A prefix arg forces clock in of the default task."
-  (interactive "p")
-  (let ((clock-in-to-task
-         (cond
-          ((eq arg 4) org-clock-default-task)
-          ((and (org-clock-is-active)
-                (equal org-clock-default-task (cadr org-clock-history)))
-           (caddr org-clock-history))
-          ((org-clock-is-active) (cadr org-clock-history))
-          ((equal org-clock-default-task (car org-clock-history)) (cadr org-clock-history))
-          (t (car org-clock-history)))))
-    (widen)
-    (org-with-point-at clock-in-to-task
-      (org-clock-in nil))))
-
-(setq org-time-stamp-rounding-minutes (quote (1 1)))
-
-(setq org-agenda-clock-consistency-checks
-      (quote (:max-duration "4:00"
-              :min-duration 0
-              :max-gap 0
-              :gap-ok-around ("4:00"))))
-
-;; Sometimes I change tasks I'm clocking quickly - this removes clocked tasks with 0:00 duration
-(setq org-clock-out-remove-zero-time-clocks t)
-
-;; Agenda clock report parameters
-(setq org-agenda-clockreport-parameter-plist
-      (quote (:link t :maxlevel 5 :fileskip0 t :compact t :narrow 80)))
-
-; Set default column view headings: Task Effort Clock_Summary
-(setq org-columns-default-format "%80ITEM(Task) %10Effort(Effort){:} %10CLOCKSUM")
-
-; global Effort estimate values
-; global STYLE property values for completion
-(setq org-global-properties (quote (("Effort_ALL" . "0:15 0:30 0:45 1:00 2:00 3:00 4:00 5:00 6:00 0:00")
-                                    ("STYLE_ALL" . "habit"))))
-
-;; Agenda log mode items to display (closed and state changes by default)
-(setq org-agenda-log-mode-items (quote (closed state)))
-
-; Tags with fast selection keys
-(setq org-tag-alist (quote ((:startgroup)
-                            ("@errand" . ?E)
-                            ("@buero" . ?B)
-                            ("@omw" . ?O)
-                            ("@vpn" . ?V)
-                            ("@inet" . ?I)
-                            ("@home" . ?H)
-                            (:endgroup)
-                            ("WAITING" . ?w)
-                            ("HOLD" . ?h)
-                            ("PERSONAL" . ?p)
-                            ("WORK" . ?w)
-                            ("ORG" . ?o)
-                            ("crypt" . ?e)
-                            ("NOTE" . ?n)
-                            ("CANCELLED" . ?c)
-                            ("FLAGGED" . ??))))
-
-; Allow setting single tags without the menu
-(setq org-fast-tag-selection-single-key (quote expert))
-
-; For tag searches ignore tasks with scheduled and deadline dates
-(setq org-agenda-tags-todo-honor-ignore-options t)
-
-(require 'bbdb)
-(require 'bbdb-com)
-
-(global-set-key (kbd "<f9> p") 'bh/phone-call)
-
-;;
-;; Phone capture template handling with BBDB lookup
-;; Adapted from code by Gregory J. Grubbs
-(defun bh/phone-call ()
-  "Return name and company info for caller from bbdb lookup"
-  (interactive)
-  (let* (name rec caller)
-    (setq name (completing-read "Who is calling? "
-                                (bbdb-hashtable)
-                                'bbdb-completion-predicate
-                                'confirm))
-    (when (> (length name) 0)
-      ; Something was supplied - look it up in bbdb
-      (setq rec
-            (or (first
-                 (or (bbdb-search (bbdb-records) name nil nil)
-                     (bbdb-search (bbdb-records) nil name nil)))
-                name)))
-
-    ; Build the bbdb link if we have a bbdb record, otherwise just return the name
-    (setq caller (cond ((and rec (vectorp rec))
-                        (let ((name (bbdb-record-name rec))
-                              (company (bbdb-record-company rec)))
-                          (concat "[[bbdb:"
-                                  name "]["
-                                  name "]]"
-                                  (when company
-                                    (concat " - " company)))))
-                       (rec)
-                       (t "NameOfCaller")))
-    (insert caller)))
-
-(setq org-agenda-span 'day)
-
-(setq org-stuck-projects (quote ("" nil nil "")))
-
-(defun bh/is-project-p ()
-  "Any task with a todo keyword subtask"
-  (save-restriction
-    (widen)
-    (let ((has-subtask)
-          (subtree-end (save-excursion (org-end-of-subtree t)))
-          (is-a-task (member (nth 2 (org-heading-components)) org-todo-keywords-1)))
-      (save-excursion
-        (forward-line 1)
-        (while (and (not has-subtask)
-                    (< (point) subtree-end)
-                    (re-search-forward "^\*+ " subtree-end t))
-          (when (member (org-get-todo-state) org-todo-keywords-1)
-            (setq has-subtask t))))
-      (and is-a-task has-subtask))))
-
-(defun bh/is-project-subtree-p ()
-  "Any task with a todo keyword that is in a project subtree.
-Callers of this function already widen the buffer view."
-  (let ((task (save-excursion (org-back-to-heading 'invisible-ok)
-                              (point))))
-    (save-excursion
-      (bh/find-project-task)
-      (if (equal (point) task)
-          nil
-        t))))
-
-(defun bh/is-task-p ()
-  "Any task with a todo keyword and no subtask"
-  (save-restriction
-    (widen)
-    (let ((has-subtask)
-          (subtree-end (save-excursion (org-end-of-subtree t)))
-          (is-a-task (member (nth 2 (org-heading-components)) org-todo-keywords-1)))
-      (save-excursion
-        (forward-line 1)
-        (while (and (not has-subtask)
-                    (< (point) subtree-end)
-                    (re-search-forward "^\*+ " subtree-end t))
-          (when (member (org-get-todo-state) org-todo-keywords-1)
-            (setq has-subtask t))))
-      (and is-a-task (not has-subtask)))))
-
-(defun bh/is-subproject-p ()
-  "Any task which is a subtask of another project"
-  (let ((is-subproject)
-        (is-a-task (member (nth 2 (org-heading-components)) org-todo-keywords-1)))
-    (save-excursion
-      (while (and (not is-subproject) (org-up-heading-safe))
-        (when (member (nth 2 (org-heading-components)) org-todo-keywords-1)
-          (setq is-subproject t))))
-    (and is-a-task is-subproject)))
-
-(defun bh/list-sublevels-for-projects-indented ()
-  "Set org-tags-match-list-sublevels so when restricted to a subtree we list all subtasks.
-  This is normally used by skipping functions where this variable is already local to the agenda."
-  (if (marker-buffer org-agenda-restrict-begin)
-      (setq org-tags-match-list-sublevels 'indented)
-    (setq org-tags-match-list-sublevels nil))
-  nil)
-
-(defun bh/list-sublevels-for-projects ()
-  "Set org-tags-match-list-sublevels so when restricted to a subtree we list all subtasks.
-  This is normally used by skipping functions where this variable is already local to the agenda."
-  (if (marker-buffer org-agenda-restrict-begin)
-      (setq org-tags-match-list-sublevels t)
-    (setq org-tags-match-list-sublevels nil))
-  nil)
-
-(defvar bh/hide-scheduled-and-waiting-next-tasks t)
-
-(defun bh/toggle-next-task-display ()
-  (interactive)
-  (setq bh/hide-scheduled-and-waiting-next-tasks (not bh/hide-scheduled-and-waiting-next-tasks))
-  (when  (equal major-mode 'org-agenda-mode)
-    (org-agenda-redo))
-  (message "%s WAITING and SCHEDULED NEXT Tasks" (if bh/hide-scheduled-and-waiting-next-tasks "Hide" "Show")))
-
-(defun bh/skip-stuck-projects ()
-  "Skip trees that are not stuck projects"
-  (save-restriction
-    (widen)
-    (let ((next-headline (save-excursion (or (outline-next-heading) (point-max)))))
-      (if (bh/is-project-p)
-          (let* ((subtree-end (save-excursion (org-end-of-subtree t)))
-                 (has-next ))
-            (save-excursion
-              (forward-line 1)
-              (while (and (not has-next) (< (point) subtree-end) (re-search-forward "^\\*+ NEXT " subtree-end t))
-                (unless (member "WAITING" (org-get-tags-at))
-                  (setq has-next t))))
-            (if has-next
-                nil
-              next-headline)) ; a stuck project, has subtasks but no next task
-        nil))))
-
-(defun bh/skip-non-stuck-projects ()
-  "Skip trees that are not stuck projects"
-  ;; (bh/list-sublevels-for-projects-indented)
-  (save-restriction
-    (widen)
-    (let ((next-headline (save-excursion (or (outline-next-heading) (point-max)))))
-      (if (bh/is-project-p)
-          (let* ((subtree-end (save-excursion (org-end-of-subtree t)))
-                 (has-next ))
-            (save-excursion
-              (forward-line 1)
-              (while (and (not has-next) (< (point) subtree-end) (re-search-forward "^\\*+ NEXT " subtree-end t))
-                (unless (member "WAITING" (org-get-tags-at))
-                  (setq has-next t))))
-            (if has-next
-                next-headline
-              nil)) ; a stuck project, has subtasks but no next task
-        next-headline))))
-
-(defun bh/skip-non-projects ()
-  "Skip trees that are not projects"
-  ;; (bh/list-sublevels-for-projects-indented)
-  (if (save-excursion (bh/skip-non-stuck-projects))
-      (save-restriction
-        (widen)
-        (let ((subtree-end (save-excursion (org-end-of-subtree t))))
-          (cond
-           ((bh/is-project-p)
-            nil)
-           ((and (bh/is-project-subtree-p) (not (bh/is-task-p)))
-            nil)
-           (t
-            subtree-end))))
-    (save-excursion (org-end-of-subtree t))))
-
-(defun bh/skip-non-tasks ()
-  "Show non-project tasks.
-Skip project and sub-project tasks, habits, and project related tasks."
-  (save-restriction
-    (widen)
-    (let ((next-headline (save-excursion (or (outline-next-heading) (point-max)))))
-      (cond
-       ((bh/is-task-p)
-        nil)
-       (t
-        next-headline)))))
-
-(defun bh/skip-project-trees-and-habits ()
-  "Skip trees that are projects"
-  (save-restriction
-    (widen)
-    (let ((subtree-end (save-excursion (org-end-of-subtree t))))
-      (cond
-       ((bh/is-project-p)
-        subtree-end)
-       ((org-is-habit-p)
-        subtree-end)
-       (t
-        nil)))))
-
-(defun bh/skip-projects-and-habits-and-single-tasks ()
-  "Skip trees that are projects, tasks that are habits, single non-project tasks"
-  (save-restriction
-    (widen)
-    (let ((next-headline (save-excursion (or (outline-next-heading) (point-max)))))
-      (cond
-       ((org-is-habit-p)
-        next-headline)
-       ((and bh/hide-scheduled-and-waiting-next-tasks
-             (member "WAITING" (org-get-tags-at)))
-        next-headline)
-       ((bh/is-project-p)
-        next-headline)
-       ((and (bh/is-task-p) (not (bh/is-project-subtree-p)))
-        next-headline)
-       (t
-        nil)))))
-
-(defun bh/skip-project-tasks-maybe ()
-  "Show tasks related to the current restriction.
-When restricted to a project, skip project and sub project tasks, habits, NEXT tasks, and loose tasks.
-When not restricted, skip project and sub-project tasks, habits, and project related tasks."
-  (save-restriction
-    (widen)
-    (let* ((subtree-end (save-excursion (org-end-of-subtree t)))
-           (next-headline (save-excursion (or (outline-next-heading) (point-max))))
-           (limit-to-project (marker-buffer org-agenda-restrict-begin)))
-      (cond
-       ((bh/is-project-p)
-        next-headline)
-       ((org-is-habit-p)
-        subtree-end)
-       ((and (not limit-to-project)
-             (bh/is-project-subtree-p))
-        subtree-end)
-       ((and limit-to-project
-             (bh/is-project-subtree-p)
-             (member (org-get-todo-state) (list "NEXT")))
-        subtree-end)
-       (t
-        nil)))))
-
-(defun bh/skip-project-tasks ()
-  "Show non-project tasks.
-Skip project and sub-project tasks, habits, and project related tasks."
-  (save-restriction
-    (widen)
-    (let* ((subtree-end (save-excursion (org-end-of-subtree t))))
-      (cond
-       ((bh/is-project-p)
-        subtree-end)
-       ((org-is-habit-p)
-        subtree-end)
-       ((bh/is-project-subtree-p)
-        subtree-end)
-       (t
-        nil)))))
-
-(defun bh/skip-non-project-tasks ()
-  "Show project tasks.
-Skip project and sub-project tasks, habits, and loose non-project tasks."
-  (save-restriction
-    (widen)
-    (let* ((subtree-end (save-excursion (org-end-of-subtree t)))
-           (next-headline (save-excursion (or (outline-next-heading) (point-max)))))
-      (cond
-       ((bh/is-project-p)
-        next-headline)
-       ((org-is-habit-p)
-        subtree-end)
-       ((and (bh/is-project-subtree-p)
-             (member (org-get-todo-state) (list "NEXT")))
-        subtree-end)
-       ((not (bh/is-project-subtree-p))
-        subtree-end)
-       (t
-        nil)))))
-
-(defun bh/skip-projects-and-habits ()
-  "Skip trees that are projects and tasks that are habits"
-  (save-restriction
-    (widen)
-    (let ((subtree-end (save-excursion (org-end-of-subtree t))))
-      (cond
-       ((bh/is-project-p)
-        subtree-end)
-       ((org-is-habit-p)
-        subtree-end)
-       (t
-        nil)))))
-
-(defun bh/skip-non-subprojects ()
-  "Skip trees that are not projects"
-  (let ((next-headline (save-excursion (outline-next-heading))))
-    (if (bh/is-subproject-p)
-        nil
-      next-headline)))
-
-(setq org-archive-mark-done nil)
-(setq org-archive-location "%s_archive::* Archived Tasks")
-
-(defun bh/skip-non-archivable-tasks ()
-  "Skip trees that are not available for archiving"
-  (save-restriction
-    (widen)
-    ;; Consider only tasks with done todo headings as archivable candidates
-    (let ((next-headline (save-excursion (or (outline-next-heading) (point-max))))
-          (subtree-end (save-excursion (org-end-of-subtree t))))
-      (if (member (org-get-todo-state) org-todo-keywords-1)
-          (if (member (org-get-todo-state) org-done-keywords)
-              (let* ((daynr (string-to-number (format-time-string "%d" (current-time))))
-                     (a-month-ago (* 60 60 24 (+ daynr 1)))
-                     (last-month (format-time-string "%Y-%m-" (time-subtract (current-time) (seconds-to-time a-month-ago))))
-                     (this-month (format-time-string "%Y-%m-" (current-time)))
-                     (subtree-is-current (save-excursion
-                                           (forward-line 1)
-                                           (and (< (point) subtree-end)
-                                                (re-search-forward (concat last-month "\\|" this-month) subtree-end t)))))
-                (if subtree-is-current
-                    subtree-end ; Has a date in this month or last month, skip it
-                  nil))  ; available to archive
-            (or subtree-end (point-max)))
-        next-headline))))
-(setq org-alphabetical-lists t)
-
-;; Explicitly load required exporters
-(require 'ox-html)
-(require 'ox-latex)
-(require 'ox-ascii)
-
-(setq org-ditaa-jar-path "~/git/org-mode/contrib/scripts/ditaa.jar")
-(setq org-plantuml-jar-path "~/java/plantuml.jar")
-
-(add-hook 'org-babel-after-execute-hook 'bh/display-inline-images 'append)
-
-; Make babel results blocks lowercase
-(setq org-babel-results-keyword "results")
-
-(defun bh/display-inline-images ()
-  (condition-case nil
-      (org-display-inline-images)
-    (error nil)))
-
-(org-babel-do-load-languages
- (quote org-babel-load-languages)
- (quote ((emacs-lisp . t)
-         (dot . t)
-         (ditaa . t)
-         (R . t)
-         (python . t)
-         (ruby . t)
-         (gnuplot . t)
-         (clojure . t)
-         (shell . t)
-         (ledger . t)
-         (org . t)
-         (plantuml . t)
-         (latex . t))))
-
-; Do not prompt to confirm evaluation
-; This may be dangerous - make sure you understand the consequences
-; of setting this -- see the docstring for details
-(setq org-confirm-babel-evaluate nil)
-
-; Use fundamental mode when editing plantuml blocks with C-c '
-(add-to-list 'org-src-lang-modes (quote ("plantuml" . fundamental)))
-
-;; Don't enable this because it breaks access to emacs from my Android phone
-(setq org-startup-with-inline-images nil)
-
-; experimenting with docbook exports - not finished
-(setq org-export-docbook-xsl-fo-proc-command "fop %s %s")
-(setq org-export-docbook-xslt-proc-command "xsltproc --output %s /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl %s")
-;
-; Inline images in HTML instead of producting links to the image
-(setq org-html-inline-images t)
-; Do not use sub or superscripts - I currently don't need this functionality in my documents
-(setq org-export-with-sub-superscripts nil)
-; Use org.css from the norang website for export document stylesheets
-(setq org-html-head-extra "<link rel=\"stylesheet\" href=\"http://doc.norang.ca/org.css\" type=\"text/css\" />")
-(setq org-html-head-include-default-style nil)
-; Do not generate internal css formatting for HTML exports
-(setq org-export-htmlize-output-type (quote css))
-; Export with LaTeX fragments
-(setq org-export-with-LaTeX-fragments t)
-; Increase default number of headings to export
-(setq org-export-headline-levels 6)
-
-; List of projects
-; norang       - http://www.norang.ca/
-; doc          - http://doc.norang.ca/
-; org-mode-doc - http://doc.norang.ca/org-mode.html and associated files
-; org          - miscellaneous todo lists for publishing
-(setq org-publish-project-alist
-      ;
-      ; http://www.norang.ca/  (norang website)
-      ; norang-org are the org-files that generate the content
-      ; norang-extra are images and css files that need to be included
-      ; norang is the top-level project that gets published
-      (quote (("norang-org"
-               :base-directory "~/git/www.norang.ca"
-               :publishing-directory "/ssh:www-data@www:~/www.norang.ca/htdocs"
-               :recursive t
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function org-html-publish-to-html
-               :style-include-default nil
-               :section-numbers nil
-               :table-of-contents nil
-               :html-head "<link rel=\"stylesheet\" href=\"norang.css\" type=\"text/css\" />"
-               :author-info nil
-               :creator-info nil)
-              ("norang-extra"
-               :base-directory "~/git/www.norang.ca/"
-               :publishing-directory "/ssh:www-data@www:~/www.norang.ca/htdocs"
-               :base-extension "css\\|pdf\\|png\\|jpg\\|gif"
-               :publishing-function org-publish-attachment
-               :recursive t
-               :author nil)
-              ("norang"
-               :components ("norang-org" "norang-extra"))
-              ;
-              ; http://doc.norang.ca/  (norang website)
-              ; doc-org are the org-files that generate the content
-              ; doc-extra are images and css files that need to be included
-              ; doc is the top-level project that gets published
-              ("doc-org"
-               :base-directory "~/git/doc.norang.ca/"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs"
-               :recursive nil
-               :section-numbers nil
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function (org-html-publish-to-html org-org-publish-to-org)
-               :style-include-default nil
-               :html-head "<link rel=\"stylesheet\" href=\"/org.css\" type=\"text/css\" />"
-               :author-info nil
-               :creator-info nil)
-              ("doc-extra"
-               :base-directory "~/git/doc.norang.ca/"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs"
-               :base-extension "css\\|pdf\\|png\\|jpg\\|gif"
-               :publishing-function org-publish-attachment
-               :recursive nil
-               :author nil)
-              ("doc"
-               :components ("doc-org" "doc-extra"))
-              ("doc-private-org"
-               :base-directory "~/git/doc.norang.ca/private"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs/private"
-               :recursive nil
-               :section-numbers nil
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function (org-html-publish-to-html org-org-publish-to-org)
-               :style-include-default nil
-               :html-head "<link rel=\"stylesheet\" href=\"/org.css\" type=\"text/css\" />"
-               :auto-sitemap t
-               :sitemap-filename "index.html"
-               :sitemap-title "Norang Private Documents"
-               :sitemap-style "tree"
-               :author-info nil
-               :creator-info nil)
-              ("doc-private-extra"
-               :base-directory "~/git/doc.norang.ca/private"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs/private"
-               :base-extension "css\\|pdf\\|png\\|jpg\\|gif"
-               :publishing-function org-publish-attachment
-               :recursive nil
-               :author nil)
-              ("doc-private"
-               :components ("doc-private-org" "doc-private-extra"))
-              ;
-              ; Miscellaneous pages for other websites
-              ; org are the org-files that generate the content
-              ("org-org"
-               :base-directory "~/git/org/"
-               :publishing-directory "/ssh:www-data@www:~/org"
-               :recursive t
-               :section-numbers nil
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function org-html-publish-to-html
-               :style-include-default nil
-               :html-head "<link rel=\"stylesheet\" href=\"/org.css\" type=\"text/css\" />"
-               :author-info nil
-               :creator-info nil)
-              ;
-              ; http://doc.norang.ca/  (norang website)
-              ; org-mode-doc-org this document
-              ; org-mode-doc-extra are images and css files that need to be included
-              ; org-mode-doc is the top-level project that gets published
-              ; This uses the same target directory as the 'doc' project
-              ("org-mode-doc-org"
-               :base-directory "~/git/org-mode-doc/"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs"
-               :recursive t
-               :section-numbers nil
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function (org-html-publish-to-html)
-               :plain-source t
-               :htmlized-source t
-               :style-include-default nil
-               :html-head "<link rel=\"stylesheet\" href=\"/org.css\" type=\"text/css\" />"
-               :author-info nil
-               :creator-info nil)
-              ("org-mode-doc-extra"
-               :base-directory "~/git/org-mode-doc/"
-               :publishing-directory "/ssh:www-data@www:~/doc.norang.ca/htdocs"
-               :base-extension "css\\|pdf\\|png\\|jpg\\|gif\\|org"
-               :publishing-function org-publish-attachment
-               :recursive t
-               :author nil)
-              ("org-mode-doc"
-               :components ("org-mode-doc-org" "org-mode-doc-extra"))
-              ;
-              ; http://doc.norang.ca/  (norang website)
-              ; org-mode-doc-org this document
-              ; org-mode-doc-extra are images and css files that need to be included
-              ; org-mode-doc is the top-level project that gets published
-              ; This uses the same target directory as the 'doc' project
-              ("tmp-org"
-               :base-directory "/tmp/publish/"
-               :publishing-directory "/ssh:www-data@www:~/www.norang.ca/htdocs/tmp"
-               :recursive t
-               :section-numbers nil
-               :table-of-contents nil
-               :base-extension "org"
-               :publishing-function (org-html-publish-to-html org-org-publish-to-org)
-               :html-head "<link rel=\"stylesheet\" href=\"http://doc.norang.ca/org.css\" type=\"text/css\" />"
-               :plain-source t
-               :htmlized-source t
-               :style-include-default nil
-               :auto-sitemap t
-               :sitemap-filename "index.html"
-               :sitemap-title "Test Publishing Area"
-               :sitemap-style "tree"
-               :author-info t
-               :creator-info t)
-              ("tmp-extra"
-               :base-directory "/tmp/publish/"
-               :publishing-directory "/ssh:www-data@www:~/www.norang.ca/htdocs/tmp"
-               :base-extension "css\\|pdf\\|png\\|jpg\\|gif"
-               :publishing-function org-publish-attachment
-               :recursive t
-               :author nil)
-              ("tmp"
-               :components ("tmp-org" "tmp-extra")))))
-
-; I'm lazy and don't want to remember the name of the project to publish when I modify
-; a file that is part of a project.  So this function saves the file, and publishes
-; the project that includes this file
-;
-; It's bound to C-S-F12 so I just edit and hit C-S-F12 when I'm done and move on to the next thing
-(defun bh/save-then-publish (&optional force)
-  (interactive "P")
-  (save-buffer)
-  (org-save-all-org-buffers)
-  (let ((org-html-head-extra)
-        (org-html-validation-link "<a href=\"http://validator.w3.org/check?uri=referer\">Validate XHTML 1.0</a>"))
-    (org-publish-current-project force)))
-
-(global-set-key (kbd "C-s-<f12>") 'bh/save-then-publish)
-
-(setq org-latex-listings t)
-
-(setq org-html-xml-declaration (quote (("html" . "")
-                                       ("was-html" . "<?xml version=\"1.0\" encoding=\"%s\"?>")
-                                       ("php" . "<?php echo \"<?xml version=\\\"1.0\\\" encoding=\\\"%s\\\" ?>\"; ?>"))))
-
-(setq org-export-allow-BIND t)
-
-; Erase all reminders and rebuilt reminders for today from the agenda
-(defun bh/org-agenda-to-appt ()
-  (interactive)
-  (setq appt-time-msg-list nil)
-  (org-agenda-to-appt))
-
-; Rebuild the reminders everytime the agenda is displayed
-(add-hook 'org-finalize-agenda-hook 'bh/org-agenda-to-appt 'append)
-
-; This is at the end of my .emacs - so appointments are set up when Emacs starts
-(bh/org-agenda-to-appt)
-
-; Activate appointments so we get notifications
-(appt-activate t)
-
-; If we leave Emacs running overnight - reset the appointments one minute after midnight
-(run-at-time "24:01" nil 'bh/org-agenda-to-appt)
-
-;; Enable abbrev-mode
-(add-hook 'org-mode-hook (lambda () (abbrev-mode 1)))
-
-;; Skeletons
-;;
-;; sblk - Generic block #+begin_FOO .. #+end_FOO
-(define-skeleton skel-org-block
-  "Insert an org block, querying for type."
-  "Type: "
-  "#+begin_" str "\n"
-  _ - \n
-  "#+end_" str "\n")
-
-(define-abbrev org-mode-abbrev-table "sblk" "" 'skel-org-block)
-
-;; splantuml - PlantUML Source block
-(define-skeleton skel-org-block-plantuml
-  "Insert a org plantuml block, querying for filename."
-  "File (no extension): "
-  "#+begin_src plantuml :file " str ".png :cache yes\n"
-  _ - \n
-  "#+end_src\n")
-
-(define-abbrev org-mode-abbrev-table "splantuml" "" 'skel-org-block-plantuml)
-
-(define-skeleton skel-org-block-plantuml-activity
-  "Insert a org plantuml block, querying for filename."
-  "File (no extension): "
-  "#+begin_src plantuml :file " str "-act.png :cache yes :tangle " str "-act.txt\n"
-  (bh/plantuml-reset-counters)
-  "@startuml\n"
-  "skinparam activity {\n"
-  "BackgroundColor<<New>> Cyan\n"
-  "}\n\n"
-  "title " str " - \n"
-  "note left: " str "\n"
-  "(*) --> \"" str "\"\n"
-  "--> (*)\n"
-  _ - \n
-  "@enduml\n"
-  "#+end_src\n")
-
-(defvar bh/plantuml-if-count 0)
-
-(defun bh/plantuml-if ()
-  (incf bh/plantuml-if-count)
-  (number-to-string bh/plantuml-if-count))
-
-(defvar bh/plantuml-loop-count 0)
-
-(defun bh/plantuml-loop ()
-  (incf bh/plantuml-loop-count)
-  (number-to-string bh/plantuml-loop-count))
-
-(defun bh/plantuml-reset-counters ()
-  (setq bh/plantuml-if-count 0
-        bh/plantuml-loop-count 0)
-  "")
-
-(define-abbrev org-mode-abbrev-table "sact" "" 'skel-org-block-plantuml-activity)
-
-(define-skeleton skel-org-block-plantuml-activity-if
-  "Insert a org plantuml block activity if statement"
-  ""
-  "if \"\" then\n"
-  "  -> [condition] ==IF" (setq ifn (bh/plantuml-if)) "==\n"
-  "  --> ==IF" ifn "M1==\n"
-  "  -left-> ==IF" ifn "M2==\n"
-  "else\n"
-  "end if\n"
-  "--> ==IF" ifn "M2==")
-
-(define-abbrev org-mode-abbrev-table "sif" "" 'skel-org-block-plantuml-activity-if)
-
-(define-skeleton skel-org-block-plantuml-activity-for
-  "Insert a org plantuml block activity for statement"
-  "Loop for each: "
-  "--> ==LOOP" (setq loopn (bh/plantuml-loop)) "==\n"
-  "note left: Loop" loopn ": For each " str "\n"
-  "--> ==ENDLOOP" loopn "==\n"
-  "note left: Loop" loopn ": End for each " str "\n" )
-
-(define-abbrev org-mode-abbrev-table "sfor" "" 'skel-org-block-plantuml-activity-for)
-
-(define-skeleton skel-org-block-plantuml-sequence
-  "Insert a org plantuml activity diagram block, querying for filename."
-  "File appends (no extension): "
-  "#+begin_src plantuml :file " str "-seq.png :cache yes :tangle " str "-seq.txt\n"
-  "@startuml\n"
-  "title " str " - \n"
-  "actor CSR as \"Customer Service Representative\"\n"
-  "participant CSMO as \"CSM Online\"\n"
-  "participant CSMU as \"CSM Unix\"\n"
-  "participant NRIS\n"
-  "actor Customer"
-  _ - \n
-  "@enduml\n"
-  "#+end_src\n")
-
-(define-abbrev org-mode-abbrev-table "sseq" "" 'skel-org-block-plantuml-sequence)
-
-;; sdot - Graphviz DOT block
-(define-skeleton skel-org-block-dot
-  "Insert a org graphviz dot block, querying for filename."
-  "File (no extension): "
-  "#+begin_src dot :file " str ".png :cache yes :cmdline -Kdot -Tpng\n"
-  "graph G {\n"
-  _ - \n
-  "}\n"
-  "#+end_src\n")
-
-(define-abbrev org-mode-abbrev-table "sdot" "" 'skel-org-block-dot)
-
-;; sditaa - Ditaa source block
-(define-skeleton skel-org-block-ditaa
-  "Insert a org ditaa block, querying for filename."
-  "File (no extension): "
-  "#+begin_src ditaa :file " str ".png :cache yes\n"
-  _ - \n
-  "#+end_src\n")
-
-(define-abbrev org-mode-abbrev-table "sditaa" "" 'skel-org-block-ditaa)
-
-;; selisp - Emacs Lisp source block
-(define-skeleton skel-org-block-elisp
-  "Insert a org emacs-lisp block"
-  ""
-  "#+begin_src emacs-lisp\n"
-  _ - \n
-  "#+end_src\n")
-
-(define-abbrev org-mode-abbrev-table "selisp" "" 'skel-org-block-elisp)
-
-(defun bh/org-todo (arg)
-  (interactive "p")
-  (if (equal arg 4)
-      (save-restriction
-        (bh/narrow-to-org-subtree)
-        (org-show-todo-tree nil))
-    (bh/narrow-to-org-subtree)
-    (org-show-todo-tree nil)))
-
-(global-set-key (kbd "<S-f5>") 'bh/widen)
-
-(defun bh/widen ()
-  (interactive)
-  (if (equal major-mode 'org-agenda-mode)
-      (progn
-        (org-agenda-remove-restriction-lock)
-        (when org-agenda-sticky
-          (org-agenda-redo)))
-    (widen)))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "W" (lambda () (interactive) (setq bh/hide-scheduled-and-waiting-next-tasks t) (bh/widen))))
-          'append)
-
-(defun bh/restrict-to-file-or-follow (arg)
-  "Set agenda restriction to 'file or with argument invoke follow mode.
-I don't use follow mode very often but I restrict to file all the time
-so change the default 'F' binding in the agenda to allow both"
-  (interactive "p")
-  (if (equal arg 4)
-      (org-agenda-follow-mode)
-    (widen)
-    (bh/set-agenda-restriction-lock 4)
-    (org-agenda-redo)
-    (beginning-of-buffer)))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "F" 'bh/restrict-to-file-or-follow))
-          'append)
-
-(defun bh/narrow-to-org-subtree ()
-  (widen)
-  (org-narrow-to-subtree)
-  (save-restriction
-    (org-agenda-set-restriction-lock)))
-
-(defun bh/narrow-to-subtree ()
-  (interactive)
-  (if (equal major-mode 'org-agenda-mode)
-      (progn
-        (org-with-point-at (org-get-at-bol 'org-hd-marker)
-          (bh/narrow-to-org-subtree))
-        (when org-agenda-sticky
-          (org-agenda-redo)))
-    (bh/narrow-to-org-subtree)))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "N" 'bh/narrow-to-subtree))
-          'append)
-
-(defun bh/narrow-up-one-org-level ()
-  (widen)
-  (save-excursion
-    (outline-up-heading 1 'invisible-ok)
-    (bh/narrow-to-org-subtree)))
-
-(defun bh/get-pom-from-agenda-restriction-or-point ()
-  (or (and (marker-position org-agenda-restrict-begin) org-agenda-restrict-begin)
-      (org-get-at-bol 'org-hd-marker)
-      (and (equal major-mode 'org-mode) (point))
-      org-clock-marker))
-
-(defun bh/narrow-up-one-level ()
-  (interactive)
-  (if (equal major-mode 'org-agenda-mode)
-      (progn
-        (org-with-point-at (bh/get-pom-from-agenda-restriction-or-point)
-          (bh/narrow-up-one-org-level))
-        (org-agenda-redo))
-    (bh/narrow-up-one-org-level)))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "U" 'bh/narrow-up-one-level))
-          'append)
-
-(defun bh/narrow-to-org-project ()
-  (widen)
-  (save-excursion
-    (bh/find-project-task)
-    (bh/narrow-to-org-subtree)))
-
-(defun bh/narrow-to-project ()
-  (interactive)
-  (if (equal major-mode 'org-agenda-mode)
-      (progn
-        (org-with-point-at (bh/get-pom-from-agenda-restriction-or-point)
-          (bh/narrow-to-org-project)
-          (save-excursion
-            (bh/find-project-task)
-            (org-agenda-set-restriction-lock)))
-        (org-agenda-redo)
-        (beginning-of-buffer))
-    (bh/narrow-to-org-project)
-    (save-restriction
-      (org-agenda-set-restriction-lock))))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "P" 'bh/narrow-to-project))
-          'append)
-
-(defvar bh/project-list nil)
-
-(defun bh/view-next-project ()
-  (interactive)
-  (let (num-project-left current-project)
-    (unless (marker-position org-agenda-restrict-begin)
-      (goto-char (point-min))
-      ; Clear all of the existing markers on the list
-      (while bh/project-list
-        (set-marker (pop bh/project-list) nil))
-      (re-search-forward "Tasks to Refile")
-      (forward-visible-line 1))
-
-    ; Build a new project marker list
-    (unless bh/project-list
-      (while (< (point) (point-max))
-        (while (and (< (point) (point-max))
-                    (or (not (org-get-at-bol 'org-hd-marker))
-                        (org-with-point-at (org-get-at-bol 'org-hd-marker)
-                          (or (not (bh/is-project-p))
-                              (bh/is-project-subtree-p)))))
-          (forward-visible-line 1))
-        (when (< (point) (point-max))
-          (add-to-list 'bh/project-list (copy-marker (org-get-at-bol 'org-hd-marker)) 'append))
-        (forward-visible-line 1)))
-
-    ; Pop off the first marker on the list and display
-    (setq current-project (pop bh/project-list))
-    (when current-project
-      (org-with-point-at current-project
-        (setq bh/hide-scheduled-and-waiting-next-tasks nil)
-        (bh/narrow-to-project))
-      ; Remove the marker
-      (setq current-project nil)
-      (org-agenda-redo)
-      (beginning-of-buffer)
-      (setq num-projects-left (length bh/project-list))
-      (if (> num-projects-left 0)
-          (message "%s projects left to view" num-projects-left)
-        (beginning-of-buffer)
-        (setq bh/hide-scheduled-and-waiting-next-tasks t)
-        (error "All projects viewed.")))))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "V" 'bh/view-next-project))
-          'append)
-
-(setq org-show-entry-below (quote ((default))))
-
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (org-defkey org-agenda-mode-map "\C-c\C-x<" 'bh/set-agenda-restriction-lock))
-          'append)
-
-(defun bh/set-agenda-restriction-lock (arg)
-  "Set restriction lock to current task subtree or file if prefix is specified"
-  (interactive "p")
-  (let* ((pom (bh/get-pom-from-agenda-restriction-or-point))
-         (tags (org-with-point-at pom (org-get-tags-at))))
-    (let ((restriction-type (if (equal arg 4) 'file 'subtree)))
-      (save-restriction
-        (cond
-         ((and (equal major-mode 'org-agenda-mode) pom)
-          (org-with-point-at pom
-            (org-agenda-set-restriction-lock restriction-type))
-          (org-agenda-redo))
-         ((and (equal major-mode 'org-mode) (org-before-first-heading-p))
-          (org-agenda-set-restriction-lock 'file))
-         (pom
-          (org-with-point-at pom
-            (org-agenda-set-restriction-lock restriction-type))))))))
-
-;; Limit restriction lock highlighting to the headline only
-(setq org-agenda-restriction-lock-highlight-subtree nil)
-
-;; Always hilight the current agenda line
-(add-hook 'org-agenda-mode-hook
-          '(lambda () (hl-line-mode 1))
-          'append)
-
-;; Keep tasks with dates on the global todo lists
-(setq org-agenda-todo-ignore-with-date nil)
-
-;; Keep tasks with deadlines on the global todo lists
-(setq org-agenda-todo-ignore-deadlines nil)
-
-;; Keep tasks with scheduled dates on the global todo lists
-(setq org-agenda-todo-ignore-scheduled nil)
-
-;; Keep tasks with timestamps on the global todo lists
-(setq org-agenda-todo-ignore-timestamp nil)
-
-;; Remove completed deadline tasks from the agenda view
-(setq org-agenda-skip-deadline-if-done t)
-
-;; Remove completed scheduled tasks from the agenda view
-(setq org-agenda-skip-scheduled-if-done t)
-
-;; Remove completed items from search results
-(setq org-agenda-skip-timestamp-if-done t)
-
-(setq org-agenda-include-diary nil)
-(setq org-agenda-diary-file "~/git/org/diary.org")
-
-(setq org-agenda-insert-diary-extract-time t)
-
-;; Include agenda archive files when searching for things
-(setq org-agenda-text-search-extra-files (quote (agenda-archives)))
-
-;; Show all future entries for repeating tasks
-(setq org-agenda-repeating-timestamp-show-all t)
-
-;; Show all agenda dates - even if they are empty
-(setq org-agenda-show-all-dates t)
-
-;; Sorting order for tasks on the agenda
-(setq org-agenda-sorting-strategy
-      (quote ((agenda habit-down time-up user-defined-up effort-up category-keep)
-              (todo category-up effort-up)
-              (tags category-up effort-up)
-              (search category-up))))
-
-;; Start the weekly agenda on Monday
-(setq org-agenda-start-on-weekday 1)
-
-;; Enable display of the time grid so we can see the marker for the current time
-;; modified like in
-;; https://stackoverflow.com/questions/47778775/wrong-type-argument-when-using-org-agenda
-(setq org-agenda-time-grid (quote
-                             ((daily today remove-match)
-                              (0900 1100 1300 1500 1700)
-                              "......" "----------------")))
-
-;; Display tags farther right
-(setq org-agenda-tags-column -102)
-
-;;
-;; Agenda sorting functions
-;;
-(setq org-agenda-cmp-user-defined 'bh/agenda-sort)
-
-(defun bh/agenda-sort (a b)
-  "Sorting strategy for agenda items.
-Late deadlines first, then scheduled, then non-late deadlines"
-  (let (result num-a num-b)
-    (cond
-     ; time specific items are already sorted first by org-agenda-sorting-strategy
-
-     ; non-deadline and non-scheduled items next
-     ((bh/agenda-sort-test 'bh/is-not-scheduled-or-deadline a b))
-
-     ; deadlines for today next
-     ((bh/agenda-sort-test 'bh/is-due-deadline a b))
-
-     ; late deadlines next
-     ((bh/agenda-sort-test-num 'bh/is-late-deadline '> a b))
-
-     ; scheduled items for today next
-     ((bh/agenda-sort-test 'bh/is-scheduled-today a b))
-
-     ; late scheduled items next
-     ((bh/agenda-sort-test-num 'bh/is-scheduled-late '> a b))
-
-     ; pending deadlines last
-     ((bh/agenda-sort-test-num 'bh/is-pending-deadline '< a b))
-
-     ; finally default to unsorted
-     (t (setq result nil)))
-    result))
-
-(defmacro bh/agenda-sort-test (fn a b)
-  "Test for agenda sort"
-  `(cond
-    ; if both match leave them unsorted
-    ((and (apply ,fn (list ,a))
-          (apply ,fn (list ,b)))
-     (setq result nil))
-    ; if a matches put a first
-    ((apply ,fn (list ,a))
-     (setq result -1))
-    ; otherwise if b matches put b first
-    ((apply ,fn (list ,b))
-     (setq result 1))
-    ; if none match leave them unsorted
-    (t nil)))
-
-(defmacro bh/agenda-sort-test-num (fn compfn a b)
-  `(cond
-    ((apply ,fn (list ,a))
-     (setq num-a (string-to-number (match-string 1 ,a)))
-     (if (apply ,fn (list ,b))
-         (progn
-           (setq num-b (string-to-number (match-string 1 ,b)))
-           (setq result (if (apply ,compfn (list num-a num-b))
-                            -1
-                          1)))
-       (setq result -1)))
-    ((apply ,fn (list ,b))
-     (setq result 1))
-    (t nil)))
-
-(defun bh/is-not-scheduled-or-deadline (date-str)
-  (and (not (bh/is-deadline date-str))
-       (not (bh/is-scheduled date-str))))
-
-(defun bh/is-due-deadline (date-str)
-  (string-match "Deadline:" date-str))
-
-(defun bh/is-late-deadline (date-str)
-  (string-match "\\([0-9]*\\) d\. ago:" date-str))
-
-(defun bh/is-pending-deadline (date-str)
-  (string-match "In \\([^-]*\\)d\.:" date-str))
-
-(defun bh/is-deadline (date-str)
-  (or (bh/is-due-deadline date-str)
-      (bh/is-late-deadline date-str)
-      (bh/is-pending-deadline date-str)))
-
-(defun bh/is-scheduled (date-str)
-  (or (bh/is-scheduled-today date-str)
-      (bh/is-scheduled-late date-str)))
-
-(defun bh/is-scheduled-today (date-str)
-  (string-match "Scheduled:" date-str))
-
-(defun bh/is-scheduled-late (date-str)
-  (string-match "Sched\.\\(.*\\)x:" date-str))
-
-;; Use sticky agenda's so they persist
-(setq org-agenda-sticky t)
-
-;; The following setting is different from the document so that you
-;; can override the document path by setting your path in the variable
-;; org-mode-user-contrib-lisp-path
-;;
-(if (boundp 'org-mode-user-contrib-lisp-path)
-    (add-to-list 'load-path org-mode-user-contrib-lisp-path)
-  (add-to-list 'load-path (expand-file-name "~/git/org-mode/contrib/lisp")))
-
-(require 'org-checklist)
-
-(setq org-enforce-todo-dependencies t)
-
-(setq org-hide-leading-stars nil)
-
-(setq org-startup-indented t)
-
-(setq org-cycle-separator-lines 0)
-
-(setq org-blank-before-new-entry (quote ((heading)
-                                         (plain-list-item . auto))))
-
-(setq org-insert-heading-respect-content nil)
-
-(setq org-reverse-note-order nil)
-
-(setq org-show-following-heading t)
-(setq org-show-hierarchy-above t)
-(setq org-show-siblings (quote ((default))))
-
-(setq org-special-ctrl-a/e t)
-(setq org-special-ctrl-k t)
-(setq org-yank-adjusted-subtrees t)
-
-(setq org-id-method (quote uuidgen))
-
-(setq org-deadline-warning-days 30)
-
-(setq org-table-export-default-format "orgtbl-to-csv")
-
-(setq org-link-frame-setup (quote ((vm . vm-visit-folder)
-                                   (gnus . org-gnus-no-new-news)
-                                   (file . find-file))))
-
-; Use the current window for C-c ' source editing
-(setq org-src-window-setup 'current-window)
-
-(setq org-log-done (quote time))
-(setq org-log-into-drawer t)
-(setq org-log-state-notes-insert-after-drawers nil)
-
-(setq org-clock-sound "/usr/local/lib/tngchime.wav")
-
-; Enable habit tracking (and a bunch of other modules)
-(setq org-modules (quote (org-bbdb
-                          org-bibtex
-                          org-crypt
-                          org-gnus
-                          org-id
-                          org-info
-                          org-jsinfo
-                          org-habit
-                          org-inlinetask
-                          org-irc
-                          org-mew
-                          org-mhe
-                          org-protocol
-                          org-rmail
-                          org-vm
-                          org-wl
-                          org-w3m)))
-
-; position the habit graph on the agenda to the right of the default
-(setq org-habit-graph-column 50)
-
-(run-at-time "06:00" 86400 '(lambda () (setq org-habit-show-habits t)))
-
-(global-auto-revert-mode t)
-
-(require 'org-crypt)
-; Encrypt all entries before saving
-(org-crypt-use-before-save-magic)
-(setq org-tags-exclude-from-inheritance (quote ("crypt")))
-; GPG key to use for encryption
-(setq org-crypt-key "F0B66B40")
-
-(setq org-crypt-disable-auto-save nil)
-
-(setq org-use-speed-commands t)
-(setq org-speed-commands-user (quote (("0" . ignore)
-                                      ("1" . ignore)
-                                      ("2" . ignore)
-                                      ("3" . ignore)
-                                      ("4" . ignore)
-                                      ("5" . ignore)
-                                      ("6" . ignore)
-                                      ("7" . ignore)
-                                      ("8" . ignore)
-                                      ("9" . ignore)
-
-                                      ("a" . ignore)
-                                      ("d" . ignore)
-                                      ("h" . bh/hide-other)
-                                      ("i" progn
-                                       (forward-char 1)
-                                       (call-interactively 'org-insert-heading-respect-content))
-                                      ("k" . org-kill-note-or-show-branches)
-                                      ("l" . ignore)
-                                      ("m" . ignore)
-                                      ("q" . bh/show-org-agenda)
-                                      ("r" . ignore)
-                                      ("s" . org-save-all-org-buffers)
-                                      ("w" . org-refile)
-                                      ("x" . ignore)
-                                      ("y" . ignore)
-                                      ("z" . org-add-note)
-
-                                      ("A" . ignore)
-                                      ("B" . ignore)
-                                      ("E" . ignore)
-                                      ("F" . bh/restrict-to-file-or-follow)
-                                      ("G" . ignore)
-                                      ("H" . ignore)
-                                      ("J" . org-clock-goto)
-                                      ("K" . ignore)
-                                      ("L" . ignore)
-                                      ("M" . ignore)
-                                      ("N" . bh/narrow-to-org-subtree)
-                                      ("P" . bh/narrow-to-org-project)
-                                      ("Q" . ignore)
-                                      ("R" . ignore)
-                                      ("S" . ignore)
-                                      ("T" . bh/org-todo)
-                                      ("U" . bh/narrow-up-one-org-level)
-                                      ("V" . ignore)
-                                      ("W" . bh/widen)
-                                      ("X" . ignore)
-                                      ("Y" . ignore)
-                                      ("Z" . ignore))))
-
-(defun bh/show-org-agenda ()
-  (interactive)
-  (if org-agenda-sticky
-      (switch-to-buffer "*Org Agenda( )*")
-    (switch-to-buffer "*Org Agenda*"))
-  (delete-other-windows))
-
-(require 'org-protocol)
-
-(setq require-final-newline t)
-
-(defvar bh/insert-inactive-timestamp t)
-
-(defun bh/toggle-insert-inactive-timestamp ()
-  (interactive)
-  (setq bh/insert-inactive-timestamp (not bh/insert-inactive-timestamp))
-  (message "Heading timestamps are %s" (if bh/insert-inactive-timestamp "ON" "OFF")))
-
-(defun bh/insert-inactive-timestamp ()
-  (interactive)
-  (org-insert-time-stamp nil t t nil nil nil))
-
-(defun bh/insert-heading-inactive-timestamp ()
-  (save-excursion
-    (when bh/insert-inactive-timestamp
-      (org-return)
-      (org-cycle)
-      (bh/insert-inactive-timestamp))))
-
-(add-hook 'org-insert-heading-hook 'bh/insert-heading-inactive-timestamp 'append)
-
-(setq org-export-with-timestamps nil)
-
-(setq org-return-follows-link t)
-
-(custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
- '(org-mode-line-clock ((t (:foreground "red" :box (:line-width -1 :style released-button)))) t))
-
-(defun bh/prepare-meeting-notes ()
-  "Prepare meeting notes for email
-   Take selected region and convert tabs to spaces, mark TODOs with leading >>>, and copy to kill ring for pasting"
-  (interactive)
-  (let (prefix)
-    (save-excursion
-      (save-restriction
-        (narrow-to-region (region-beginning) (region-end))
-        (untabify (point-min) (point-max))
-        (goto-char (point-min))
-        (while (re-search-forward "^\\( *-\\\) \\(TODO\\|DONE\\): " (point-max) t)
-          (replace-match (concat (make-string (length (match-string 1)) ?>) " " (match-string 2) ": ")))
-        (goto-char (point-min))
-        (kill-ring-save (point-min) (point-max))))))
-
-(setq org-remove-highlights-with-change t)
-
-(add-to-list 'Info-default-directory-list "~/git/org-mode/doc")
-
-(setq org-read-date-prefer-future 'time)
-
-(setq org-list-demote-modify-bullet (quote (("+" . "-")
-                                            ("*" . "-")
-                                            ("1." . "-")
-                                            ("1)" . "-")
-                                            ("A)" . "-")
-                                            ("B)" . "-")
-                                            ("a)" . "-")
-                                            ("b)" . "-")
-                                            ("A." . "-")
-                                            ("B." . "-")
-                                            ("a." . "-")
-                                            ("b." . "-"))))
-
-(setq org-tags-match-list-sublevels t)
-
-(setq org-agenda-persistent-filter t)
-
-(setq org-link-mailto-program (quote (compose-mail "%a" "%s")))
-
-(add-to-list 'load-path (expand-file-name "~/.emacs.d"))
-(require 'smex)
-(smex-initialize)
-
-(global-set-key (kbd "M-x") 'smex)
-(global-set-key (kbd "C-x x") 'smex)
-(global-set-key (kbd "M-X") 'smex-major-mode-commands)
-
-;; Bookmark handling
-;;
-(global-set-key (kbd "<C-f6>") '(lambda () (interactive) (bookmark-set "SAVED")))
-
-(require 'org-mime)
-
-(setq org-agenda-skip-additional-timestamps-same-entry t)
-
-(setq org-table-use-standard-references (quote from))
-
-(setq org-file-apps (quote ((auto-mode . emacs)
-                            ("\\.mm\\'" . system)
-                            ("\\.x?html?\\'" . system)
-                            ("\\.pdf\\'" . system))))
-
-; Overwrite the current window with the agenda
-(setq org-agenda-window-setup 'current-window)
-
-(setq org-clone-delete-id t)
-
-(setq org-cycle-include-plain-lists t)
-
-(setq org-src-fontify-natively t)
-
-(setq org-structure-template-alist
-      (quote (("s" "#+begin_src ?\n\n#+end_src" "<src lang=\"?\">\n\n</src>")
-              ("e" "#+begin_example\n?\n#+end_example" "<example>\n?\n</example>")
-              ("q" "#+begin_quote\n?\n#+end_quote" "<quote>\n?\n</quote>")
-              ("v" "#+begin_verse\n?\n#+end_verse" "<verse>\n?\n</verse>")
-              ("c" "#+begin_center\n?\n#+end_center" "<center>\n?\n</center>")
-              ("l" "#+begin_latex\n?\n#+end_latex" "<literal style=\"latex\">\n?\n</literal>")
-              ("L" "#+latex: " "<literal style=\"latex\">?</literal>")
-              ("h" "#+begin_html\n?\n#+end_html" "<literal style=\"html\">\n?\n</literal>")
-              ("H" "#+html: " "<literal style=\"html\">?</literal>")
-              ("a" "#+begin_ascii\n?\n#+end_ascii")
-              ("A" "#+ascii: ")
-              ("i" "#+index: ?" "#+index: ?")
-              ("I" "#+include %file ?" "<include file=%file markup=\"?\">"))))
-
-(defun bh/mark-next-parent-tasks-todo ()
-  "Visit each parent task and change NEXT states to TODO"
-  (let ((mystate (or (and (fboundp 'org-state)
-                          state)
-                     (nth 2 (org-heading-components)))))
-    (when mystate
-      (save-excursion
-        (while (org-up-heading-safe)
-          (when (member (nth 2 (org-heading-components)) (list "NEXT"))
-            (org-todo "TODO")))))))
-
-(add-hook 'org-after-todo-state-change-hook 'bh/mark-next-parent-tasks-todo 'append)
-(add-hook 'org-clock-in-hook 'bh/mark-next-parent-tasks-todo 'append)
-
-(setq org-startup-folded t)
-
-(add-hook 'message-mode-hook 'orgstruct++-mode 'append)
-(add-hook 'message-mode-hook 'turn-on-auto-fill 'append)
-(add-hook 'message-mode-hook 'bbdb-define-all-aliases 'append)
-(add-hook 'message-mode-hook 'orgtbl-mode 'append)
-; (add-hook 'message-mode-hook 'turn-on-flyspell 'append) ; aspell needs nix fix
-(add-hook 'message-mode-hook
-          '(lambda () (setq fill-column 72))
-          'append)
-
-;; flyspell mode for spell checking everywhere
-; (add-hook 'org-mode-hook 'turn-on-flyspell 'append) ; aspell needs nix fix
-
-;; Disable keys in org-mode
-;;    C-c [
-;;    C-c ]
-;;    C-c ;
-;;    C-c C-x C-q  cancelling the clock (we never want this)
-(add-hook 'org-mode-hook
-          '(lambda ()
-             ;; Undefine C-c [ and C-c ] since this breaks my
-             ;; org-agenda files when directories are include It
-             ;; expands the files in the directories individually
-             (org-defkey org-mode-map "\C-c[" 'undefined)
-             (org-defkey org-mode-map "\C-c]" 'undefined)
-             (org-defkey org-mode-map "\C-c;" 'undefined)
-             (org-defkey org-mode-map "\C-c\C-x\C-q" 'undefined))
-          'append)
-
-(add-hook 'org-mode-hook
-          (lambda ()
-            (local-set-key (kbd "C-c M-o") 'bh/mail-subtree))
-          'append)
-
-(defun bh/mail-subtree ()
-  (interactive)
-  (org-mark-subtree)
-  (org-mime-subtree))
-
-(setq org-src-preserve-indentation nil)
-(setq org-edit-src-content-indentation 0)
-
-(setq org-catch-invisible-edits 'error)
-
-(setq org-export-coding-system 'utf-8)
-(prefer-coding-system 'utf-8)
-(set-charset-priority 'unicode)
-(setq default-process-coding-system '(utf-8-unix . utf-8-unix))
-
-(setq org-time-clocksum-format
-      '(:hours "%d" :require-hours t :minutes ":%02d" :require-minutes t))
-
-(setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)
-
-(setq org-emphasis-alist (quote (("*" bold "<b>" "</b>")
-                                 ("/" italic "<i>" "</i>")
-                                 ("_" underline "<span style=\"text-decoration:underline;\">" "</span>")
-                                 ("=" org-code "<code>" "</code>" verbatim)
-                                 ("~" org-verbatim "<code>" "</code>" verbatim))))
-
-(setq org-use-sub-superscripts nil)
-
-(setq org-odd-levels-only nil)
-
-(run-at-time "00:59" 3600 'org-save-all-org-buffers)
-
-;; --- ombi's extension
-
-;; found on https://www.reddit.com/r/emacs/comments/8yrklz/using_outlinemode_with_org_agenda/
-(add-hook
- 'org-agenda-mode-hook
- (lambda ()
-   (setq-local outline-regexp "^[A-Z]")
-   (setq-local outline-heading-end-regexp ".$")
-   ;; Any prefix you'd like, though C-' is usually unoccupied.
-   (setq-local outline-minor-mode-prefix (kbd "C-'"))
-   (local-set-key "a" 'outline-toggle-children)
-   (outline-minor-mode +1)
-   (local-set-key outline-minor-mode-prefix outline-mode-prefix-map)))
-'';
-in
-  modifiedBerndHansen
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
deleted file mode 100644
index 5c35bc2..0000000
--- a/jeschli/2configs/emacs.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  pkgsWithOverlay = import <nixpkgs-unstable> {
-    overlays = [
-      (import (builtins.fetchTarball {
-        url = https://github.com/nix-community/emacs-overlay/archive/403c14c23be188b58c0b1bc197b428041d8a0cea.tar.gz;
-      }))
-    ];
-  };
-
-  # The emacs packages that I use
-  # I differ between
-  # - stable (Packages that I use for some time - happy with it)
-  # - unstable (Packages that I use for some time - but may drop)
-  # - testing (Packages that I try out - the new stuff)
-  emacsPkgs = epkgs:
-    (with epkgs.melpaPackages ;
-
-    ## windows-purpose (testing)
-    [ window-purpose ] ++
-
-    ## helm (stable)
-    # emacs completion engine
-    [ helm helm-ag ] ++
-
-    ## deft (testing)
-    # text search for a directory
-    [ deft ] ++
-
-    ## lsp mode (unstable)
-    # Language Server Protocol mode
-    # Used for rust
-    [ company-lsp dap-mode helm-lsp lsp-mode lsp-treemacs lsp-ui ] ++
-
-    ## emacs convenience (stable)
-    # Mixed and general purpose
-    [ ag company direnv evil google-this spacemacs-theme ] ++
-
-    ## common lisp (testing)
-    [ slime ] ++
-
-    ## magit (stable)
-    [ magit ] ++
-
-    ## bunch of programming languages (unstable)
-    [ go-mode haskell-mode nix-mode ] ++
-
-    ## rust (unstable)
-    [ racer rust-mode ] ++
-
-    ## python (stable)
-    # Python IDE for emacs
-    [ elpy ]) ++
-
-    ## org-mode
-    # Org-Mode has several extensions
-    # and can be seen as an application of its own.
-    (with epkgs.melpaPackages ;
-    # testing
-      [ org-super-agenda org-bullets org-ql ] ++
-    # unstable
-      [ smex org-mime orgit ]
-    ) ++
-
-    # stable
-    (with epkgs.orgPackages ;
-      [ org-plus-contrib ]) ++
-
-    # stable
-    (with epkgs.elpaPackages ;
-      [ bbdb which-key ]);
-
-#    ## EXWM related (unstable)
-#    epkgs.exwm
-#    epkgs.melpaPackages.desktop-environment
-#    epkgs.melpaPackages.helm-exwm
-#  ];
-
-  emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
-    config = builtins.readFile ./elisp/init.el;
-    # Package is optional, defaults to pkgs.emacs
-    package = pkgsWithOverlay.emacsGit;
-    # Optionally provide extra packages not in the configuration file
-    extraEmacsPackages = emacsPkgs;
-  };
-
-  myEmacs = pkgs.writeDashBin "my-emacs" ''
-    exec ${emacsWithOverlay}/bin/emacs -q "$@"
-  '';
-
-  myEmacsWithDaemon = pkgs.writeDashBin "my-emacs-daemon" ''
-    exec ${emacsWithOverlay}/bin/emacs -q --daemon -l ${./elisp/init.el}
-  '';
-
-  myEmacsClient = pkgs.writeDashBin "meclient" ''
-    exec ${emacsWithOverlay}/bin/emacsclient --create-frame "$@"
-  '';
-in {
-  environment.systemPackages = [
-    myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
-  ];
-
-## EXWM Config
-#  services.xserver = {
-#    enable = true;
-#    xkbOptions = "caps:super";
-#    exportConfiguration = true;
-#
-#    displayManager.slim.enable = true;
-#    windowManager.default = "exwm";
-#
-#    # Set up the login session
-#    windowManager.session = [{
-#      name = "exwm";
-#      start = "${emacsWithOverlay}/bin/emacs -q -l " + builtins.toString ./elisp/init.el;
-#    }];
-#  };
-}
diff --git a/jeschli/2configs/firefox.nix b/jeschli/2configs/firefox.nix
deleted file mode 100644
index 1e1e169..0000000
--- a/jeschli/2configs/firefox.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-
-  wrapper = pkgs.callPackage ../5pkgs/firefox/firefox-with-config.nix { };
-  myFirefox = wrapper pkgs.firefox-unwrapped {
-
-  # these plugins are defined in 5pkgs/firefox
-  extraExtensions = with pkgs ; [
-    dark-reader
-    https-everywhere
-    ublock-origin
-    audio-fingerprint-defender
-    canvas-fingerprint-defender
-    webgl-fingerprint-defender
-    font-fingerprint-defender
-    user-agent-switcher
-  ];
-
-  extraPolicies = {
-    CaptivePortal = false;
-  };
-
-  disablePocket = true;
-  disableFirefoxSync = true;
-  allowNonSigned = true;
-  clearDataOnShutdown = true;
-  disableDrmPlugin = true;
-
-};
-
-in {
-
-
-environment.variables = {
-  BROWSER = ["firefox"];
-};
-
-
-environment.systemPackages = with pkgs; [
-  myFirefox
-];
-
-}
diff --git a/jeschli/2configs/git.nix b/jeschli/2configs/git.nix
deleted file mode 100644
index faa8ccf..0000000
--- a/jeschli/2configs/git.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let
-
-  out = {
-    services.nginx.enable = true;
-    krebs.git = {
-      enable = true;
-      cgit = {
-        settings = {
-          root-title = "public repositories at ${config.krebs.build.host.name}";
-          root-desc = "keep calm and engage";
-        };
-        enable = true;
-      };
-      repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) repos;
-      rules = rules;
-    };
-
-    krebs.iptables.tables.filter.INPUT.rules = [
-      { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; }
-    ];
-  };
-
-  repos = public-repos;
-
-  rules = concatMap make-rules (attrValues repos);
-
-  public-repos = mapAttrs make-public-repo {
-    stockholm = {
-      cgit.desc = "Bonbon aus Git - die ganze Nacht";
-    };
-    krebs-page = {
-      cgit.desc = "Die Krebs Page";
-    };
-    xmonad-stockholm = {
-      cgit.desc = "XMonad Stockholm";
-    };
-  };
-
-  make-public-repo = name: { cgit ? {}, ... }: {
-    inherit cgit name;
-    public = true;
-    hooks = {
-      post-receive = pkgs.git-hooks.irc-announce {
-        channel = "#xxx";
-        nick = config.krebs.build.host.name;
-        refs = [
-          "refs/heads/master"
-        ];
-        server = "irc.r";
-        verbose = true;
-      };
-    };
-  };
-
-  make-rules =
-    with git // config.krebs.users;
-    repo:
-      singleton {
-        user = [ jeschli jeschli-brauerei jeschli-bolide];
-        repo = [ repo ];
-        perm = push "refs/*" [ non-fast-forward create delete merge ];
-      } ++
-      optional repo.public {
-        user = attrValues config.krebs.users;
-        repo = [ repo ];
-        perm = fetch;
-      } ++
-      optional (length (repo.collaborators or []) > 0) {
-        user = repo.collaborators;
-        repo = [ repo ];
-        perm = fetch;
-      };
-
-in out
diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
deleted file mode 100644
index 46ae24f..0000000
--- a/jeschli/2configs/haskell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-let
-  all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
-in
-{
-  environment.systemPackages = with pkgs; [
-    cabal2nix
-    gcc
-    ghc
-    haskellPackages.cabal-install
-    haskellPackages.ghcid
-    haskellPackages.hindent
-    haskellPackages.hlint
-    haskellPackages.hoogle
-    haskellPackages.stack
-    (all-hies.selection { selector = p: {inherit (p) ghc864; }; })
-  ];
-}
diff --git a/jeschli/2configs/home-manager/default.nix b/jeschli/2configs/home-manager/default.nix
deleted file mode 100644
index ad8663d..0000000
--- a/jeschli/2configs/home-manager/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    <home-manager/nixos>
-  ];
-  home-manager.useUserPackages = true;
-  home-manager.users.jeschli = {
-    home.stateVersion = "19.03";
-  };
-}
diff --git a/jeschli/2configs/i3.nix b/jeschli/2configs/i3.nix
deleted file mode 100644
index 1a6c492..0000000
--- a/jeschli/2configs/i3.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-{pkgs, environment, config, lib, ... }:
-
-with pkgs;
-
-let
-
-  i3_conf_file =  pkgs.writeText "config" ''
-
-  # i3 config file (v4)
-  # doc: https://i3wm.org/docs/userguide.html
-
-  set $mod Mod4
-
-  # Font for window titles. Will also be used by the bar unless a different font
-  # is used in the bar {} block below.
-  font pango:monospace 8
-
-  # Use Mouse+$mod to drag floating windows to their wanted position
-  floating_modifier $mod
-
-  # start a terminal
-  bindsym $mod+Return exec i3-sensible-terminal
-
-  # kill focused window
-  bindsym $mod+Shift+q kill
-
-  # start rofi program launcher
-  bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
-  # Switch windows with rofi
-  bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
-
-  # There also is the (new) i3-dmenu-desktop which only displays applications
-  # shipping a .desktop file. It is a wrapper around dmenu, so you need that
-  # installed.
-  # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-  # change focus
-  bindsym $mod+j focus left
-  bindsym $mod+k focus down
-  bindsym $mod+l focus up
-  bindsym $mod+semicolon focus right
-
-  # alternatively, you can use the cursor keys:
-  bindsym $mod+Left focus left
-  bindsym $mod+Down focus down
-  bindsym $mod+Up focus up
-  bindsym $mod+Right focus right
-
-  # move focused window
-  bindsym $mod+Shift+j move left
-  bindsym $mod+Shift+k move down
-  bindsym $mod+Shift+l move up
-  bindsym $mod+Shift+semicolon move right
-
-  # alternatively, you can use the cursor keys:
-  bindsym $mod+Shift+Left move left
-  bindsym $mod+Shift+Down move down
-  bindsym $mod+Shift+Up move up
-  bindsym $mod+Shift+Right move right
-
-  # split in horizontal orientation
-  bindsym $mod+h split h
-
-  # split in vertical orientation
-  bindsym $mod+v split v
-
-  # enter fullscreen mode for the focused container
-  bindsym $mod+f fullscreen toggle
-
-  # change container layout (stacked, tabbed, toggle split)
-  bindsym $mod+s layout stacking
-  bindsym $mod+w layout tabbed
-  bindsym $mod+e layout toggle split
-
-  # toggle tiling / floating
-  bindsym $mod+Shift+space floating toggle
-
-  # change focus between tiling / floating windows
-  bindsym $mod+space focus mode_toggle
-
-  # focus the parent container
-  bindsym $mod+a focus parent
-
-  # focus the child container
-  #bindsym $mod+d focus child
-
-  # Define names for default workspaces for which we configure key bindings later on.
-  # We use variables to avoid repeating the names in multiple places.
-  set $ws1 "1"
-  set $ws2 "2"
-  set $ws3 "3: Emacs"
-  set $ws4 "4"
-  set $ws5 "5"
-  set $ws6 "6"
-  set $ws7 "7"
-  set $ws8 "8"
-  set $ws9 "9"
-  set $ws10 "10"
-
-  assign [class="emacs"] $ws3
-
-  # switch to workspace
-  bindsym $mod+1 workspace $ws1
-  bindsym $mod+2 workspace $ws2
-  bindsym $mod+3 workspace $ws3
-  bindsym $mod+4 workspace $ws4
-  bindsym $mod+5 workspace $ws5
-  bindsym $mod+6 workspace $ws6
-  bindsym $mod+7 workspace $ws7
-  bindsym $mod+8 workspace $ws8
-  bindsym $mod+9 workspace $ws9
-  bindsym $mod+0 workspace $ws10
-
-  # move focused container to workspace
-  bindsym $mod+Shift+1 move container to workspace $ws1
-  bindsym $mod+Shift+2 move container to workspace $ws2
-  bindsym $mod+Shift+3 move container to workspace $ws3
-  bindsym $mod+Shift+4 move container to workspace $ws4
-  bindsym $mod+Shift+5 move container to workspace $ws5
-  bindsym $mod+Shift+6 move container to workspace $ws6
-  bindsym $mod+Shift+7 move container to workspace $ws7
-  bindsym $mod+Shift+8 move container to workspace $ws8
-  bindsym $mod+Shift+9 move container to workspace $ws9
-  bindsym $mod+Shift+0 move container to workspace $ws10
-
-  # reload the configuration file
-  bindsym $mod+Shift+c reload
-  # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-  bindsym $mod+Shift+r restart
-  # exit i3 (logs you out of your X session)
-  bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-  # resize window (you can also use the mouse for that)
-  mode "resize" {
-          # These bindings trigger as soon as you enter the resize mode
-
-          # Pressing left will shrink the window’s width.
-          # Pressing right will grow the window’s width.
-          # Pressing up will shrink the window’s height.
-          # Pressing down will grow the window’s height.
-          bindsym j resize shrink width 10 px or 10 ppt
-          bindsym k resize grow height 10 px or 10 ppt
-          bindsym l resize shrink height 10 px or 10 ppt
-          bindsym semicolon resize grow width 10 px or 10 ppt
-
-          # same bindings, but for the arrow keys
-          bindsym Left resize shrink width 10 px or 10 ppt
-          bindsym Down resize grow height 10 px or 10 ppt
-          bindsym Up resize shrink height 10 px or 10 ppt
-          bindsym Right resize grow width 10 px or 10 ppt
-
-          # back to normal: Enter or Escape or $mod+r
-          bindsym Return mode "default"
-          bindsym Escape mode "default"
-          bindsym $mod+r mode "default"
-  }
-
-  bindsym $mod+r mode "resize"
-
-    bar {
-        status_command i3status
-        position top
-    }
-
-    #######################
-    #                     #
-    #       AUTORUNS      #
-    #                     #
-    #######################
-    # Start firefox
-    exec --no-startup-id ${pkgs.firefox}/bin/firefox --new-instance --setDefaultBrowser
-
-    # Start my-emacs server
-    exec --no-startup-id my-emacs-daemon
-  '';
-
-in {
-
-  #######################
-  #                     #
-  #     AUTORANDR       #
-  #                     #
-  #######################
-
-  # Start autorandr on display change
-  services.autorandr = {
-    enable = true;
-    defaultTarget = "mobile";
-  };
-
-  # What to execute after resolution has been changed
-  environment.etc."xdg/autorandr/postswitch" = {
-    text = '' sleep 4 && i3-msg "restart" '';
-
-  };
-
-  # Start autorandr once on startup
-  systemd.user.services.boot-autorandr = {
-    description = "Autorandr service";
-    partOf = [ "graphical-session.target" ];
-    wantedBy = [ "graphical-session.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.autorandr}/bin/autorandr -c";
-      Type = "oneshot";
-    };
-  };
-
-
-
-  #######################
-  #                     #
-  #       XSERVER       #
-  #                     #
-  #######################
-services.xserver.enable = true;
-
-  # Enable i3 Window Manager
-  services.xserver.windowManager.i3 = {
-    enable = true;
-    package = pkgs.i3;
-    configFile = i3_conf_file;
-   };
-
-
-  # ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
-  # ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
-  services.xserver.windowManager.default = "i3";
-  services.xserver.desktopManager.xterm.enable = false;
-
-
-  # Enable the X11 windowing system.
-  services.xserver.displayManager.lightdm.enable = true;
-
-  # Allow users in video group to change brightness
-  environment.systemPackages = with pkgs; [
-    rofi     # Dmenu replacement
-    acpilight # Replacement for xbacklight
-    brightnessctl
-    arandr # Xrandr gui
-    feh
-    wirelesstools # To get wireless statistics
-    acpi
-    xorg.xhost
-    xorg.xauth
-  ];
-
-}
diff --git a/jeschli/2configs/officevpn.nix b/jeschli/2configs/officevpn.nix
deleted file mode 100644
index eb0477d..0000000
--- a/jeschli/2configs/officevpn.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  nixpkgs.config.packageOverrides = pkgs: {
-    openvpn = pkgs.openvpn.override { pkcs11Support = true; useSystemd = false;};
-  };
-
-  environment.systemPackages = with pkgs; [
-  opensc
-  openvpn
-  yubikey-manager
-  ];
-
-  services.pcscd.enable = true;
-
-  # To start the vpn manually execute
-  # $ openvpn --config clien.ovpn
-}
-
diff --git a/jeschli/2configs/os-templates/CentOS-7-64bit.nix b/jeschli/2configs/os-templates/CentOS-7-64bit.nix
deleted file mode 100644
index fb34e94..0000000
--- a/jeschli/2configs/os-templates/CentOS-7-64bit.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-_:
-
-{
-  imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
-
-  boot.loader.grub = {
-    device = "/dev/sda";
-    splashImage = null;
-  };
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
-
-  fileSystems."/" = {
-    device = "/dev/sda1";
-    fsType = "ext4";
-  };
-}
diff --git a/jeschli/2configs/python.nix b/jeschli/2configs/python.nix
deleted file mode 100644
index 0c32e1f..0000000
--- a/jeschli/2configs/python.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    python37
-    python37Packages.pip
-    pipenv
-  ];
-}
diff --git a/jeschli/2configs/retiolum.nix b/jeschli/2configs/retiolum.nix
deleted file mode 100644
index f226096..0000000
--- a/jeschli/2configs/retiolum.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  krebs.tinc.retiolum = {
-    enable = true;
-    connectTo = [
-      "prism"
-      "gum"
-      "ni"
-      "dishfire"
-      "enklave"
-    ];
-  };
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    tinc = pkgs.tinc_pre;
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 655 ];
-  networking.firewall.allowedUDPPorts = [ 655 ];
-
-  environment.systemPackages = [
-    pkgs.tinc
-  ];
-}
diff --git a/jeschli/2configs/rust.nix b/jeschli/2configs/rust.nix
deleted file mode 100644
index 46addb1..0000000
--- a/jeschli/2configs/rust.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    rustup
-    gcc
-  ];
-}
diff --git a/jeschli/2configs/steam.nix b/jeschli/2configs/steam.nix
deleted file mode 100644
index 06a068a..0000000
--- a/jeschli/2configs/steam.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  nixpkgs.config.steam.java = true;
-  environment.systemPackages = with pkgs; [
-    steam
-  ];
-  hardware.opengl.driSupport32Bit = true;
-
-  #ports for inhome streaming
-}
diff --git a/jeschli/2configs/tests/dummy-secrets/empty b/jeschli/2configs/tests/dummy-secrets/empty
deleted file mode 100644
index e69de29..0000000
--- a/jeschli/2configs/tests/dummy-secrets/empty
+++ /dev/null
diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix
deleted file mode 100644
index 4049a47..0000000
--- a/jeschli/2configs/urxvt.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
-  options.jeschliFontSize = mkOption {
-    type = types.int;
-    default = 12;
-  };
-  config = {
-    services.urxvtd.enable = true;
-    krebs.xresources.enable = true;
-    krebs.xresources.resources.urxvt = ''
-    *foreground: rgb:a8/a8/a8
-    *background: rgb:00/00/00
-    *faceName: DejaVu Sans Mono
-    *faceSize: ${toString config.jeschliFontSize}
-    *color0: rgb:00/00/00
-    *color1: rgb:a8/00/00
-    *color2: rgb:00/a8/00
-    *color3: rgb:a8/54/00
-    *color4: rgb:26/8b/d2
-    *color5: rgb:a8/00/a8
-    *color6: rgb:00/a8/a8
-    *color7: rgb:a8/a8/a8
-    *color8: rgb:54/54/54
-    *color9: rgb:fc/54/54
-    *color10: rgb:54/fc/54
-    *color11: rgb:fc/fc/54
-    *color12: rgb:54/54/fc
-    *color13: rgb:fc/54/fc
-    *color14: rgb:54/fc/fc
-    *color15: rgb:fc/fc/fc
-
-    URxvt*scrollBar:                      false
-    URxvt*urgentOnBell:                   true
-    URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize}
-    URXvt*faceSize: ${toString config.jeschliFontSize}
-    '';
-  };
-}
diff --git a/jeschli/2configs/vim.nix b/jeschli/2configs/vim.nix
deleted file mode 100644
index 586016f..0000000
--- a/jeschli/2configs/vim.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-let
-  customPlugins.vim-javascript = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-javascript";
-    src = pkgs.fetchFromGitHub {
-      owner = "pangloss";
-      repo = "vim-javascript";
-      rev = "1.2.5.1";
-      sha256 = "08l7ricd3j5h2bj9i566byh39v9n5wj5mj75f2c8a5dsc732b2k7";
-    };
-  };
-  customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-jsx";
-    src = pkgs.fetchFromGitHub {
-      owner = "mxw";
-      repo = "vim-jsx";
-      rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
-      sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
-    };
-  };
-  customPlugins.vim-fileline = pkgs.vimUtils.buildVimPlugin {
-    name = "file-line-1.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "bogado";
-      repo = "file-line";
-      rev = "1.0";
-      sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
-    };
-  };
-in {
-  environment.systemPackages = [
-    (pkgs.vim_configurable.customize {
-      name = "vim";
-      vimrcConfig.customRC = let
-        colorscheme = ''colorscheme molokai'';
-        highlightTrailingWhiteSpaces = ''
-          au Syntax * syn match Garbage containedin=ALL /\s\+$/
-        '';
-        setStatements = ''
-          set autowrite
-          set clipboard=unnamedplus
-          set listchars=trail:¶
-          set mouse=a
-          set nocompatible
-          set path+=**
-          set ruler
-          set undodir=$HOME/.vim/undo  "directory where the undo files will be stored
-          set undofile                 "turn on the feature
-          set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
-          set wildmenu
-        '';
-        remapStatements = ''
-          imap jk <Esc>
-          map gr :GoRun<Enter>         " Map gr to execute go run
-          map tt :GoTest<Enter>        " Map tt to execute go test
-          map nf :NERDTreeToggle<CR>
-          nnoremap <C-TAB> <c-w><c-w>
-          nnoremap <S-TAB> :bnext<CR>
-          noremap x "_x
-          vmap v v
-        '';
-        settingsForGo = ''
-          let g:go_decls_includes = "func,type"
-          let g:go_def_mode = 'godef'
-          let g:go_fmt_command = "goimports"
-          let g:go_highlight_extra_types = 1
-          let g:go_highlight_fields = 1
-          let g:go_highlight_functions = 1
-          let g:go_highlight_methods = 1
-          let g:go_highlight_types = 1
-          let g:go_list_type = "quickfix"
-          let g:go_metalinter_autosave = 1
-          let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
-          let g:go_snippet_case_type = "camelcase"
-          let g:go_test_timeout = '10s'
-          let g:jsx_ext_required = 0
-          let g:molokai_original = 1
-          let g:rehash256 = 1
-        '';
-        settingsForElm = ''
-          let g:polyglot_disabled = ['elm']
-          let g:elm_detailed_complete = 1
-          let g:elm_format_autosave = 1
-          let g:elm_syntastic_show_warnings = 1
-        '';
-      in ''
-        ${colorscheme}
-        ${highlightTrailingWhiteSpaces}
-        ${remapStatements}
-        ${setStatements}
-        ${settingsForElm}
-        ${settingsForGo}
-        " dont expand tabs in go files and show it with four whitespaces.
-        autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
-      '';
-       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
-       vimrcConfig.vam.pluginDictionaries = [
-         { names = [
-            "ctrlp"
-            "easymotion"
-            "elm-vim"
-            "vim-fileline"
-            "molokai"
-            "nerdtree"
-            "snipmate"
-            "surround"
-            "Syntastic"
-            "undotree"
-           ];
-         }
-         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
-         { names = [ "vim-go" ]; ft_regex = "^go\$"; } # wanted: nsf/gocode
-         { names = [ "vim-javascript" ]; ft_regex = "^js\$"; }
-         { names = [ "vim-jsx" ]; ft_regex = "^js\$"; }
-       ];
-    })
-  ];
-
-  # set up the directories up if they are not there.
-# Needs to be changed.
-#  vim = let
-#    dirs = {
-#      backupdir = "$HOME/.cache/vim/backup";
-#      swapdir   = "$HOME/.cache/vim/swap";
-#      undodir   = "$HOME/.cache/vim/undo";
-#    };
-#    files = {
-#      viminfo   = "$HOME/.cache/vim/info";
-#    };
-#
-#    mkdirs = let
-#      dirOf = s: let out = concatStringsSep "/" (init (splitString "/" s));
-#                 in assert out != ""; out;
-#      alldirs = attrValues dirs ++ map dirOf (attrValues files);
-#    in unique (sort lessThan alldirs);
-#  in
-#    pkgs.symlinkJoin {
-#      name = "vim";
-#      paths = [
-#        (pkgs.writeDashBin "vim" ''
-#          set -efu
-#          (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
-#          exec ${pkgs.vim}/bin/vim "$@"
-#        '')
-#        pkgs.vim
-#      ];
-#    };
-
-}
diff --git a/jeschli/2configs/virtualbox.nix b/jeschli/2configs/virtualbox.nix
deleted file mode 100644
index c9bb8c4..0000000
--- a/jeschli/2configs/virtualbox.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  mainUser = config.users.extraUsers.jeschli;
-
-in {
-  #services.virtualboxHost.enable = true;
-  virtualisation.virtualbox.host.enable = true;
-
-  users.extraUsers = {
-    virtual = {
-      name = "virtual";
-      description = "user for running VirtualBox";
-      home = "/home/virtual";
-      useDefaultShell = true;
-      extraGroups = [ "vboxusers" "audio" ];
-      createHome = true;
-    };
-  };
-  security.sudo.extraConfig = ''
-    ${mainUser.name} ALL=(virtual) NOPASSWD: ALL
-  '';
-}
diff --git a/jeschli/2configs/xdg.nix b/jeschli/2configs/xdg.nix
deleted file mode 100644
index 18bac9b..0000000
--- a/jeschli/2configs/xdg.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
-  environment.variables.XDG_RUNTIME_DIR = "/run/xdg/$LOGNAME";
-
-  systemd.tmpfiles.rules = let
-    forUsers = flip map users;
-    isUser = { name, group, ... }:
-      name == "root" || hasSuffix "users" group;
-    users = filter isUser (mapAttrsToList (_: id) config.users.users);
-  in forUsers (u: "d /run/xdg/${u.name} 0700 ${u.name} ${u.group} -");
-}
diff --git a/jeschli/2configs/xserver/Xmodmap.nix b/jeschli/2configs/xserver/Xmodmap.nix
deleted file mode 100644
index d2b1b26..0000000
--- a/jeschli/2configs/xserver/Xmodmap.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-pkgs.writeText "Xmodmap" ''
-  !keycode 66 = Caps_Lock
-  !remove Lock = Caps_Lock
-  clear Lock
-
-  ! caps lock
-  keycode  66 = Mode_switch
-
-  keycode  13 = 4 dollar EuroSign cent
-  keycode  30 = u U udiaeresis Udiaeresis
-  keycode  32 = o O odiaeresis Odiaeresis
-  keycode  38 = a A adiaeresis Adiaeresis
-  keycode  39 = s S ssharp
-
-  keycode  33 = p P Greek_pi Greek_PI
-  keycode  46 = l L Greek_lambda Greek_LAMBDA
-
-  keycode  54 = c C cacute Cacute
-
-  !                       BULLET OPERATOR
-  keycode 17 = 8 asterisk U2219
-  keycode 27 = r R r U211D
-''
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
deleted file mode 100644
index ebe7159..0000000
--- a/jeschli/2configs/xserver/Xresources.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-pkgs.writeText "Xresources" /* xdefaults */ ''
-  Xcursor.theme: aero-large-drop
-  Xcursor.size: 128
-
-  URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
-  URxvt*eightBitInput: false
-  URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
-  URxvt*boldFont: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
-  URxvt*scrollBar: false
-  URxvt*background: #050505
-  URxvt*foreground: #d0d7d0
-  URxvt*cursorColor: #f042b0
-  URxvt*cursorColor2: #f0b000
-  URxvt*cursorBlink: off
-  URxvt*jumpScroll: true
-  URxvt*allowSendEvents: false
-  URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48
-  URxvt*cutNewline: False
-  URxvt*cutToBeginningOfLine: False
-  URxvt*font: xft:Monospace:size=12
-  URxvt*font: xft:Monospace:size=12:bold
-  URxvt*color0: #232342
-  URxvt*color3: #c07000
-  URxvt*color4: #4040c0
-  URxvt*color7: #c0c0c0
-  URxvt*color8: #707070
-  URxvt*color9: #ff6060
-  URxvt*color10: #70ff70
-  URxvt*color11: #ffff70
-  URxvt*color12: #7070ff
-  URxvt*color13: #ff50ff
-  URxvt*color14: #70ffff
-  URxvt*color15: #ffffff
-
-  URxvt*iso14755: False
-
-  URxvt*urgentOnBell: True
-  URxvt*visualBell: True
-
-  ! ref https://github.com/muennich/urxvt-perls
-  URxvt*perl-ext: default,url-select
-  URxvt*keysym.M-u: perl:url-select:select_next
-  URxvt*url-select.underline: true
-  URxvt*colorUL: #4682B4
-  URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
-  URxvt*saveLines: 10000
-
-  root-urxvt*background: #230000
-  root-urxvt*foreground: #e0c0c0
-  root-urxvt*BorderColor: #400000
-  root-urxvt*color0: #800000
-''
diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix
deleted file mode 100644
index 44c35ca..0000000
--- a/jeschli/2configs/xserver/default.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{ config, pkgs, ... }@args:
-with import <stockholm/lib>;
-let
-  cfg = {
-    cacheDir = cfg.dataDir;
-    configDir = "/var/empty";
-    dataDir = "/run/xdg/${cfg.user.name}/xmonad";
-    user = config.krebs.users.jeschli;
-  };
-in {
-
-  environment.systemPackages = [
-    pkgs.font-size
-    pkgs.gitAndTools.qgit
-    pkgs.mpv
-    pkgs.sxiv
-    pkgs.xdotool
-    pkgs.xsel
-    pkgs.zathura
-  ];
-
-  fonts.fonts = [
-    pkgs.xlibs.fontschumachermisc
-  ];
-
-  # TODO dedicated group, i.e. with a single user [per-user-setuid]
-  # TODO krebs.setuid.slock.path vs /run/wrappers/bin
-  krebs.setuid.slock = {
-    filename = "${pkgs.slock}/bin/slock";
-    group = "wheel";
-    envp = {
-      DISPLAY = ":${toString config.services.xserver.display}";
-      USER = cfg.user.name;
-    };
-  };
-
-  systemd.services.display-manager.enable = false;
-
-  systemd.services.xmonad = {
-    wantedBy = [ "multi-user.target" ];
-    requires = [ "xserver.service" ];
-    environment = {
-      DISPLAY = ":${toString config.services.xserver.display}";
-
-      XMONAD_CACHE_DIR = cfg.cacheDir;
-      XMONAD_CONFIG_DIR = cfg.configDir;
-      XMONAD_DATA_DIR = cfg.dataDir;
-
-      XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
-        ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
-        ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
-        ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
-        ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
-        ${config.services.xserver.displayManager.sessionCommands}
-        if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-          exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" ""
-        fi
-        export DBUS_SESSION_BUS_ADDRESS
-        ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
-        wait
-      '';
-
-      # XXX JSON is close enough :)
-      XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
-        "dashboard" # we start here
-        "stockholm"
-        "pycharm"
-        "chromium"
-        "iRC"
-        "git"
-        "hipbird"
-      ]);
-    };
-    serviceConfig = {
-      SyslogIdentifier = "xmonad";
-      ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${toString [
-        "\${XMONAD_CACHE_DIR}"
-        "\${XMONAD_CONFIG_DIR}"
-        "\${XMONAD_DATA_DIR}"
-      ]}";
-      ExecStart = "${pkgs.xmonad-jeschli}/bin/xmonad";
-      ExecStop = "${pkgs.xmonad-jeschli}/bin/xmonad --shutdown";
-      User = cfg.user.name;
-      WorkingDirectory = cfg.user.home;
-    };
-  };
-
-  systemd.services.xserver = {
-    after = [
-      "systemd-udev-settle.service"
-      "local-fs.target"
-      "acpid.service"
-    ];
-    reloadIfChanged = true;
-    environment = {
-      XKB_BINDIR = "${pkgs.xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
-      XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
-      LD_LIBRARY_PATH = concatStringsSep ":" (
-        [ "${pkgs.xorg.libX11}/lib" "${pkgs.xorg.libXext}/lib" ]
-        ++ concatLists (catAttrs "libPath" config.services.xserver.drivers));
-    };
-    serviceConfig = {
-      SyslogIdentifier = "xserver";
-      ExecReload = "${pkgs.coreutils}/bin/echo NOP";
-      ExecStart = toString [
-        "${pkgs.xorg.xorgserver}/bin/X"
-        ":${toString config.services.xserver.display}"
-        "vt${toString config.services.xserver.tty}"
-        "-config ${import ./xserver.conf.nix args}"
-        "-logfile /dev/null -logverbose 0 -verbose 3"
-        "-nolisten tcp"
-        "-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb"
-      ];
-    };
-  };
-
-  systemd.services.urxvtd = {
-    wantedBy = [ "multi-user.target" ];
-    reloadIfChanged = true;
-    serviceConfig = {
-      SyslogIdentifier = "urxvtd";
-      ExecReload = "${pkgs.coreutils}/bin/echo NOP";
-      ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
-      Restart = "always";
-      RestartSec = "2s";
-      StartLimitBurst = 0;
-      User = cfg.user.name;
-    };
-  };
-}
diff --git a/jeschli/2configs/xserver/xserver.conf.nix b/jeschli/2configs/xserver/xserver.conf.nix
deleted file mode 100644
index 6f34e01..0000000
--- a/jeschli/2configs/xserver/xserver.conf.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let
-  cfg = config.services.xserver;
-in
-
-pkgs.stdenv.mkDerivation {
-  name = "xserver.conf";
-
-  xfs = optionalString (cfg.useXFS != false)
-    ''FontPath "${toString cfg.useXFS}"'';
-
-  inherit (cfg) config;
-
-  buildCommand =
-    ''
-      echo 'Section "Files"' >> $out
-      echo $xfs >> $out
-
-      for i in ${toString config.fonts.fonts}; do
-        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
-          for j in $(find $i -name fonts.dir); do
-            echo "  FontPath \"$(dirname $j)\"" >> $out
-          done
-        fi
-      done
-
-      for i in $(find ${toString cfg.modules} -type d); do
-        if test $(echo $i/*.so* | wc -w) -ne 0; then
-          echo "  ModulePath \"$i\"" >> $out
-        fi
-      done
-
-      echo 'EndSection' >> $out
-
-      echo "$config" >> $out
-    '';
-}
diff --git a/jeschli/2configs/zsh.nix b/jeschli/2configs/zsh.nix
deleted file mode 100644
index 0f6775e..0000000
--- a/jeschli/2configs/zsh.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  environment.systemPackages = [ pkgs.fzf ];
-  programs.zsh = {
-    enable = true;
-    shellInit = ''
-      #disable config wizard
-      zsh-newuser-install() { :; }
-    '';
-    interactiveShellInit = ''
-      setopt autocd extendedglob
-      bindkey -e
-
-      #history magic
-      bindkey "[A" up-line-or-local-history
-      bindkey "[B" down-line-or-local-history
-
-      up-line-or-local-history() {
-          zle set-local-history 1
-          zle up-line-or-history
-          zle set-local-history 0
-      }
-      zle -N up-line-or-local-history
-      down-line-or-local-history() {
-          zle set-local-history 1
-          zle down-line-or-history
-          zle set-local-history 0
-      }
-      zle -N down-line-or-local-history
-
-      setopt share_history
-      setopt hist_ignore_dups
-      # setopt inc_append_history
-      bindkey '^R' history-incremental-search-backward
-
-      #C-x C-e open line in editor
-      autoload -z edit-command-line
-      zle -N edit-command-line
-      bindkey "^X^E" edit-command-line
-
-      #fzf inclusion
-      source ${pkgs.fzf}/share/fzf/completion.zsh
-      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
-
-      #completion magic
-      autoload -Uz compinit
-      compinit
-      zstyle ':completion:*' menu select
-
-      #enable automatic rehashing of $PATH
-      zstyle ':completion:*' rehash true
-
-      eval $(dircolors -b ${pkgs.fetchFromGitHub {
-        owner = "trapd00r";
-        repo = "LS_COLORS";
-        rev = "a75fca8545f91abb8a5f802981033ef54bf1eac0";
-        sha256="1lzj0qnj89mzh76ha137mnz2hf86k278rh0y9x124ghxj9yqsnb4";
-      }}/LS_COLORS)
-
-      #beautiful colors
-      alias ls='ls --color'
-      # zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
-
-      #emacs bindings
-      bindkey "[7~" beginning-of-line
-      bindkey "[8~" end-of-line
-      bindkey "Oc" emacs-forward-word
-      bindkey "Od" emacs-backward-word
-
-      #aliases
-      alias ll='ls -l'
-      alias la='ls -la'
-
-      #fancy window title magic
-    '';
-    promptInit = ''
-      # TODO: figure out why we need to set this here
-      HISTSIZE=900001
-      HISTFILESIZE=$HISTSIZE
-      SAVEHIST=$HISTSIZE
-
-      autoload -U promptinit
-      promptinit
-
-      p_error='%(?..%F{red}%?%f )'
-      t_error='%(?..%? )'
-
-      case $UID in
-        0)
-          p_username='%F{red}root%f'
-          t_username='root'
-          ;;
-        1337)
-          p_username=""
-          t_username=""
-          ;;
-        *)
-          p_username='%F{blue}%n%f'
-          t_username='%n'
-          ;;
-      esac
-
-      if test -n "$SSH_CLIENT"; then
-        p_hostname='@%F{magenta}%M%f '
-        t_hostname='@%M '
-      else
-        p_hostname=""
-        t_hostname=""
-      fi
-
-      #check if in nix shell
-      if test -n "$buildInputs"; then
-        p_nixshell='%F{green}[s]%f '
-        t_nixshell='[s] '
-      else
-        p_nixshell=""
-        t_nixshell=""
-      fi
-
-      PROMPT="$p_error$p_username$p_hostname$p_nixshell%~ "
-      TITLE="$t_error$t_username$t_hostname$t_nixshell%~"
-      case $TERM in
-        (*xterm* | *rxvt*)
-          function precmd {
-            PROMPT_EVALED="$(print -P $TITLE)"
-            echo -ne "\033]0;$$ $PROMPT_EVALED\007"
-          }
-          # This is seen while the shell waits for a command to complete.
-          function preexec {
-            PROMPT_EVALED="$(print -P $TITLE)"
-            echo -ne "\033]0;$$ $PROMPT_EVALED $1\007"
-          }
-        ;;
-      esac
-    '';
-  };
-  users.defaultUserShell = "/run/current-system/sw/bin/zsh";
-}
diff --git a/jeschli/5pkgs/default.nix b/jeschli/5pkgs/default.nix
deleted file mode 100644
index 3fa5b5e..0000000
--- a/jeschli/5pkgs/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-with import <stockholm/lib>;
-
-self: super:
-
-# Import files and subdirectories like they are overlays.
-foldl' mergeAttrs {}
-  (map
-    (name: import (./. + "/${name}") self super)
-    (filter
-      (name: name != "default.nix" && !hasPrefix "." name)
-      (attrNames (readDir ./.))))
diff --git a/jeschli/5pkgs/firefox/audio-fingerprint-defender/default.nix b/jeschli/5pkgs/firefox/audio-fingerprint-defender/default.nix
deleted file mode 100644
index 05815e1..0000000
--- a/jeschli/5pkgs/firefox/audio-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "audio-fingerprint-defender-${version}";
-    version = "0.1.3";
-
-    extid = "@audio-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3363623/audiocontext_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "0yfk5vqwjg4g25c98psj56sw3kv8imxav3nss4hbibflgla1h5pb";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Audio context fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/audiocontext-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/canvas-fingerprint-defender/default.nix b/jeschli/5pkgs/firefox/canvas-fingerprint-defender/default.nix
deleted file mode 100644
index 21b4b3f..0000000
--- a/jeschli/5pkgs/firefox/canvas-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "canvas-fingerprint-defender-${version}";
-    version = "0.1.5";
-
-    extid = "@canvas-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362272/canvas_fingerprint_defender-${version}-an+fx.xpi?src=recommended";
-      sha256 = "1hg00zsrw7ij7bc222j83g2wm3ml1aj34zg5im1802cjq4qqvbld";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Canvas fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/webgl-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/dark-reader/default.nix b/jeschli/5pkgs/firefox/dark-reader/default.nix
deleted file mode 100644
index 44f4f90..0000000
--- a/jeschli/5pkgs/firefox/dark-reader/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "dark-reader-${version}";
-    version = "4.8.1";
-
-    extid = "addon@darkreader.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3404143/dark_reader-${version}-an+fx.xpi";
-      sha256 = "0ic0i56jhmxymvy68bs5hqcjvdvw3vks5r58i2ygmpsm190rlldb";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
-    homepage = https://github.com/darkreader/darkreader;
-    license = licenses.mit;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/default.nix b/jeschli/5pkgs/firefox/default.nix
deleted file mode 100644
index 6ba4fec..0000000
--- a/jeschli/5pkgs/firefox/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-with import <stockholm/lib>;
-
-self: super:
-
-let
-  # This callPackage will try to detect obsolete overrides.
-  callPackage = path: args: let
-    override = self.callPackage path args;
-    upstream = optionalAttrs (override ? "name")
-      (super.${(parseDrvName override.name).name} or {});
-  in if upstream ? "name" &&
-        override ? "name" &&
-        compareVersions upstream.name override.name != -1
-    then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
-    else override;
-in
-
-  mapNixDir (path: callPackage path {}) ./.
diff --git a/jeschli/5pkgs/firefox/firefox-with-config.nix b/jeschli/5pkgs/firefox/firefox-with-config.nix
deleted file mode 100644
index fc22c43..0000000
--- a/jeschli/5pkgs/firefox/firefox-with-config.nix
+++ /dev/null
@@ -1,487 +0,0 @@
-{ stdenv, lib, pkgs, makeDesktopItem, makeWrapper, lndir, replace, config
-
-## various stuff that can be plugged in
-, flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
-, jrePlugin, icedtea_web
-, bluejeans, djview4, adobe-reader
-, fribid, gnome3/*.gnome-shell*/
-, esteidfirefoxplugin ? ""
-, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
-, udev
-, kerberos
-
-}:
-
-## configurability of the wrapper itself
-
-browser:
-
-let
-  wrapper =
-    { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
-    , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
-    , desktopName ? # browserName with first letter capitalized
-      (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
-    , nameSuffix ? ""
-    , icon ? browserName
-    , extraPlugins ? []
-    , extraPrefs ? ""
-    , extraExtensions ? [ ]
-    , allowNonSigned ? false
-    , disablePocket ? false
-    , disableTelemetry ? true
-    , disableDrmPlugin ? false
-    , showPunycodeUrls ? true
-    , disableFirefoxStudies ? true
-    , disableFirefoxSync ? false
-    , useSystemCertificates ? true
-    , dontCheckDefaultBrowser ? false
-    # For more information about anti tracking
-    # vist https://wiki.kairaven.de/open/app/firefox
-    , activateAntiTracking ? true
-    , disableFeedbackCommands ? true
-    , disableDNSOverHTTPS ? true
-    , disableGoogleSafebrowsing ? false
-    , clearDataOnShutdown ? false
-    , homepage ? "about:blank"
-    # For more information about policies visit
-    # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
-    , extraPolicies ? {}
-    , extraNativeMessagingHosts ? []
-    , gdkWayland ? false
-    }:
-
-    assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
-
-    let
-
-      # If extraExtensions has been set disable manual extensions
-      disableManualExtensions = if lib.count (x: true) extraExtensions > 0 then true else false;
-
-      cfg = config.${browserName} or {};
-      enableAdobeFlash = cfg.enableAdobeFlash or false;
-      ffmpegSupport = browser.ffmpegSupport or false;
-      gssSupport = browser.gssSupport or false;
-      jre = cfg.jre or false;
-      icedtea = cfg.icedtea or false;
-      supportsJDK =
-        stdenv.hostPlatform.system == "i686-linux" ||
-        stdenv.hostPlatform.system == "x86_64-linux" ||
-        stdenv.hostPlatform.system == "armv7l-linux" ||
-        stdenv.hostPlatform.system == "aarch64-linux";
-
-      plugins =
-        assert !(jre && icedtea);
-        if builtins.hasAttr "enableVLC" cfg
-        then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins"
-        else
-        ([ ]
-          ++ lib.optional enableAdobeFlash flashplayer
-          ++ lib.optional (cfg.enableDjvu or false) (djview4)
-          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
-          ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
-          ++ lib.optional icedtea icedtea_web
-          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
-          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
-          ++ lib.optional (cfg.enableBluejeans or false) bluejeans
-          ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
-          ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
-          ++ extraPlugins
-        );
-      nativeMessagingHosts =
-        ([ ]
-          ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
-          ++ lib.optional (cfg.enableBukubrow or false) bukubrow
-          ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
-          ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
-          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
-          ++ extraNativeMessagingHosts
-        );
-      libs =   lib.optional stdenv.isLinux udev
-            ++ lib.optional ffmpegSupport ffmpeg
-            ++ lib.optional gssSupport kerberos
-            ++ lib.optionals (cfg.enableQuakeLive or false)
-            (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
-            ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
-            ++ lib.optional (config.pulseaudio or true) libpulseaudio;
-      gtk_modules = [ libcanberra-gtk2 ];
-
-      enterprisePolicies =
-      {
-        policies = {
-          DisableAppUpdate = true;
-        } // lib.optionalAttrs disableManualExtensions (
-        {
-          ExtensionSettings = {
-            "*" = {
-                blocked_install_message = "You can't have manual extension mixed with nix extensions";
-                installation_mode = "blocked";
-              };
-
-          } // lib.foldr (e: ret:
-              ret // {
-                "${e.extid}" = {
-                  installation_mode = "allowed";
-                };
-              }
-            ) {} extraExtensions;
-          }
-      ) // lib.optionalAttrs disablePocket (
-        {
-          DisablePocket = true;
-        }
-      ) // lib.optionalAttrs disableTelemetry (
-        {
-          DisableTelemetry = true;
-        }
-      ) // lib.optionalAttrs disableFirefoxStudies (
-        {
-          DisableFirefoxStudies = true;
-        }
-      ) // lib.optionalAttrs disableFirefoxSync (
-        {
-          DisableFirefoxAccounts = true;
-        }
-      ) // lib.optionalAttrs useSystemCertificates (
-        {
-          # Disable useless firefox certificate store
-          Certificates = {
-            ImportEnterpriseRoots = true;
-          };
-        }
-      ) // lib.optionalAttrs (
-        if lib.count (x: true) extraExtensions > 0 then true else false) (
-        {
-          # Don't try to update nix installed addons
-          DisableSystemAddonUpdate = true;
-
-          # But update manually installed addons
-          ExtensionUpdate = false;
-        }
-      ) // lib.optionalAttrs dontCheckDefaultBrowser (
-        {
-          DontCheckDefaultBrowser = true;
-        }
-      )// lib.optionalAttrs disableDNSOverHTTPS (
-        {
-          DNSOverHTTPS = {
-            Enabled = false;
-          };
-        }
-      ) // lib.optionalAttrs clearDataOnShutdown (
-        {
-          SanitizeOnShutdown = true;
-        }
-      ) // lib.optionalAttrs disableFeedbackCommands (
-        {
-          DisableFeedbackCommands = true;
-        }
-      ) // lib.optionalAttrs ( if homepage == "" then false else true) (
-        {
-          Homepage = {
-            URL = homepage;
-            Locked = true;
-          };
-        }
-      ) // extraPolicies ;} ;
-
-
-      extensions = builtins.map (a:
-        if ! (builtins.hasAttr "signed" a) || ! (builtins.isBool a.signed) then
-          throw "Addon ${a.pname} needs boolean attribute 'signed' "
-        else if ! (builtins.hasAttr "extid" a) || ! (builtins.isString a.extid) then
-          throw "Addon ${a.pname} needs a string attribute 'extid'"
-        else if a.signed == false && !allowNonSigned then
-          throw "Disable signature checking in firefox if you want ${a.pname} addon"
-        else  a
-      ) extraExtensions;
-
-      policiesJson = builtins.toFile "policies.json"
-        (builtins.toJSON enterprisePolicies);
-
-      mozillaCfg = builtins.toFile "mozilla.cfg" ''
-        // First line must be a comment
-
-        // Remove default top sites
-        lockPref("browser.newtabpage.pinned", "");
-        lockPref("browser.newtabpage.activity-stream.default.sites", "");
-
-        // Deactivate first run homepage
-        lockPref("browser.startup.firstrunSkipsHomepage", false);
-
-        // If true, don't show the privacy policy tab on first run
-        lockPref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
-
-        ${
-          if allowNonSigned == true then
-            ''lockPref("xpinstall.signatures.required", false)''
-          else
-            ""
-        }
-
-       ${
-        if showPunycodeUrls == true then
-          ''
-            lockPref("network.IDN_show_punycode", true);
-          ''
-          else
-            ""
-        }
-
-        ${
-          if disableManualExtensions == true then
-          ''
-            lockPref("extensions.getAddons.showPane", false);
-            lockPref("extensions.htmlaboutaddons.recommendations.enabled", false);
-            lockPref("app.update.auto", false);
-            ''
-          else
-            ""
-        }
-
-        ${
-          if disableDrmPlugin == true then
-          ''
-            lockPref("media.gmp-gmpopenh264.enabled", false);
-            lockPref("media.gmp-widevinecdm.enabled", false);
-            ''
-          else
-            ""
-        }
-
-        ${
-          if activateAntiTracking == true then
-            ''
-              // Tracking
-              lockPref("browser.send_pings", false);
-              lockPref("browser.send_pings.require_same_host", true);
-              lockPref("network.dns.disablePrefetch", true);
-              lockPref("browser.contentblocking.trackingprotection.control-center.ui.enabled", false);
-              lockPref("browser.search.geoip.url", "");
-              lockPref("privacy.firstparty.isolate",  true);
-              lockPref("privacy.userContext.enabled", true);
-              lockPref("privacy.userContext.ui.enabled", true);
-              lockPref("privacy.firstparty.isolate.restrict_opener_access", false);
-              lockPref("network.http.referer.XOriginPolicy", 1);
-              lockPref("network.http.referer.hideOnionSource", true);
-              lockPref(" privacy.spoof_english", true);
-
-             // This option is currently not usable because of bug:
-             // https://bugzilla.mozilla.org/show_bug.cgi?id=1557620
-              // lockPref("privacy.resistFingerprinting", true);
-            ''
-            else ""
-        }
-        ${
-          if disableTelemetry == true then
-            ''
-              // Telemetry
-              lockPref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-              lockPref("browser.ping-centre.telemetry", false);
-              lockPref("devtools.onboarding.telemetry.logged", false);
-              lockPref("toolkit.telemetry.archive.enabled", false);
-              lockPref("toolkit.telemetry.bhrPing.enabled", false);
-              lockPref("toolkit.telemetry.enabled", false);
-              lockPref("toolkit.telemetry.firstShutdownPing.enabled", false);
-              lockPref("toolkit.telemetry.hybridContent.enabled", false);
-              lockPref("toolkit.telemetry.newProfilePing.enabled", false);
-              lockPref("toolkit.telemetry.shutdownPingSender.enabled", false);
-              lockPref("toolkit.telemetry.reportingpolicy.firstRun", false);
-              lockPref("dom.push.enabled", false);
-              lockPref("browser.newtabpage.activity-stream.feeds.snippets", false);
-              lockPref("security.ssl.errorReporting.enabled", false);
-            ''
-          else ""
-        }
-
-       ${
-          if disableGoogleSafebrowsing == true then
-          ''
-            // Google data sharing
-            lockPref("browser.safebrowsing.blockedURIs.enabled", false);
-            lockPref("browser.safebrowsing.downloads.enabled", false);
-            lockPref("browser.safebrowsing.malware.enabled", false);
-            lockPref("browser.safebrowsing.passwords.enabled", false);
-            lockPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-            lockPref("browser.safebrowsing.malware.enabled", false);
-            lockPref("browser.safebrowsing.phishing.enabled", false);
-            lockPref("browser.safebrowsing.provider.mozilla.gethashURL", "");
-            lockPref("browser.safebrowsing.provider.mozilla.updateURL", "");
-          ''
-          else ""
-       }
-
-        // User customization
-        ${extraPrefs}
-      '';
-    in stdenv.mkDerivation {
-      inherit name;
-
-      desktopItem = makeDesktopItem {
-        name = browserName;
-        exec = "${browserName}${nameSuffix} %U";
-        inherit icon;
-        comment = "";
-        desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}";
-        genericName = "Web Browser";
-        categories = "Application;Network;WebBrowser;";
-        mimeType = stdenv.lib.concatStringsSep ";" [
-          "text/html"
-          "text/xml"
-          "application/xhtml+xml"
-          "application/vnd.mozilla.xul+xml"
-          "x-scheme-handler/http"
-          "x-scheme-handler/https"
-          "x-scheme-handler/ftp"
-        ];
-      };
-
-      nativeBuildInputs = [ makeWrapper lndir ];
-      buildInputs = lib.optional (browser ? gtk3) browser.gtk3;
-
-      buildCommand = lib.optionalString stdenv.isDarwin ''
-        mkdir -p $out/Applications
-        cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications
-        rm -f $out${browser.execdir or "/bin"}/${browserName}
-      '' + ''
-
-        # Link the runtime. The executable itself has to be copied,
-        # because it will resolve paths relative to its true location.
-        # Any symbolic links have to be replicated as well.
-        cd "${browser}"
-        find . -type d -exec mkdir -p "$out"/{} \;
-
-        find . -type f \( -not -name "${browserName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \;
-
-        find . -type f -name "${browserName}" -print0 | while read -d $'\0' f; do
-          cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f"
-          chmod a+rwx "$out/$f"
-        done
-
-        # fix links and absolute references
-        cd "${browser}"
-
-        find . -type l -print0 | while read -d $'\0' l; do
-          target="$(readlink "$l" | ${replace}/bin/replace-literal -es -- "${browser}" "$out")"
-          ln -sfT "$target" "$out/$l"
-        done
-
-        # This will not patch binaries, only "text" files.
-        # Its there for the wrapper mostly.
-        cd "$out"
-        ${replace}/bin/replace-literal -esfR -- "${browser}" "$out"
-
-        # create the wrapper
-
-        executablePrefix="$out${browser.execdir or "/bin"}"
-        executablePath="$executablePrefix/${browserName}"
-
-        if [ ! -x "$executablePath" ]
-        then
-            echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'"
-            exit 1
-        fi
-
-        if [ ! -L "$executablePath" ]
-        then
-          # Careful here, the file at executablePath may already be
-          # a wrapper. That is why we postfix it with -old instead
-          # of -wrapped.
-          oldExe="$executablePrefix"/".${browserName}"-old
-          mv "$executablePath" "$oldExe"
-        else
-          oldExe="$(readlink -v --canonicalize-existing "$executablePath")"
-        fi
-
-
-        makeWrapper "$oldExe" "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
-            --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-            --suffix LD_LIBRARY_PATH ':' "$libs" \
-            --suffix-each GTK_PATH ':' "$gtk_modules" \
-            --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-            --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
-            --suffix PATH ':' "$out${browser.execdir or "/bin"}" \
-            --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
-            --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
-            ${lib.optionalString gdkWayland ''
-              --set GDK_BACKEND "wayland" \
-            ''}${lib.optionalString (browser ? gtk3)
-                ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-                  --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
-                ''
-            }
-
-        if [ -e "${browser}/share/icons" ]; then
-            mkdir -p "$out/share"
-            ln -s "${browser}/share/icons" "$out/share/icons"
-        else
-            for res in 16 32 48 64 128; do
-            mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
-            icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" )
-              if [ -e "$icon" ]; then ln -s "$icon" \
-                "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
-              fi
-            done
-        fi
-
-        install -D -t $out/share/applications $desktopItem/share/applications/*
-
-        mkdir -p $out/lib/mozilla
-        for ext in ${toString nativeMessagingHosts}; do
-            lndir -silent $ext/lib/mozilla $out/lib/mozilla
-        done
-
-        # For manpages, in case the program supplies them
-        mkdir -p $out/nix-support
-        echo ${browser} > $out/nix-support/propagated-user-env-packages
-
-        # user customization
-        mkdir -p $out/lib/firefox
-
-        # creating policies.json
-        mkdir -p "$out/lib/firefox/distribution"
-
-        cat > "$out/lib/firefox/distribution/policies.json" < ${policiesJson}
-
-        # preparing for autoconfig
-        mkdir -p "$out/lib/firefox/defaults/pref"
-
-        cat > "$out/lib/firefox/defaults/pref/autoconfig.js" <<EOF
-          pref("general.config.filename", "mozilla.cfg");
-          pref("general.config.obscure_value", 0);
-        EOF
-
-        cat > "$out/lib/firefox/mozilla.cfg" < ${mozillaCfg}
-
-        mkdir -p $out/lib/firefox/distribution/extensions
-
-        for i in ${toString extensions}; do
-          ln -s -t $out/lib/firefox/distribution/extensions $i/*
-        done
-      '';
-
-      preferLocalBuild = true;
-
-      # Let each plugin tell us (through its `mozillaPlugin') attribute
-      # where to find the plugin in its tree.
-      plugins = map (x: x + x.mozillaPlugin) plugins;
-      libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs;
-      gtk_modules = map (x: x + x.gtkModule) gtk_modules;
-
-      passthru = { unwrapped = browser; };
-
-      disallowedRequisites = [ stdenv.cc ];
-
-      meta = browser.meta // {
-        description =
-          browser.meta.description
-          + " (with plugins: "
-          + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
-          + ")";
-        hydraPlatforms = [];
-        priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
-      };
-    };
-in
-  lib.makeOverridable wrapper
diff --git a/jeschli/5pkgs/firefox/font-fingerprint-defender/default.nix b/jeschli/5pkgs/firefox/font-fingerprint-defender/default.nix
deleted file mode 100644
index 26751be..0000000
--- a/jeschli/5pkgs/firefox/font-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "font-fingerprint-defender-${version}";
-    version = "0.1.0";
-
-    extid = "@font-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3387637/font_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "1aidkvisnx6qd7hn2x756rvzmbnaz6laqbwq0j5yd86g1kc56dr0";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Font fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/font-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/hopper/default.nix b/jeschli/5pkgs/firefox/hopper/default.nix
deleted file mode 100644
index 569fc6a..0000000
--- a/jeschli/5pkgs/firefox/hopper/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, pkgs, makeWrapper, lib }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname    = "hopper";
-  version = "4.5.16";
-  rev = "v${lib.versions.major version}";
-
-  src = fetchurl {
-    url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
-    sha256 = "0gjnn7f6ibfx46k4bbj8ra7k04s0mrpq7316brgzks6x5yd1m584";
-  };
-
-  sourceRoot = ".";
-
-  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
-libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2.out qt5.qtbase zlib  xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-     mkdir -p $out/bin
-     mkdir -p $out/lib
-     mkdir -p $out/share
-     cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
-     cp -r $sourceRoot/opt/hopper-${rev}/lib $out
-     cp -r $sourceRoot/usr/share $out/share
-    patchelf \
-    --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
-    $out/bin/hopper
-    # Details: https://nixos.wiki/wiki/Qt
-     wrapProgram $out/bin/hopper \
-    --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
-    --suffix QT_PLUGIN_PATH : ${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins
-  '';
-
-  meta = {
-    homepage = "https://www.hopperapp.com/index.html";
-    description = "A macOS and Linux Disassembler";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.luis ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/https-everywhere/default.nix b/jeschli/5pkgs/firefox/https-everywhere/default.nix
deleted file mode 100644
index 66fede4..0000000
--- a/jeschli/5pkgs/firefox/https-everywhere/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "https-everywhere-${version}";
-    version = "2019.6.27";
-
-    extid = "https-everywhere@eff.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3060290/https_everywhere-${version}-an+fx.xpi";
-      sha256 = "0743lhn9phn7n6c0886h9ddn1n8vhzbl0vrw177zs43995aj3frp";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-
-      '';
-
-  meta = {
-    description = "Https everywhere browser addon";
-    homepage = https://www.eff.org/https-everywhere;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/pyocclient/default.nix b/jeschli/5pkgs/firefox/pyocclient/default.nix
deleted file mode 100644
index cd91f61..0000000
--- a/jeschli/5pkgs/firefox/pyocclient/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, python37Packages  }:
-
-python37Packages.buildPythonPackage rec {
-  pname = "pyocclient";
-  version = "0.4";
-
-  src = python37Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "19k3slrk2idixsdw61in9a3jxglvkigkn5kvwl37lj8hrwr4yq6q";
-  };
-
-  doCheck = false;
-
-  propagatedBuildInputs = with python37Packages; [
-    requests
-    six
-    ];
-
-  meta = with lib; {
-    homepage = https://github.com/owncloud/pyocclient/;
-    description = "Nextcloud / Owncloud library for python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-  };
-
-}
diff --git a/jeschli/5pkgs/firefox/rmount/default.nix b/jeschli/5pkgs/firefox/rmount/default.nix
deleted file mode 100644
index 22631f4..0000000
--- a/jeschli/5pkgs/firefox/rmount/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, makeWrapper, lib, pkgs ? import <nixpkgs> {} }:
-with pkgs;
-
-stdenv.mkDerivation rec {
-  name    = "rmount-${version}";
-  version = "1.0.1";
-  rev = "v${version}";
-
-  src = fetchgit {
-    rev = "9df124780d2e66f01c70afaecf92090669c5ffb6";
-    url    = "https://github.com/Luis-Hebendanz/rmount";
-    sha256 = "0ydb6sspfnfa3y6gg1r8sk4r58il6636lpqwb2rw7dzmb4b8hpd2";
-  };
-
-  buildInputs = [ stdenv makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-    cp ${src}/rmount.man $out/share/man/man1/rmount.1
-    cp ${src}/rmount.bash $out/bin/rmount-noenv
-    cp ${src}/config.json $out/share/config.json
-    chmod +x $out/bin/rmount-noenv
-
-    makeWrapper $out/bin/rmount-noenv $out/bin/rmount \
-    --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]}
-  '';
-
-  meta = {
-      homepage = "https://github.com/Luis-Hebendanz/rmount";
-      description = "Remote mount utility which parses a json file";
-      license = stdenv.lib.licenses.mit;
-    };
-}
diff --git a/jeschli/5pkgs/firefox/ublock-origin/default.nix b/jeschli/5pkgs/firefox/ublock-origin/default.nix
deleted file mode 100644
index 002fa3e..0000000
--- a/jeschli/5pkgs/firefox/ublock-origin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "ublock-origin-${version}";
-    version = "1.21.2";
-
-    extid = "uBlock0@raymondhill.net";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3361355/ublock_origin-${version}-an+fx.xpi";
-      sha256 = "0ypdq3z61mrymknl37qlq6379bx9f2fsgbgr0czbhqs9f2vwszkc";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "ublock origin firefox browser addon";
-    homepage = https://github.com/gorhill/uBlock;
-    license = licenses.gpl3;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/user-agent-switcher/default.nix b/jeschli/5pkgs/firefox/user-agent-switcher/default.nix
deleted file mode 100644
index c96f111..0000000
--- a/jeschli/5pkgs/firefox/user-agent-switcher/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "user-agent-switcher-${version}";
-    version = "0.3.2";
-
-    extid = "@user-agent-switcher";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3370255/user_agent_switcher_and_manager-${version}-an+fx.xpi";
-      sha256 = "0lrw1xf6fsxr47bifkayfxpysv8s2p9ghmbmw2s7ymhrgy42i6v5";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "User agent switcher";
-    homepage = https://add0n.com/useragent-switcher.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/webgl-fingerprint-defender/default.nix b/jeschli/5pkgs/firefox/webgl-fingerprint-defender/default.nix
deleted file mode 100644
index 4e608d1..0000000
--- a/jeschli/5pkgs/firefox/webgl-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "webgl-fingerprint-defender-${version}";
-    version = "0.1.2";
-
-    extid = "@webgl-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362869/webgl_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "06hfr5hxr4qw0jx6i9fi9gdk5211z08brnvqj2jlmpyc3dwl4pif";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Canvas defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/webgl-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/5pkgs/firefox/wl-clipboard/default.nix b/jeschli/5pkgs/firefox/wl-clipboard/default.nix
deleted file mode 100644
index 349d910..0000000
--- a/jeschli/5pkgs/firefox/wl-clipboard/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, wayland, wayland-protocols }:
-
-stdenv.mkDerivation rec {
-  pname = "wl-clipboard";
-  version = "2.0.0";
-
-  src = fetchFromGitHub {
-    owner = "bugaevc";
-    repo = "wl-clipboard";
-    rev = "v${version}";
-    sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
-  };
-
-  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
-  buildInputs = [ wayland ];
-
-  meta = with stdenv.lib; {
-    description = "Command-line copy/paste utilities for Wayland";
-    homepage = https://github.com/bugaevc/wl-clipboard;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/jeschli/5pkgs/simple/default.nix b/jeschli/5pkgs/simple/default.nix
deleted file mode 100644
index 6ba4fec..0000000
--- a/jeschli/5pkgs/simple/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-with import <stockholm/lib>;
-
-self: super:
-
-let
-  # This callPackage will try to detect obsolete overrides.
-  callPackage = path: args: let
-    override = self.callPackage path args;
-    upstream = optionalAttrs (override ? "name")
-      (super.${(parseDrvName override.name).name} or {});
-  in if upstream ? "name" &&
-        override ? "name" &&
-        compareVersions upstream.name override.name != -1
-    then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
-    else override;
-in
-
-  mapNixDir (path: callPackage path {}) ./.
diff --git a/jeschli/default.nix b/jeschli/default.nix
deleted file mode 100644
index b579327..0000000
--- a/jeschli/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ../krebs
-    ./2configs
-  ];
-
-  nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
-}
diff --git a/jeschli/krops.nix b/jeschli/krops.nix
deleted file mode 100644
index 242f1f7..0000000
--- a/jeschli/krops.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ name }: let
-  inherit (import ../krebs/krops.nix { inherit name; })
-    krebs-source
-    lib
-    pkgs
-  ;
-
-  source = { test }: lib.evalSource [
-    (krebs-source { test = test; })
-    {
-      nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
-      nixpkgs-unstable.git = {
-        url = "https://github.com/nixos/nixpkgs";
-        ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
-      };
-      secrets = if test then {
-        file = toString ./2configs/tests/dummy-secrets;
-      } else {
-        file = "${lib.getEnv "HOME"}/secrets/${name}";
-      };
-    }
-    {
-       home-manager.git = {
-         url = https://github.com/rycee/home-manager;
-         ref = "2ccbf43";
-       };
-    }
-  ];
-
-in {
-  # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
-  deploy = { target ? "root@${name}/var/src" }: pkgs.krops.writeDeploy "${name}-deploy" {
-    source = source { test = false; };
-    inherit target;
-  };
-
-  # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
-  test = { target }: pkgs.krops.writeTest "${name}-test" {
-    force = true;
-    inherit target;
-    source = source { test = true; };
-  };
-}
diff --git a/lib/default.nix b/lib/default.nix
index 7c3b037..149b97a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -95,9 +95,12 @@ let
             path = dirPath + "/${relPath}";
           in
             nameValuePair (toPackageName name) (f path))
-          (filter
-            (name: name != "default.nix" && !hasPrefix "." name)
-            (attrNames (readDir dirPath))));
+          (attrNames
+            (filterAttrs isNixDirEntry (readDir dirPath))));
+
+    isNixDirEntry = name: type:
+      (type == "regular" && hasSuffix ".nix" name && name != "default.nix") ||
+      (type == "directory" && !hasPrefix "." name);
 
     # https://tools.ietf.org/html/rfc5952
     normalize-ip6-addr =
@@ -191,3 +194,4 @@ let
 in
 
 lib
+// { inherit lib; }
diff --git a/lib/types.nix b/lib/types.nix
index f312b73..67a0c6f 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -58,6 +58,14 @@ rec {
         default = false;
       };
 
+      consul = mkOption {
+        description = ''
+          Whether the host is a member of the global consul network
+        '';
+        type = bool;
+        default = false;
+      };
+
       owner = mkOption {
         type = user;
       };
@@ -128,7 +136,7 @@ rec {
         default = null;
       };
       ip4 = mkOption {
-        type = nullOr (submodule {
+        type = nullOr (submodule (ip4: {
           options = {
             addr = mkOption {
               type = addr4;
@@ -138,13 +146,15 @@ rec {
             } // {
               retiolum.default = "10.243.0.0/16";
               wiregrill.default = "10.244.0.0/16";
-            }.${config._module.args.name} or {});
+            }.${config._module.args.name} or {
+              default = "${ip4.config.addr}/32";
+            });
           };
-        });
+        }));
         default = null;
       };
       ip6 = mkOption {
-        type = nullOr (submodule {
+        type = nullOr (submodule (ip6: {
           options = {
             addr = mkOption {
               type = addr6;
@@ -155,9 +165,11 @@ rec {
             } // {
               retiolum.default = "42:0::/32";
               wiregrill.default = "42:1::/32";
-            }.${config._module.args.name} or {});
+            }.${config._module.args.name} or {
+              default = "${ip6.config.addr}/128";
+            });
           };
-        });
+        }));
         default = null;
       };
       ssh = mkOption {
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index c36fbc4..90501d5 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/hw/x220.nix>
diff --git a/tv/1systems/alnus/lib b/tv/1systems/alnus/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/alnus/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/au/lib b/tv/1systems/au/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/au/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/bu/config.nix b/tv/1systems/bu/config.nix
index 11cdac3..22e5f14 100644
--- a/tv/1systems/bu/config.nix
+++ b/tv/1systems/bu/config.nix
@@ -1,7 +1,5 @@
-{ config, pkgs, ... }: let
-  lib = import ../../../lib;
-in {
-
+with import ./lib;
+{ config, pkgs, ... }: {
   imports = [
     ./disks.nix
     <stockholm/tv>
diff --git a/tv/1systems/bu/lib b/tv/1systems/bu/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/bu/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/lib b/tv/1systems/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 00bd5da..00cdf84 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/br.nix>
diff --git a/tv/1systems/mu/lib b/tv/1systems/mu/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/mu/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index 4dc0b4e..fb67814 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.nomic;
 
   imports = [
diff --git a/tv/1systems/nomic/lib b/tv/1systems/nomic/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/nomic/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 44c7685..8df29f7 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/retiolum.nix>
diff --git a/tv/1systems/querel/lib b/tv/1systems/querel/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/querel/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index bf250ce..4d45f6d 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ../lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.wu;
 
   imports = [
diff --git a/tv/1systems/wu/lib b/tv/1systems/wu/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/wu/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 8a86e20..6ca62ac 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.xu;
 
   imports = [
@@ -11,7 +10,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/gitrepos.nix>
     <stockholm/tv/2configs/mail-client.nix>
     <stockholm/tv/2configs/man.nix>
-    <stockholm/tv/2configs/nginx/krebs-pages.nix>
     <stockholm/tv/2configs/nginx/public_html.nix>
     <stockholm/tv/2configs/ppp.nix>
     <stockholm/tv/2configs/pulse.nix>
diff --git a/tv/1systems/xu/lib b/tv/1systems/xu/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/1systems/xu/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 8a3040a..169fa6b 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   krebs.build.host = config.krebs.hosts.zu;
 
   imports = [
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index a5e0cf4..c8ab73b 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-with import <stockholm/lib>;
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   krebs.backup.plans = {
   } // mapAttrs (_: recursiveUpdate {
     snapshots = {
diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 92e2499..e38566b 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   programs.bash = {
     interactiveShellInit = /* sh */ ''
       HISTCONTROL='erasedups:ignorespace'
@@ -17,8 +14,20 @@ with import <stockholm/lib>;
 
       case $UID in
         ${shell.escape (toString config.krebs.users.tv.uid)})
-          if test ''${SHLVL-1} = 1; then
-            case ''${XMONAD_SPAWN_WORKSPACE-} in
+          if test ''${SHLVL-1} = 1 && test -n "''${DISPLAY-}"; then
+            _CURRENT_DESKTOP_NAME=''${_CURRENT_DESKTOP_NAME-$(
+              ${pkgs.xorg.xprop}/bin/xprop -notype -root \
+                  32i _NET_CURRENT_DESKTOP \
+                  8s _NET_DESKTOP_NAMES \
+                |
+              ${pkgs.gnused}/bin/sed -r 's/.* = //;s/"//g;s/, /\a/g' |
+              {
+                read -r _NET_CURRENT_DESKTOP
+                IFS=$'\a' read -ra _NET_DESKTOP_NAMES
+                echo "''${_NET_DESKTOP_NAMES[$_NET_CURRENT_DESKTOP]}"
+              }
+            )}
+            case $_CURRENT_DESKTOP_NAME in
               stockholm)
                 cd ~/stockholm
               ;;
diff --git a/tv/2configs/bash/lib b/tv/2configs/bash/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/bash/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 58791f4..66d7407 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with import <stockholm/lib>;
+{ config, lib, pkgs, ... }: with import ./lib;
 {
   environment.etc."binary-cache.pubkey".text =
     config.krebs.build.host.binary-cache.pubkey;
diff --git a/tv/2configs/binary-cache/lib b/tv/2configs/binary-cache/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/binary-cache/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix
index e6a46e9..4a8db2e 100644
--- a/tv/2configs/br.nix
+++ b/tv/2configs/br.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
 
   imports = [
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index f3ce2da..9babb92 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   boot.tmpOnTmpfs = true;
 
   krebs.enable = true;
@@ -38,7 +37,7 @@ with import <stockholm/lib>;
     {
       i18n.defaultLocale = mkDefault "C.UTF-8";
       security.sudo.extraConfig = ''
-        Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
+        Defaults env_keep+="SSH_CLIENT _CURRENT_DESKTOP_NAME"
         Defaults mailto="${config.krebs.users.tv.mail}"
         Defaults !lecture
       '';
@@ -46,14 +45,15 @@ with import <stockholm/lib>;
     }
 
     {
-      # TODO check if both are required:
-      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ];
-
-      nix.requireSignedBinaryCaches = true;
-
-      nix.binaryCaches = ["https://cache.nixos.org"];
+      nix.extraOptions = ''
+        auto-optimise-store = true
+      '';
 
-      nix.useSandbox = true;
+      # TODO check if both are required:
+      nix.settings.extra-sandbox-paths = [
+        "/etc/protocols"
+        pkgs.iana-etc.outPath
+      ];
     }
     {
       nixpkgs.config.allowUnfree = false;
diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
index 3d4ada4..fefc6dd 100644
--- a/tv/2configs/exim-retiolum.nix
+++ b/tv/2configs/exim-retiolum.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   environment.systemPackages = [
     pkgs.eximlog
   ];
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 4a0dcf6..e905536 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   environment.systemPackages = [
     pkgs.eximlog
   ];
diff --git a/tv/2configs/gitconfig.nix b/tv/2configs/gitconfig.nix
index 771a4b2..fb9b78e 100644
--- a/tv/2configs/gitconfig.nix
+++ b/tv/2configs/gitconfig.nix
@@ -1,8 +1,5 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   environment.etc.gitconfig.text = ''
     [alias]
       patch = !${pkgs.git}/bin/git --no-pager diff --no-color
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 50444c1..d8e7755 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let {
+with import ./lib;
+{ config, pkgs, ... }: let {
 
   body = {
 
@@ -134,7 +131,6 @@ let {
     web-routes-wai-custom = {};
     xintmap = {};
     xmonad-aeson = {};
-    xmonad-stockholm = {};
     xmonad-web = {};
   } // mapAttrs (_: recursiveUpdate { cgit.section = "4. museum"; }) {
     cac-api = {
@@ -165,6 +161,7 @@ let {
     soundcloud = {
       cgit.desc = "SoundCloud command line interface";
     };
+    xmonad-stockholm = {};
   });
 
   restricted-repos = mapAttrs make-restricted-repo (
diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix
index e78caeb..0937298 100644
--- a/tv/2configs/htop.nix
+++ b/tv/2configs/htop.nix
@@ -1,8 +1,5 @@
-{ pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ pkgs, ... }: {
   nixpkgs.config.packageOverrides = super: {
     htop = pkgs.symlinkJoin {
       name = "htop";
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index dd6fcfe..b998fcf 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   imports = [
     ../smartd.nix
 
diff --git a/tv/2configs/hw/lib b/tv/2configs/hw/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/hw/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index 09dd9a4..bf749a9 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }: let
-  lib = import <stockholm/lib>;
-in {
+with import ./lib;
+{ pkgs, ... }: {
   imports = [
     ../smartd.nix
     {
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 8c68cde..ee3c7dc 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -1,7 +1,5 @@
-{ config, pkgs, ... }: let
-  lib = import <stockholm/lib>;
-in
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   imports = [
     ../smartd.nix
     {
@@ -28,8 +26,8 @@ in
     }
 
     {
-      nix.buildCores = 2;
-      nix.maxJobs = 2;
+      nix.settings.cores = 2;
+      nix.settings.max-jobs = 2;
     }
     (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then {
       nix.daemonCPUSchedPolicy = "batch";
@@ -61,6 +59,9 @@ in
     emulateWheel = true;
   };
 
+  # Conflicts with TLP, but gets enabled by DEs.
+  services.power-profiles-daemon.enable = false;
+
   services.tlp.enable = true;
   services.tlp.settings = {
     START_CHARGE_THRESH_BAT0 = 80;
diff --git a/tv/2configs/imgur.nix b/tv/2configs/imgur.nix
index ba84fd2..e221227 100644
--- a/tv/2configs/imgur.nix
+++ b/tv/2configs/imgur.nix
@@ -1,6 +1,5 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
-
   services.nginx.virtualHosts."ni.r" = {
     locations."/image" = {
       extraConfig = /* nginx */ ''
@@ -18,8 +17,6 @@ with import <stockholm/lib>;
 
   krebs.htgen.imgur = {
     port = 7771;
-    script = /* sh */ ''
-      (. ${pkgs.htgen-imgur}/bin/htgen-imgur)
-    '';
+    scriptFile = "${pkgs.htgen-imgur}/bin/htgen-imgur";
   };
 }
diff --git a/tv/2configs/lib b/tv/2configs/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix
index efea3a8..6844df9 100644
--- a/tv/2configs/nginx/default.nix
+++ b/tv/2configs/nginx/default.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, ... }: {
   services.nginx = {
     enableReload = true;
 
diff --git a/tv/2configs/nginx/krebs-pages.nix b/tv/2configs/nginx/krebs-pages.nix
deleted file mode 100644
index 4dd643d..0000000
--- a/tv/2configs/nginx/krebs-pages.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.nginx = {
-    virtualHosts.krebs-pages = {
-      serverAliases = [
-        "krebs.${config.krebs.build.host.name}.r"
-      ];
-      extraConfig = ''
-        root ${pkgs.krebs-pages};
-      '';
-    };
-  };
-}
diff --git a/tv/2configs/nginx/lib b/tv/2configs/nginx/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/nginx/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index 43d7189..c2403cd 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, ... }: {
   services.nginx = {
     enable = true;
     virtualHosts.default = {
diff --git a/tv/2configs/pki/default.nix b/tv/2configs/pki/default.nix
index 51a5c71..415755b 100644
--- a/tv/2configs/pki/default.nix
+++ b/tv/2configs/pki/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
 
   certFile = config.environment.etc."ssl/certs/ca-certificates.crt".source;
diff --git a/tv/2configs/pki/lib b/tv/2configs/pki/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/pki/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix
index c801401..24d2831 100644
--- a/tv/2configs/ppp.nix
+++ b/tv/2configs/ppp.nix
@@ -1,5 +1,5 @@
+with import ./lib;
 { config, pkgs, ... }: let
-  lib = import <stockholm/lib>;
   cfg = {
     pin = "@${toString <secrets/o2.pin>}";
     ttys.ppp = "/dev/ttyACM0";
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 513a0eb..7a07e81 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-let
+with import ./lib;
+{ config, pkgs, ... }: let
   pkg = pkgs.pulseaudio;
   runDir = "/run/pulse";
 
diff --git a/tv/2configs/repo-sync/lib b/tv/2configs/repo-sync/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/repo-sync/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/repo-sync/wiki.nix b/tv/2configs/repo-sync/wiki.nix
index 9134399..515e731 100644
--- a/tv/2configs/repo-sync/wiki.nix
+++ b/tv/2configs/repo-sync/wiki.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, ... }: let
-  lib = import <stockholm/lib>;
-in {
+with import ./lib;
+{ config, pkgs, ... }: {
   krebs.repo-sync.enable = true;
   krebs.repo-sync.repos.wiki.branches.hotdog = {
     origin.url = "http://cgit.hotdog.r/wiki";
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index 3c3b2ad..de77de3 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   krebs.tinc.retiolum = {
     enable = true;
     connectTo = filter (ne config.krebs.build.host.name) [
diff --git a/tv/2configs/ssh.nix b/tv/2configs/ssh.nix
index 84d2473..ad82881 100644
--- a/tv/2configs/ssh.nix
+++ b/tv/2configs/ssh.nix
@@ -1,8 +1,5 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   # Override NixOS's "Allow DSA keys for now."
   environment.etc."ssh/ssh_config".text = mkForce ''
     AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
diff --git a/tv/2configs/sshd.nix b/tv/2configs/sshd.nix
index 79af5b0..4da8c82 100644
--- a/tv/2configs/sshd.nix
+++ b/tv/2configs/sshd.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, ... }: let
   cfg.host = config.krebs.build.host;
 in {
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 619b044..7ba364f 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   exec = filename: args: url: {
     inherit url;
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index fed74c9..b8819ee 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-let {
+with import ./lib;
+{ config, pkgs, ... }: let {
   body = {
     environment.systemPackages = [
       vim-wrapper
@@ -13,7 +11,7 @@ let {
     environment.variables.VIMINIT = ":so /etc/vimrc";
   };
 
-  extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+  extra-runtimepath = pkgs.tv.vim.makeRuntimePath [
     pkgs.tv.vimPlugins.elixir
     pkgs.tv.vimPlugins.file-line
     pkgs.tv.vimPlugins.fzf
@@ -79,6 +77,7 @@ let {
     set showmatch
     set timeoutlen=0
     set ttimeoutlen=0
+    set ttymouse=sgr
     set undodir=${dirs.undodir}
     set undofile
     set undolevels=1000000
diff --git a/tv/2configs/xdg.nix b/tv/2configs/xdg.nix
index 18bac9b..b7c14af 100644
--- a/tv/2configs/xdg.nix
+++ b/tv/2configs/xdg.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   environment.variables.XDG_RUNTIME_DIR = "/run/xdg/$LOGNAME";
 
   systemd.tmpfiles.rules = let
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
index a97fb36..51fd1ae 100644
--- a/tv/2configs/xp-332.nix
+++ b/tv/2configs/xp-332.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: {
 
   environment.etc."utsushi.conf".text = ''
diff --git a/tv/2configs/xserver/Xmodmap.nix b/tv/2configs/xserver/Xmodmap.nix
index 8e8e3df..8e555e9 100644
--- a/tv/2configs/xserver/Xmodmap.nix
+++ b/tv/2configs/xserver/Xmodmap.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ./lib;
 
 pkgs.writeText "Xmodmap" ''
   !keycode 66 = Caps_Lock
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 8bedb0e..f534b55 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, ... }@args:
-with import <stockholm/lib>;
-let
+with import ./lib;
+{ config, pkgs, ... }@args: let
   cfg = {
     cacheDir = cfg.dataDir;
     configDir = "/var/empty";
diff --git a/tv/2configs/xserver/lib b/tv/2configs/xserver/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/xserver/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/2configs/xserver/sxiv.nix b/tv/2configs/xserver/sxiv.nix
index 10e450d..eb862f8 100644
--- a/tv/2configs/xserver/sxiv.nix
+++ b/tv/2configs/xserver/sxiv.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg.user = config.krebs.build.user;
 in {
diff --git a/tv/2configs/xserver/urxvt.nix b/tv/2configs/xserver/urxvt.nix
index 2d504e1..3502c63 100644
--- a/tv/2configs/xserver/urxvt.nix
+++ b/tv/2configs/xserver/urxvt.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg.user = config.krebs.build.user;
 in {
diff --git a/tv/2configs/xserver/xserver.conf.nix b/tv/2configs/xserver/xserver.conf.nix
index 99038e5..3fdfebf 100644
--- a/tv/2configs/xserver/xserver.conf.nix
+++ b/tv/2configs/xserver/xserver.conf.nix
@@ -1,6 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
+with import ./lib;
+{ config, pkgs, ... }:
 
 let
   cfg = config.services.xserver;
diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix
index ab233dd..266531d 100644
--- a/tv/3modules/Xresources.nix
+++ b/tv/3modules/Xresources.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg = {
     enable = config.services.xserver.enable && config.tv.Xresources != {};
diff --git a/tv/3modules/charybdis/config.nix b/tv/3modules/charybdis/config.nix
index dccbfde..4669345 100644
--- a/tv/3modules/charybdis/config.nix
+++ b/tv/3modules/charybdis/config.nix
@@ -1,4 +1,4 @@
-{ config, ... }: with import <stockholm/lib>; let
+{ config, ... }: with import ./lib; let
   cfg = config.tv.charybdis;
 in toFile "charybdis.conf" ''
   /* doc/example.conf - brief example configuration file
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 96aae70..4a0f995 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -1,4 +1,5 @@
-{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
+with import ./lib;
+{ config, pkgs, ... }@args: let
   cfg = config.tv.charybdis;
 in {
   options.tv.charybdis = {
diff --git a/tv/3modules/charybdis/lib b/tv/3modules/charybdis/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/3modules/charybdis/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/3modules/dnsmasq.nix b/tv/3modules/dnsmasq.nix
index ab24ac0..e1dfdea 100644
--- a/tv/3modules/dnsmasq.nix
+++ b/tv/3modules/dnsmasq.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, ... }: let
   cfg = config.tv.dnsmasq;
 in {
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index edc5296..e3a41a5 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -1,5 +1,5 @@
-{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
-
+with import ./lib;
+{ config, pkgs, ... }: let
   cfg = config.tv.ejabberd;
 
   gen-dhparam = pkgs.writeDash "gen-dhparam" ''
diff --git a/tv/3modules/ejabberd/lib b/tv/3modules/ejabberd/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/3modules/ejabberd/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/3modules/focus.nix b/tv/3modules/focus.nix
index b1a7b2e..c16d442 100644
--- a/tv/3modules/focus.nix
+++ b/tv/3modules/focus.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 {
   options.tv.focus.enable = mkEnableOption "tv.focus";
 }
diff --git a/tv/3modules/hosts.nix b/tv/3modules/hosts.nix
index 1187405..2d382e2 100644
--- a/tv/3modules/hosts.nix
+++ b/tv/3modules/hosts.nix
@@ -1,8 +1,5 @@
-{ config, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, ... }: {
   options.tv.hosts = mkOption {
     type = types.attrsOf types.host;
     default =
diff --git a/tv/3modules/hw.nix b/tv/3modules/hw.nix
index 6eb722d..db1a77c 100644
--- a/tv/3modules/hw.nix
+++ b/tv/3modules/hw.nix
@@ -1,5 +1,5 @@
+with import ./lib;
 let
-  lib = import <stockholm/lib>;
   local.types.screen = lib.types.submodule {
     options.width = lib.mkOption {
       type = lib.types.uint;
diff --git a/tv/3modules/im.nix b/tv/3modules/im.nix
index e98a573..76a61b1 100644
--- a/tv/3modules/im.nix
+++ b/tv/3modules/im.nix
@@ -1,6 +1,6 @@
+with import ./lib;
 { config, pkgs, ... }: let
   im = config.tv.im;
-  lib = import <stockholm/lib>;
 in {
   options = {
     tv.im.client.enable = lib.mkEnableOption "tv.im.client" // {
diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 9cf0bd5..c4bf464 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -1,7 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-let {
+with import ./lib;
+{ config, pkgs, ... }: let {
   cfg = config.tv.iptables;
 
   body = {
diff --git a/tv/3modules/lib b/tv/3modules/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/3modules/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/3modules/org.freedesktop.machine1.host-shell.nix b/tv/3modules/org.freedesktop.machine1.host-shell.nix
index e1a5323..7d31edf 100644
--- a/tv/3modules/org.freedesktop.machine1.host-shell.nix
+++ b/tv/3modules/org.freedesktop.machine1.host-shell.nix
@@ -1,4 +1,5 @@
-{ config, ... }: let lib = import ../../lib; in {
+with import ./lib;
+{ config, ... }: {
   options.org.freedesktop.machine1.host-shell.access = lib.mkOption {
     default = {};
     type =
diff --git a/tv/3modules/slock.nix b/tv/3modules/slock.nix
index 926adc8..a083032 100644
--- a/tv/3modules/slock.nix
+++ b/tv/3modules/slock.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
   cfg = config.tv.slock;
 in {
diff --git a/tv/3modules/x0vncserver.nix b/tv/3modules/x0vncserver.nix
index 4dbb34d..f19bfeb 100644
--- a/tv/3modules/x0vncserver.nix
+++ b/tv/3modules/x0vncserver.nix
@@ -1,8 +1,6 @@
-with import <stockholm/lib>;
+with import ./lib;
 { config, pkgs, ... }: let
-
   cfg = config.tv.x0vncserver;
-
 in {
   options.tv.x0vncserver = {
     display = mkOption {
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 5a018a1..245d054 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,4 +1,4 @@
-with import ../../lib;
+with import ./lib;
 let
   pushBack = x: xs:
     if elem x xs then
@@ -14,7 +14,6 @@ fix
   (foldl' (flip extends) (_: super)
     (map
       (name: import (./. + "/${name}"))
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (pushBack "override"
-          (attrNames (readDir ./.))))))
+      (pushBack "override"
+        (attrNames
+          (filterAttrs isNixDirEntry (readDir ./.))))))
diff --git a/tv/5pkgs/haskell/default.nix b/tv/5pkgs/haskell/default.nix
index 33fd250..f05223d 100644
--- a/tv/5pkgs/haskell/default.nix
+++ b/tv/5pkgs/haskell/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 let
   overrides = self: super:
     mapNixDir (path: self.callPackage path {}) [
diff --git a/tv/5pkgs/haskell/lib b/tv/5pkgs/haskell/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/haskell/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/haskell/xmonad-tv/default.nix b/tv/5pkgs/haskell/xmonad-tv/default.nix
index edb5f25..be3eca9 100644
--- a/tv/5pkgs/haskell/xmonad-tv/default.nix
+++ b/tv/5pkgs/haskell/xmonad-tv/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, bytestring, containers, directory
-, extra, lib, template-haskell, th-env, unix, X11, xmonad
-, xmonad-contrib, xmonad-stockholm
+, extra, filepath, lib, systemd, template-haskell, th-env
+, transformers, unix, X11, xmonad, xmonad-contrib
 }:
 mkDerivation {
   pname = "xmonad-tv";
@@ -9,8 +9,8 @@ mkDerivation {
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson base bytestring containers directory extra template-haskell
-    th-env unix X11 xmonad xmonad-contrib xmonad-stockholm
+    aeson base bytestring containers directory extra filepath systemd
+    template-haskell th-env transformers unix X11 xmonad xmonad-contrib
   ];
   license = lib.licenses.mit;
 }
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Build.hs b/tv/5pkgs/haskell/xmonad-tv/src/Build.hs
new file mode 100644
index 0000000..553a129
--- /dev/null
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Build.hs
@@ -0,0 +1,24 @@
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Build where
+
+import XMonad (Dimension)
+import THEnv.JSON (getCompileEnvJSONExp)
+
+
+myFont :: String
+myFont =
+  "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
+
+myScreenWidth :: Dimension
+myScreenWidth =
+  $(getCompileEnvJSONExp (id @Dimension) "XMONAD_BUILD_SCREEN_WIDTH")
+
+myTermFontWidth :: Dimension
+myTermFontWidth =
+  $(getCompileEnvJSONExp (id @Dimension) "XMONAD_BUILD_TERM_FONT_WIDTH")
+
+myTermPadding :: Dimension
+myTermPadding =
+  2
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Shutdown.hs b/tv/5pkgs/haskell/xmonad-tv/src/Shutdown.hs
new file mode 100644
index 0000000..d4a4d93
--- /dev/null
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Shutdown.hs
@@ -0,0 +1,113 @@
+{-# LANGUAGE LambdaCase #-}
+
+module Shutdown
+    ( newShutdownEventHandler
+    , shutdown
+    )
+  where
+
+import Control.Applicative ((<|>), empty)
+import Control.Concurrent (threadDelay)
+import Control.Monad (forever, guard, when)
+import Data.Monoid (All(All))
+import System.Directory (XdgDirectory(XdgData), createDirectoryIfMissing, doesFileExist, getAppUserDataDirectory, getXdgDirectory)
+import System.Exit (exitSuccess)
+import System.Environment (lookupEnv)
+import System.FilePath ((</>))
+import System.IO.Error (isDoesNotExistError, tryIOError)
+import System.IO (hPutStrLn, stderr)
+import System.Posix.Process (getProcessID)
+import System.Posix.Signals (nullSignal, signalProcess)
+import System.Posix.Types (ProcessID)
+import XMonad hiding (getXMonadDataDir)
+
+
+-- XXX this is for compatibility with both xmonad<0.17 and xmonad>=0.17
+getXMonadDataDir :: IO String
+getXMonadDataDir = xmEnvDir <|> xmDir <|> xdgDir
+  where
+    -- | Check for xmonad's environment variables first
+    xmEnvDir :: IO String
+    xmEnvDir =
+        maybe empty pure =<< lookupEnv "XMONAD_DATA_DIR"
+
+    -- | Check whether the config file or a build script is in the
+    -- @~\/.xmonad@ directory
+    xmDir :: IO String
+    xmDir = do
+        d <- getAppUserDataDirectory "xmonad"
+        conf  <- doesFileExist $ d </> "xmonad.hs"
+        build <- doesFileExist $ d </> "build"
+        pid <- doesFileExist $ d </> "xmonad.pid"
+
+        -- Place *everything* in ~/.xmonad if yes
+        guard $ conf || build || pid
+        pure d
+
+    -- | Use XDG directories as a fallback
+    xdgDir :: IO String
+    xdgDir = do
+        d <- getXdgDirectory XdgData "xmonad"
+        d <$ createDirectoryIfMissing True d
+
+
+newShutdownEventHandler :: IO (Event -> X All)
+newShutdownEventHandler = do
+    writeProcessIDToFile
+    return handleShutdownEvent
+
+handleShutdownEvent :: Event -> X All
+handleShutdownEvent = \case
+  ClientMessageEvent { ev_message_type = mt } -> do
+    isShutdownEvent <- (mt ==) <$> getAtom "XMONAD_SHUTDOWN"
+    when isShutdownEvent $ do
+      broadcastMessage ReleaseResources
+      writeStateToFile
+      io exitSuccess >> return ()
+    return (All (not isShutdownEvent))
+  _ ->
+    return (All True)
+
+sendShutdownEvent :: IO ()
+sendShutdownEvent = do
+    dpy <- openDisplay ""
+    rw <- rootWindow dpy $ defaultScreen dpy
+    a <- internAtom dpy "XMONAD_SHUTDOWN" False
+    allocaXEvent $ \e -> do
+        setEventType e clientMessage
+        setClientMessageEvent e rw a 32 0 currentTime
+        sendEvent dpy rw False structureNotifyMask e
+    sync dpy False
+
+shutdown :: IO ()
+shutdown = do
+    pid <- readProcessIDFromFile
+    sendShutdownEvent
+    hPutStrLn stderr ("waiting for: " <> show pid)
+    result <- tryIOError (waitProcess pid)
+    if isSuccess result
+      then hPutStrLn stderr ("result: " <> show result <> " [AKA success^_^]")
+      else hPutStrLn stderr ("result: " <> show result)
+  where
+    isSuccess = either isDoesNotExistError (const False)
+
+waitProcess :: ProcessID -> IO ()
+waitProcess pid = forever (signalProcess nullSignal pid >> threadDelay 10000)
+
+--
+-- PID file stuff
+--
+
+getProcessIDFileName :: IO FilePath
+getProcessIDFileName = (</> "xmonad.pid") <$> getXMonadDataDir
+
+writeProcessIDToFile :: IO ()
+writeProcessIDToFile = do
+    pidFileName <- getProcessIDFileName
+    pid <- getProcessID
+    writeFile pidFileName (show pid)
+
+readProcessIDFromFile :: IO ProcessID
+readProcessIDFromFile = do
+    pidFileName <- getProcessIDFileName
+    read <$> readFile pidFileName
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index 81373f4..c921d42 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -1,6 +1,4 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeApplications #-}
 
 module Main (main) where
 
@@ -32,25 +30,9 @@ import Data.Ratio
 import XMonad.Hooks.Place (placeHook, smart)
 import XMonad.Actions.PerWorkspaceKeys (chooseAction)
 
-import XMonad.Stockholm.Pager
-import XMonad.Stockholm.Shutdown
+import Shutdown (shutdown, newShutdownEventHandler)
 
-import THEnv.JSON (getCompileEnvJSONExp)
-
-
-myFont :: String
-myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
-
-myScreenWidth :: Dimension
-myScreenWidth =
-  $(getCompileEnvJSONExp (id @Dimension) "XMONAD_BUILD_SCREEN_WIDTH")
-
-myTermFontWidth :: Dimension
-myTermFontWidth =
-  $(getCompileEnvJSONExp (id @Dimension) "XMONAD_BUILD_TERM_FONT_WIDTH")
-
-myTermPadding :: Dimension
-myTermPadding = 2
+import Build (myFont, myScreenWidth, myTermFontWidth, myTermPadding)
 
 
 main :: IO ()
@@ -136,13 +118,6 @@ spawnRootTerm =
         Nothing
 
 
-spawnTermAt :: String -> X ()
-spawnTermAt ws = do
-    env <- io getEnvironment
-    let env' = ("XMONAD_SPAWN_WORKSPACE", ws) : env
-    forkFile {-pkg:rxvt_unicode-}"urxvtc" [] (Just env')
-
-
 myKeys :: XConfig Layout -> Map (KeyMask, KeySym) (X ())
 myKeys conf = Map.fromList $
     [ ((_4  , xK_Escape ), forkFile {-pkg-}"slock" [] Nothing)
@@ -151,11 +126,9 @@ myKeys conf = Map.fromList $
     , ((_4  , xK_o      ), forkFile {-pkg:fzmenu-}"otpmenu" [] Nothing)
     , ((_4  , xK_p      ), forkFile {-pkg:fzmenu-}"passmenu" [] Nothing)
 
-    , ((_4  , xK_x      ), chooseAction spawnTermAt)
+    , ((_4  , xK_x      ), forkFile {-pkg:rxvt_unicode-}"urxvtc" [] Nothing)
     , ((_4C , xK_x      ), spawnRootTerm)
 
-    , ((0   , xK_Menu   ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.view) )
-    , ((_S  , xK_Menu   ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) )
     , ((_C  , xK_Menu   ), toggleWS)
 
     , ((_4  , xK_space  ), withFocused $ \w -> ifM (isFloatingX w) xdeny $ sendMessage NextLayout)
@@ -233,23 +206,3 @@ xdeny =
         , "-e", "sleep", "0.05"
         ]
         Nothing
-
-
-pagerConfig :: PagerConfig
-pagerConfig = def
-    { pc_font           = myFont
-    , pc_cellwidth      = 64
-    , pc_matchmethod    = MatchPrefix
-    , pc_windowColors   = windowColors
-    }
-    where
-    windowColors _ _ _ True _ = ("#ef4242","#ff2323")
-    windowColors wsf m c u wf = do
-        let y = defaultWindowColors wsf m c u wf
-        if m == False && wf == True
-            then ("#402020", snd y)
-            else y
-
-
-allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
-allWorkspaceNames = return . map W.tag . W.workspaces
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal b/tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal
index f3bd2e0..a3ddcb0 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal
+++ b/tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal
@@ -15,14 +15,15 @@ executable xmonad
     containers,
     directory,
     extra,
+    filepath,
     template-haskell,
     th-env,
     unix,
     X11,
     xmonad,
-    xmonad-contrib,
-    xmonad-stockholm
+    xmonad-contrib
   other-modules:
+    Shutdown,
     THEnv.JSON
   default-language: Haskell2010
   ghc-options: -O2 -Wall -threaded
diff --git a/tv/5pkgs/lib b/tv/5pkgs/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index f719a9f..87b7ce9 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,4 +1,4 @@
-with import ../../../lib;
+with import ./lib;
 self: super:
 
 mapNixDir (path: import path self super) ./.
diff --git a/tv/5pkgs/override/fzf/complete1.patch b/tv/5pkgs/override/fzf/complete1.patch
index 4b2126a..3e3f2c4 100644
--- a/tv/5pkgs/override/fzf/complete1.patch
+++ b/tv/5pkgs/override/fzf/complete1.patch
@@ -1,50 +1,72 @@
+commit 57cbd76c068121b685399fdb4649e7ba537983d6
+Author: tv <tv@krebsco.de>
+Date:   Mon Dec 5 15:24:30 2022 +0100
+
+    Add --complete-1 option
+
+diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
+index 79e7291..3b8a753 100644
+--- a/man/man1/fzf.1
++++ b/man/man1/fzf.1
+@@ -685,6 +685,9 @@ interactive finder and automatically select the only match
+ If there is no match for the initial query (\fB--query\fR), do not start
+ interactive finder and exit immediately
+ .TP
++.B "--complete-1"
++Exit interactive finder when there's exactly one match
++.TP
+ .BI "-f, --filter=" "STR"
+ Filter mode. Do not start interactive finder. When used with \fB--no-sort\fR,
+ fzf becomes a fuzzy-version of grep.
 diff --git a/src/core.go b/src/core.go
-index a18c3a1..a3d92a4 100644
+index 2ddddc3..09afff2 100644
 --- a/src/core.go
 +++ b/src/core.go
-@@ -331,6 +331,13 @@ func Run(opts *Options, version string, revision string) {
+@@ -337,8 +337,14 @@ func Run(opts *Options, version string, revision string) {
+ 								}
+ 								determine(val.final)
  							}
- 						}
- 						terminal.UpdateList(val, clearSelection())
-+						if (opts.Complete1) {
-+							count := val.Length()
-+							if count == 1 {
++						} else {
++							if opts.Complete1 && val.Length() == 1 {
 +								opts.Printer(val.Get(0).item.AsString(opts.Ansi))
 +								terminal.reqBox.Set(reqClose, nil)
++							} else {
++								terminal.UpdateList(val, clearSelection())
 +							}
-+						}
+ 						}
+-						terminal.UpdateList(val, clearSelection())
  					}
  				}
  			}
 diff --git a/src/options.go b/src/options.go
-index a55dc34..7f121cd 100644
+index 5400311..1e38fe4 100644
 --- a/src/options.go
 +++ b/src/options.go
-@@ -92,6 +92,7 @@ const usage = `usage: fzf [options]
-     -1, --select-1        Automatically select the only match
-     -0, --exit-0          Exit immediately when there's no match
-     -f, --filter=STR      Filter mode. Do not start interactive finder.
-+    --complete-1          Exit interactive finder when there's exactly one match
-     --print-query         Print query as the first line
-     --expect=KEYS         Comma-separated list of keys to complete fzf
-     --read0               Read input delimited by ASCII NUL characters
-@@ -208,6 +209,7 @@ type Options struct {
- 	Query       string
- 	Select1     bool
- 	Exit0       bool
-+	Complete1   bool
- 	Filter      *string
- 	ToggleSort  bool
- 	Expect      map[tui.Event]string
-@@ -269,6 +271,7 @@ func defaultOptions() *Options {
- 		Query:       "",
- 		Select1:     false,
- 		Exit0:       false,
-+		Complete1:   false,
- 		Filter:      nil,
- 		ToggleSort:  false,
- 		Expect:      make(map[tui.Event]string),
-@@ -1311,6 +1314,8 @@ func parseOptions(opts *Options, allArgs []string) {
+@@ -108,6 +108,7 @@ const usage = `usage: fzf [options]
+     -1, --select-1         Automatically select the only match
+     -0, --exit-0           Exit immediately when there's no match
+     -f, --filter=STR       Filter mode. Do not start interactive finder.
++    --complete-1           Exit interactive finder when there's exactly one match
+     --print-query          Print query as the first line
+     --expect=KEYS          Comma-separated list of keys to complete fzf
+     --read0                Read input delimited by ASCII NUL characters
+@@ -274,6 +275,7 @@ type Options struct {
+ 	Query        string
+ 	Select1      bool
+ 	Exit0        bool
++	Complete1    bool
+ 	Filter       *string
+ 	ToggleSort   bool
+ 	Expect       map[tui.Event]string
+@@ -342,6 +344,7 @@ func defaultOptions() *Options {
+ 		Query:        "",
+ 		Select1:      false,
+ 		Exit0:        false,
++		Complete1:    false,
+ 		Filter:       nil,
+ 		ToggleSort:   false,
+ 		Expect:       make(map[tui.Event]string),
+@@ -1546,6 +1549,8 @@ func parseOptions(opts *Options, allArgs []string) {
  			opts.Exit0 = true
  		case "+0", "--no-exit-0":
  			opts.Exit0 = false
diff --git a/tv/5pkgs/override/fzf/default.nix b/tv/5pkgs/override/fzf/default.nix
index 661db0e..2254d45 100644
--- a/tv/5pkgs/override/fzf/default.nix
+++ b/tv/5pkgs/override/fzf/default.nix
@@ -1,9 +1,7 @@
 self: super:
 
 super.fzf.overrideAttrs (old: {
-  # XXX cannot use `patches` because fzf has a custom patchPhase
-  patchPhase = ''
-    patch -Np1 < ${./complete1.patch}
-    ${old.patchPhase or ""}
-  '';
+  patches = old.patches or [] ++ [
+    ./complete1.patch
+  ];
 })
diff --git a/tv/5pkgs/override/lib b/tv/5pkgs/override/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/override/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/rpi/default.nix b/tv/5pkgs/rpi/default.nix
index f0ac47f..e41d637 100644
--- a/tv/5pkgs/rpi/default.nix
+++ b/tv/5pkgs/rpi/default.nix
@@ -1,6 +1,4 @@
-let
-  lib = import <stockholm/lib>;
-in
+with import ./lib;
 
 self: super:
 
diff --git a/tv/5pkgs/rpi/lib b/tv/5pkgs/rpi/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/rpi/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/simple/alacritty-font-size.nix b/tv/5pkgs/simple/alacritty-font-size.nix
new file mode 100644
index 0000000..84bc3f6
--- /dev/null
+++ b/tv/5pkgs/simple/alacritty-font-size.nix
@@ -0,0 +1,67 @@
+{ pkgs }:
+
+pkgs.writeDashBin "font-size-alacritty" ''
+  # usage: font-size-alacritty (+N|-N|=N)
+  # Increase by, decrease by, or set font size to the value N.
+
+  set -efu
+
+  min_size=8
+
+  op=''${1%%[0-9]*}
+  op=''${op:-=}
+
+  value=''${1#[=+-]}
+
+  window_id=$(${pkgs.xdotool}/bin/xdotool getactivewindow)
+
+  current_size=$(
+    ${pkgs.xorg.xprop}/bin/xprop -notype -id $window_id FONT_SIZE |
+    ${pkgs.gnused}/bin/sed -rn 's/.* = ([0-9]+)$/\1/p'
+  )
+
+  # usage: set_font_size WINDOW_ID FONT_SIZE
+  set_font_size() {
+    ${pkgs.alacritty}/bin/alacritty msg config -w $1 font.size=$2
+    ${pkgs.xorg.xprop}/bin/xprop -id $1 -f FONT_SIZE 32c -set FONT_SIZE $2
+  }
+
+  # usage: reset_font_size WINDOW_ID
+  reset_font_size() {
+    ${pkgs.alacritty}/bin/alacritty msg config -w $1 font.size=$min_size
+    ${pkgs.xorg.xprop}/bin/xprop -id $1 -remove FONT_SIZE
+  }
+
+  # usage: make_next_size
+  make_next_size() {
+    case $op in
+      -) next_size=$(expr $current_size - $value) ;;
+      =) next_size=$value ;;
+      +)
+        next_size=$(expr $current_size + $value)
+        test $next_size -ge $min_size || next_size=$min_size
+        ;;
+    esac
+  }
+
+  if test -z "$current_size"; then
+    current_size=0
+    make_next_size
+    if test $next_size -ge $min_size; then
+      ${pkgs.alacritty}/bin/alacritty msg config -w $window_id \
+          font.normal.family='Input Mono' \
+          font.normal.style=Condensed \
+          font.bold.family='Input Mono' \
+          font.bold.style=Bold
+      set_font_size $window_id $next_size
+    fi
+  else
+    make_next_size
+    if test $next_size -ge $min_size; then
+      set_font_size $window_id $next_size
+    else
+      ${pkgs.alacritty}/bin/alacritty msg config -w $window_id -r
+      reset_font_size $window_id
+    fi
+  fi
+''
diff --git a/tv/5pkgs/simple/alacritty-tv.nix b/tv/5pkgs/simple/alacritty-tv.nix
new file mode 100644
index 0000000..466ff27
--- /dev/null
+++ b/tv/5pkgs/simple/alacritty-tv.nix
@@ -0,0 +1,93 @@
+{ pkgs }:
+
+let
+  lib = import ./lib;
+  font-size = arg: {
+    program = "${pkgs.font-size-alacritty}/bin/font-size-alacritty";
+    args = [arg];
+  };
+  config = {
+    bell.animation = "EaseOut";
+    bell.duration = 50;
+    bell.color = "#ff00ff";
+    colors.cursor.cursor      = "#f042b0";
+    colors.primary.background = "#202020";
+    colors.primary.foreground = "#d0d7d0";
+    colors.normal.black       = "#000000";
+    colors.normal.red         = "#cd0000";
+    colors.normal.green       = "#00cd00";
+    colors.normal.yellow      = "#bc7004";
+    colors.normal.blue        = "#4343be";
+    colors.normal.magenta     = "#cb06cb";
+    colors.normal.cyan        = "#04c9c9";
+    colors.normal.white       = "#bebebe";
+    colors.bright.black       = "#727272";
+    colors.bright.red         = "#fb6262";
+    colors.bright.green       = "#72fb72";
+    colors.bright.yellow      = "#fbfb72";
+    colors.bright.blue        = "#7272fb";
+    colors.bright.magenta     = "#fb53fb";
+    colors.bright.cyan        = "#72fbfb";
+    colors.bright.white       = "#fbfbfb";
+    draw_bold_text_with_bright_colors = true;
+    font.normal.family = "Clean";
+    font.bold.family = "Clean";
+    font.bold.style = "Regular";
+    font.size = 10;
+    hints.enabled = [
+      {
+        regex = "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\\u0000-\\u001F\\u007F-\\u009F<>\"\\s{-}\\^⟨⟩`]+";
+        mouse.enabled = true;
+        post_processing = true;
+        action = "Select";
+      }
+    ];
+    key_bindings = [
+      { key = "Up";   mods = "Shift|Control"; command = font-size "=14"; }
+      { key = "Up";   mods = "Control";       command = font-size "+1"; }
+      { key = "Down"; mods = "Control";       command = font-size "-1"; }
+      { key = "Down"; mods = "Shift|Control"; command = font-size "=0"; }
+    ];
+    scrolling.multiplier = 8;
+  };
+  config-file = pkgs.writeJSON "alacritty-tv.json" config;
+in
+
+pkgs.symlinkJoin {
+  name = "alacritty-tv";
+  paths = [
+    (pkgs.writeDashBin "alacritty" ''
+      # usage:
+      #   alacritty [--singleton] [ARGS...]
+
+      set -efu
+
+      # Use home so Alacritty can find the configuration without arguments.
+      # HOME will be reset once in Alacritty.
+      HOME=$TMPDIR/Alacritty
+      export HOME
+
+      # Install stored configuration if it has changed.
+      # This allows for both declarative updates and runtime modifications.
+      ${pkgs.coreutils}/bin/mkdir -p "$HOME"
+      ref=$(${pkgs.coreutils}/bin/cat "$HOME"/ref)
+      if test "$ref" != ${config-file}; then
+        echo ${config-file} > "$HOME"/ref
+        ${pkgs.coreutils}/bin/cp ${config-file} "$HOME"/.alacritty.yml
+      fi
+
+      case ''${1-} in
+        --singleton)
+          shift
+          if ! ${pkgs.alacritty}/bin/alacritty msg create-window "$@"; then
+            ${pkgs.alacritty}/bin/alacritty "$@" &
+          fi
+          ;;
+        *)
+          exec ${pkgs.alacritty}/bin/alacritty "$@"
+          ;;
+      esac
+    '')
+    pkgs.alacritty
+  ];
+}
diff --git a/tv/5pkgs/simple/bash-fzf-history.nix b/tv/5pkgs/simple/bash-fzf-history.nix
index 88a8e9e..1166ec7 100644
--- a/tv/5pkgs/simple/bash-fzf-history.nix
+++ b/tv/5pkgs/simple/bash-fzf-history.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs
 
 , edit-key ? "ctrl-e"
diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix
index 9fb45dd..82a19a9 100644
--- a/tv/5pkgs/simple/default.nix
+++ b/tv/5pkgs/simple/default.nix
@@ -1,4 +1,4 @@
-with import ../../../lib;
+with import ./lib;
 
 self: super:
 
diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
index c3f2dea..4f9b84b 100644
--- a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
+++ b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     patchelf --set-interpreter \
-        ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
+        ${pkgs.pkgsi686Linux.glibc}/lib/ld-linux-x86-64.so.2 \
         $out/lib/utsushi/networkscan
 
     # libstdc++.so.6
diff --git a/tv/5pkgs/simple/lib b/tv/5pkgs/simple/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/simple/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/simple/pinentry-urxvt/default.nix b/tv/5pkgs/simple/pinentry-urxvt/default.nix
index 65b76c0..ad8039f 100644
--- a/tv/5pkgs/simple/pinentry-urxvt/default.nix
+++ b/tv/5pkgs/simple/pinentry-urxvt/default.nix
@@ -1,8 +1,7 @@
+with import ./lib;
 { pkgs, ... }@args:
 
 let
-  lib = import <stockholm/lib>;
-
   # config cannot be declared in the input attribute set because that would
   # cause callPackage to inject the wrong config.  Instead, get it from ...
   # via args.
@@ -20,7 +19,11 @@ let
           type = lib.types.str;
         };
         display = lib.mkOption {
-          default = ":0";
+          default = null;
+          type = lib.types.nullOr lib.types.str;
+        };
+        xwud.className = lib.mkOption {
+          default = "PinentryUrxvtXwudFloat";
           type = lib.types.str;
         };
       };
@@ -30,12 +33,77 @@ let
 
 in
 
+  # pinentry-urxvt - A mechanism for PIN entry utilizing rxvt-unicode
+  #
+  # This spawns a PIN entry terminal on top of a tinted screenshot of the
+  # current display's root window.  The display for spawning the terminal can
+  # be predefined, in which case both the current and the predefined display
+  # will show the screenshot.
+  #
+  # The purpose of the screenshot, aside from looking nice, is to prevent entry
+  # of the PIN into the wrong window, e.g. by accidentally moving the cursor
+  # while typing.  If necessary, the screenshot can be closed by sending 'q',
+  # 'Q', or ctrl-c while its focused.
+  #
   pkgs.write "pinentry-urxvt" {
     "/bin/pinentry".link = pkgs.writeDash "pinentry-urxvt-wrapper" ''
       set -efu
+
+      trap cleanup EXIT
+
+      cleanup() {
+        ${pkgs.utillinux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
+        rm "$displayers"
+        rm "$screenshot"
+      }
+
+      displayers=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.displayers.XXXXXXXX)
+      screenshot=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.screenshot.XXXXXXXX)
+
+      ${pkgs.xorg.xwd}/bin/xwd -root |
+      ${pkgs.imagemagick}/bin/convert xwd:- -fill \#424242 -colorize 80% xwd:"$screenshot"
+
+      display_screenshot() {
+        ${pkgs.exec "pinentry-urxvt.display_screenshot" {
+            filename = "${pkgs.xorg.xwud}/bin/xwud";
+            argv = [
+              cfg.xwud.className
+              "-noclick"
+            ];
+        }} < "$screenshot" &
+        wait_for_screenshot $! && echo $! >>"$displayers"
+      }
+
+      # Wait for the xwud window by trying to intercept the call to munmap().
+      # If it cannot be intercepted within 0.1s, assume that attaching strace
+      # wasn't fast enough or xwud doesn't call munmap() anymore.  In either
+      # case fall back to search the window by class name, assuming there can
+      # be only one per display.
+      wait_for_screenshot() {
+        if ! \
+          ${pkgs.coreutils}/bin/timeout 0.1 \
+          ${pkgs.strace}/bin/strace -p "$1" -e munmap 2>&1 |
+          read -r _
+        then
+          until ${pkgs.xdotool}/bin/xdotool search \
+                    --classname ${lib.shell.escape cfg.xwud.className}
+          do
+            ${pkgs.coreutils}/bin/sleep 0.1
+          done
+        fi
+      }
+
+      display_screenshot
+
+      ${lib.optionalString (cfg.display != null) /* sh */ ''
+        if test "$DISPLAY" != ${lib.shell.escape cfg.display}; then
+          export DISPLAY=${lib.shell.escape cfg.display}
+          display_screenshot
+        fi
+      ''}
+
       exec 3<&0 4>&1 5>&2
-      export DISPLAY=${lib.shell.escape cfg.display}
-      exec ${pkgs.rxvt_unicode}/bin/urxvt \
+      ${pkgs.rxvt_unicode}/bin/urxvt \
         -name ${lib.shell.escape cfg.appName} \
         -e ${pkgs.writeDash "pinentry-urxvt-tty" ''
           set -efu
diff --git a/tv/5pkgs/simple/pinentry-urxvt/lib b/tv/5pkgs/simple/pinentry-urxvt/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/simple/pinentry-urxvt/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix
index e17282e..2ae71db 100644
--- a/tv/5pkgs/simple/q/default.nix
+++ b/tv/5pkgs/simple/q/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }:
-with import <stockholm/lib>;
+with import ./lib;
+{ pkgs }:
 let
   q-cal = let
 
diff --git a/tv/5pkgs/simple/q/lib b/tv/5pkgs/simple/q/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/simple/q/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/vim/default.nix b/tv/5pkgs/vim/default.nix
index 5582be3..c143592 100644
--- a/tv/5pkgs/vim/default.nix
+++ b/tv/5pkgs/vim/default.nix
@@ -1,7 +1,11 @@
-with import <stockholm/lib>;
+with import ./lib;
 
 self: super: {
   tv = super.tv // {
+    vim = {
+      makePlugin = outPath: outPath // { inherit outPath; };
+      makeRuntimePath = concatMapStringsSep "," (getAttr "outPath");
+    };
     vimPlugins = mapNixDir (path: self.callPackage path {}) ./.;
   };
 }
diff --git a/tv/5pkgs/vim/hack.nix b/tv/5pkgs/vim/hack.nix
index 2145cc1..922d85b 100644
--- a/tv/5pkgs/vim/hack.nix
+++ b/tv/5pkgs/vim/hack.nix
@@ -1,7 +1,7 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "hack";
 in {
   name = "vim-color-${name}-1.0.2";
diff --git a/tv/5pkgs/vim/lib b/tv/5pkgs/vim/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/5pkgs/vim/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
diff --git a/tv/5pkgs/vim/nix.nix b/tv/5pkgs/vim/nix.nix
index 6715af7..43caf46 100644
--- a/tv/5pkgs/vim/nix.nix
+++ b/tv/5pkgs/vim/nix.nix
@@ -1,7 +1,7 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
+pkgs.tv.vim.makePlugin (pkgs.write "vim-syntax-nix-nested" {
   "/syntax/haskell.vim".text = ''
     syn region String start=+\[[[:alnum:]]*|+ end=+|]+
 
diff --git a/tv/5pkgs/vim/showsyntax.nix b/tv/5pkgs/vim/showsyntax.nix
index a5547e4..c27dd04 100644
--- a/tv/5pkgs/vim/showsyntax.nix
+++ b/tv/5pkgs/vim/showsyntax.nix
@@ -1,6 +1,6 @@
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "showsyntax";
 in {
   name = "vim-plugin-${name}-1.0.0";
diff --git a/tv/5pkgs/vim/tv.nix b/tv/5pkgs/vim/tv.nix
index ae6245b..dee6b2d 100644
--- a/tv/5pkgs/vim/tv.nix
+++ b/tv/5pkgs/vim/tv.nix
@@ -1,6 +1,6 @@
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
+pkgs.tv.vim.makePlugin (pkgs.write "vim-tv" {
   #
   # Haskell
   #
diff --git a/tv/5pkgs/vim/vim.nix b/tv/5pkgs/vim/vim.nix
index 216ab6a..c5693a2 100644
--- a/tv/5pkgs/vim/vim.nix
+++ b/tv/5pkgs/vim/vim.nix
@@ -1,7 +1,7 @@
-with import <stockholm/lib>;
+with import ./lib;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "vim";
 in {
   name = "vim-syntax-${name}-1.0.0";
diff --git a/tv/lib b/tv/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/lib
@@ -0,0 +1 @@
+../lib
+\ No newline at end of file
author	makefu <github@syntax-fehler.de>	2022-12-12 19:44:00 +0100
committer	makefu <github@syntax-fehler.de>	2022-12-12 19:44:00 +0100
commit	aa1e058ba6e8c3e701a2503d65ddb3c83d5c4f47 (patch)
tree	ea3e3bbc78c78f39b2a8e123901867e1e68c21c7
parent	3a65e49a98fc1721cbc34859a18d324789abfeee (diff)
parent	c0378866356b182206aa7ad47f1139cf37f697f4 (diff)