diff --git a/modules/rr.nix b/modules/arr.nix
similarity index 100%
rename from modules/rr.nix
rename to modules/arr.nix
diff --git a/modules/default.nix b/modules/default.nix
index 17659e0..69c1fa1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -61,6 +61,7 @@
   };
 
   imports = [
+    ./arr.nix
     ./audio.nix
     ./ausweisapp.nix
     ./bluetooth.nix
@@ -73,7 +74,6 @@
     ./kdeconnect.nix
     ./keyd.nix
     ./man.nix
-    ./mozillavpn.nix
     ./network.nix
     ./nh.nix
     ./nix-ld.nix
@@ -82,12 +82,10 @@
     ./ollama.nix
     ./opengl.nix
     ./openssh.nix
-    ./openvpn.nix
     ./power.nix
     ./packages.nix
     ./printing.nix
     ./ratbag.nix
-    ./rr.nix
     ./security.nix
     ./shell.nix
     ./steam.nix
@@ -95,6 +93,7 @@
     ./tts.nix
     ./udisks2.nix
     ./virtualisation.nix
+    ./vpn.nix
     ./xdg-portal.nix
   ];
 }
diff --git a/modules/mozillavpn.nix b/modules/mozillavpn.nix
deleted file mode 100644
index 551a4b2..0000000
--- a/modules/mozillavpn.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }: lib.mkIf config.bchmnn.vpn.enable {
-
-  environment.systemPackages = with pkgs; [
-    mozillavpn
-  ];
-
-  services.mozillavpn = {
-    enable = true;
-  };
-
-}
diff --git a/modules/openvpn.nix b/modules/openvpn.nix
deleted file mode 100644
index 8d02417..0000000
--- a/modules/openvpn.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    openvpn3
-  ];
-}
diff --git a/modules/packages.nix b/modules/packages.nix
index 9dfee74..133fdc4 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -9,6 +9,7 @@
     wget # tool for retrieving files using http, https, and ftp
     neofetch # a fast, highly customizable system info script
     lsd # the next gen ls command
+    eza # a modern, maintained replacement for ls
     ripgrep # a utility that combines the usability of the silver searcher with the raw speed of grep
     ripgrep-all # ripgrep, but also search in pdfs, e-books, office documents, zip, tar.gz, and more
     expect # a tool for automating interactive applications
diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
index 4317d29..9112d25 100644
--- a/modules/virtualisation.nix
+++ b/modules/virtualisation.nix
@@ -3,6 +3,7 @@
   # virt-manager
   virtualisation = {
     libvirtd.enable = true;
+    /*
     podman = {
       enable = true;
       # create a `docker` alias for podman, to use it as a drop-in replacement
@@ -10,8 +11,13 @@
       # required for containers under podman-compose to be able to talk to each other.
       defaultNetwork.settings.dns_enabled = true;
     };
+    */
+    docker = {
+      enable = true;
+    };
     oci-containers = {
-      backend = "podman";
+      backend = "docker";
+      # backend = "podman";
     };
     containers = {
       enable = true;
diff --git a/modules/vpn.nix b/modules/vpn.nix
new file mode 100644
index 0000000..3f49d86
--- /dev/null
+++ b/modules/vpn.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }: lib. mkIf config.bchmnn.vpn.enable {
+
+  environment.systemPackages = with pkgs; [
+    openvpn3
+    mullvad-vpn
+  ];
+
+  services.mullvad-vpn.enable = true;
+
+}
diff --git a/users/gandalf/modules/neovim/default.nix b/users/gandalf/modules/neovim/default.nix
index fe478a7..b95330d 100644
--- a/users/gandalf/modules/neovim/default.nix
+++ b/users/gandalf/modules/neovim/default.nix
@@ -13,7 +13,7 @@
     rust-analyzer
     gopls
     nixd
-    typescript
+    nodePackages_latest.typescript-language-server
   ];
 
   programs.neovim = {