diff --git a/home/cli.nix b/home/cli.nix
index 07fc433..3ae7983 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -21,7 +21,7 @@
     #unrar
     # nix tools
     nix-index
-    nixpkgs-fmt
+    nixfmt
     # misc
     fd # better find
     file # info about files
@@ -30,8 +30,13 @@
     gnumake
     ripgrep # better grep
     sqlite
-    pass
+    #    pass
     pandoc
+    hledger
+    hledger-web
+    hledger-iadd
+    hledger-ui
+    smos
 
     # editors
     emacs-nox
@@ -40,11 +45,14 @@
     clang_12
 
     # haskell
+    ghcid
+    ghc
     cabal2nix
     nix-prefetch-git
     cabal-install
     haskellPackages.cabal-fmt
     haskellPackages.stylish-haskell
+    haskellPackages.ormolu
   ];
   home.extraOutputsToInstall = [ "doc" "info" "devdoc" ];
 
@@ -53,6 +61,16 @@
   #   "emacs".source = ./emacs.d;
   # };
 
+  xdg.configFile.tmux = {
+    target = "tmux/tmux.conf";
+    text = ''
+      set -g default-terminal "tmux-256color"
+      set -g prefix C-z
+      bind-key C-z send-prefix
+      set -g renumber-windows on
+    '';
+  };
+
   programs = {
     direnv = {
       enable = true;
@@ -61,6 +79,7 @@
         enableFlakes = true;
       };
       enableZshIntegration = true;
+      enableBashIntegration = true;
     };
 
     gh = {
@@ -70,12 +89,7 @@
 
     git = {
       enable = true;
-      ignores = [
-        "*~"
-        "*.swp"
-        "result"
-        "dist-newstyle"
-      ];
+      ignores = [ "*~" "*.swp" "result" "dist-newstyle" ];
       userEmail = "me@failco.de";
       userName = "Alexander Kobjolke";
     };
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 382e031..f613949 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -5,14 +5,13 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   nix.package = pkgs.nixUnstable;
   nix.extraOptions = ''
-    experimental-features = nix-command flakes
+    experimental-features = nix-command flakes ca-derivations ca-references
   '';
   #nix.registry.nixpkgs.flake = nixpkgs;
   # Use the GRUB 2 boot loader.
@@ -52,7 +51,7 @@
     defaultGateway = "195.90.208.1";
     nameservers = [ "1.1.1.1" "8.8.8.8" ];
     firewall = {
-      allowedTCPPorts = [ 22 80 443 ];
+      allowedTCPPorts = [ 22 80 443 5000 ];
       allowedUDPPorts = [ 42666 ];
     };
 
@@ -74,13 +73,11 @@
         '';
 
         privateKeyFile = config.age.secrets.wireguard-thrall.path;
-        peers = [
-          {
-            # my phone
-            publicKey = "9EaBSNsJW0W/xPMLJ54zr3UNK3bZ/2ULOmhV1gPfSXk=";
-            allowedIPs = [ "10.0.0.2/32" ];
-          }
-        ];
+        peers = [{
+          # my phone
+          publicKey = "9EaBSNsJW0W/xPMLJ54zr3UNK3bZ/2ULOmhV1gPfSXk=";
+          allowedIPs = [ "10.0.0.2/32" ];
+        }];
       };
     };
   };
@@ -97,15 +94,13 @@
   security.sudo = {
     enable = true;
     execWheelOnly = true;
-    extraRules = [
-      { groups = [ "wheel" ];
-        commands = [
-	  { command = "/run/current-system/sw/bin/nixos-rebuild";
-	    options = [ "NOPASSWD" ];
-	  }
-	];
-      }
-    ];
+    extraRules = [{
+      groups = [ "wheel" ];
+      commands = [{
+        command = "/run/current-system/sw/bin/nixos-rebuild";
+        options = [ "NOPASSWD" ];
+      }];
+    }];
   };
 
   # Select internationalisation properties.
@@ -175,7 +170,7 @@
     "failco.de" = {
       forceSSL = true;
       enableACME = true;
-      root = "/var/www/blog";
+      root = "/srv/www/failco.de";
       serverAliases = [ "www.failco.de" "mail.failco.de" ];
     };
   };
@@ -189,11 +184,9 @@
       "me@failco.de" = {
         hashedPasswordFile = config.age.secrets.mailPass.path;
 
-	aliases = [
-          "jakalx@failco.de"
-	];
+        aliases = [ "jakalx@failco.de" ];
 
-	catchAll = [ "failco.de" ];
+        catchAll = [ "failco.de" ];
       };
     };