treewide: ran deadnix

flake.nix

@@ -66,7 +66,6 @@
     , purge
     , trucksimulatorbot
     , pfersel
-    , caddy-patched
     , ...
     }@attrs: {
       packages.x86_64-linux = {

hosts/falkenstein/modules/caddy/default.nix

@@ -1,4 +1,4 @@
-{ config, caddy-patched, ... }:
+{ config, ... }:
 let
   # matrix homeserver discovery
   matrix_domain = "matrix.${config.networking.domain}";

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

hosts/thinkpad/modules/networks/default.nix

@@ -26,6 +26,9 @@
     curlFull
     wireguard-tools
     etherape
+    openconnect
+    openvpn
+    openfortivpn
   ];
   services.timesyncd.servers = lib.mkForce [ ];
   services.resolved = {

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 = {

shared/systemd.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ ... }:
 
 {
   # fixes run0 failing to execute

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
@@ -77,16 +71,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'
           }

users/rouven/modules/packages.nix

@@ -29,7 +29,6 @@
     # internet
     google-chrome
     liferea
-    openvpn
     thunderbird
 
     # messaging