diff --git a/flake.nix b/flake.nix
index 219520b..61d6a1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
     , purge
     , trucksimulatorbot
     , pfersel
+    , caddy-patched
     , ...
     }@attrs: {
       packages.x86_64-linux = {
diff --git a/hosts/falkenstein/modules/caddy/default.nix b/hosts/falkenstein/modules/caddy/default.nix
index b5126b1..2099cad 100644
--- a/hosts/falkenstein/modules/caddy/default.nix
+++ b/hosts/falkenstein/modules/caddy/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, caddy-patched, ... }:
 let
   # matrix homeserver discovery
   matrix_domain = "matrix.${config.networking.domain}";
diff --git a/hosts/nuc/modules/mautrix-telegram/default.nix b/hosts/nuc/modules/mautrix-telegram/default.nix
index 402f8a0..03b2fac 100644
--- a/hosts/nuc/modules/mautrix-telegram/default.nix
+++ b/hosts/nuc/modules/mautrix-telegram/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:
 let
   homeserverDomain = config.services.matrix-synapse.settings.server_name;
 in
diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index 9df47ea..d2143cc 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -26,9 +26,6 @@
     curlFull
     wireguard-tools
     etherape
-    openconnect
-    openvpn
-    openfortivpn
   ];
   services.timesyncd.servers = lib.mkForce [ ];
   services.resolved = {
diff --git a/hosts/thinkpad/modules/virtualisation/default.nix b/hosts/thinkpad/modules/virtualisation/default.nix
index 4ea4724..172cd6e 100644
--- a/hosts/thinkpad/modules/virtualisation/default.nix
+++ b/hosts/thinkpad/modules/virtualisation/default.nix
@@ -1,13 +1,13 @@
 { pkgs, ... }:
 {
   virtualisation = {
-    # podman = {
-    #   enable = true;
-    #   defaultNetwork.settings.dns_enabled = true;
-    # };
-    docker = {
+    podman = {
       enable = true;
+      defaultNetwork.settings.dns_enabled = true;
     };
+    # docker = {
+    #   enable = true;
+    # };
     libvirtd = {
       enable = true;
       qemu = {
diff --git a/shared/systemd.nix b/shared/systemd.nix
index 87a176b..cf564b5 100644
--- a/shared/systemd.nix
+++ b/shared/systemd.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, lib, ... }:
 
 {
   # fixes run0 failing to execute
diff --git a/shared/zsh.nix b/shared/zsh.nix
index ee4a158..4f655d5 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -62,6 +62,12 @@ in
 
       interactiveShellInit =
         ''
+          export MCFLY_KEY_SCHEME=vim
+          export MCFLY_FUZZY=2
+          export MCFLY_DISABLE_MENU=TRUE
+          export MCFLY_RESULTS=30
+          export MCFLY_INTERFACE_VIEW=BOTTOM
+          export MCFLY_PROMPT="❯"
           export ZVM_FAST_ESCAPE=true
           # fix for networkctl
           zstyle ':completion:*:complete:networkctl:*' list-grouped true
@@ -71,6 +77,16 @@ in
           zvm_after_init_commands+=(eval "$(atuin init zsh --disable-up-arrow)")
           unsetopt extendedglob
 
+      
+          function svpn() {
+            unit=$(systemctl list-unit-files | grep "openconnect\|wg-quick\|wireguard\|openvpn\|openfortivpn" | cut -d "." -f1 | ${pkgs.fzf}/bin/fzf --preview 'systemctl status {}')
+            if [ $(systemctl is-active $unit) = "inactive" ]; then
+              systemctl start $unit
+            else
+              systemctl stop $unit
+            fi
+          }
+
           prompt_dir() {
               prompt_segment blue $CURRENT_FG '%c'
           }
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index be700d8..c433d2b 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -29,6 +29,7 @@
     # internet
     google-chrome
     liferea
+    openvpn
     thunderbird
 
     # messaging