From 9f2edc86f4e4a10c4cd5936423851742ea0f3370 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 19 May 2025 14:33:58 +0200
Subject: [PATCH 1/5] re-enable docker again

---
 hosts/thinkpad/modules/virtualisation/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hosts/thinkpad/modules/virtualisation/default.nix b/hosts/thinkpad/modules/virtualisation/default.nix
index 172cd6e..4ea4724 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 = {

From f8041dc5b3fad2bdf675338130a0d6bfc928209f Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 19 May 2025 14:34:34 +0200
Subject: [PATCH 2/5] remove 'svpn' function

---
 shared/zsh.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/shared/zsh.nix b/shared/zsh.nix
index 4f655d5..64ce38f 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -77,16 +77,6 @@ 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'
           }

From cce11f1c9c9e8c5f53f0d3597010b1e8488017da Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 19 May 2025 14:55:49 +0200
Subject: [PATCH 3/5] zsh: remove mcfly remainings

---
 shared/zsh.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/shared/zsh.nix b/shared/zsh.nix
index 64ce38f..ee4a158 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -62,12 +62,6 @@ 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

From fc81d5ccec080113800842c945753b9632845754 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 19 May 2025 14:56:47 +0200
Subject: [PATCH 4/5] network: add vpn utilities

---
 hosts/thinkpad/modules/networks/default.nix | 3 +++
 users/rouven/modules/packages.nix           | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index d2143cc..9df47ea 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -26,6 +26,9 @@
     curlFull
     wireguard-tools
     etherape
+    openconnect
+    openvpn
+    openfortivpn
   ];
   services.timesyncd.servers = lib.mkForce [ ];
   services.resolved = {
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index c433d2b..be700d8 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -29,7 +29,6 @@
     # internet
     google-chrome
     liferea
-    openvpn
     thunderbird
 
     # messaging

From d8947bfd3634c494f9f5f2b733462f3192334141 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 19 May 2025 15:06:57 +0200
Subject: [PATCH 5/5] treewide: ran deadnix

---
 flake.nix                                      | 1 -
 hosts/falkenstein/modules/caddy/default.nix    | 2 +-
 hosts/nuc/modules/mautrix-telegram/default.nix | 2 +-
 shared/systemd.nix                             | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 61d6a1b..219520b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,6 @@
     , 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 2099cad..b5126b1 100644
--- a/hosts/falkenstein/modules/caddy/default.nix
+++ b/hosts/falkenstein/modules/caddy/default.nix
@@ -1,4 +1,4 @@
-{ config, caddy-patched, ... }:
+{ config, ... }:
 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 03b2fac..402f8a0 100644
--- a/hosts/nuc/modules/mautrix-telegram/default.nix
+++ b/hosts/nuc/modules/mautrix-telegram/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 let
   homeserverDomain = config.services.matrix-synapse.settings.server_name;
 in
diff --git a/shared/systemd.nix b/shared/systemd.nix
index cf564b5..87a176b 100644
--- a/shared/systemd.nix
+++ b/shared/systemd.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ ... }:
 
 {
   # fixes run0 failing to execute