diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix
index 992b178..543594a 100644
--- a/home/features/desktop/media.nix
+++ b/home/features/desktop/media.nix
@@ -21,7 +21,9 @@ in {
       ffmpeg_6-full
       gst_all_1.gstreamer
       gst_all_1.gst-vaapi
+      handbrake
       kdePackages.kdenlive
+      makemkv
       mpv
       pamixer
       pavucontrol
diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix
index 6df5604..261dff0 100644
--- a/home/m3tam3re/home.nix
+++ b/home/m3tam3re/home.nix
@@ -24,6 +24,7 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
+    aider-chat-env
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello
diff --git a/hosts/common/extraServices/wireguard.nix b/hosts/common/extraServices/wireguard.nix
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/hosts/common/extraServices/wireguard.nix
@@ -0,0 +1 @@
+
diff --git a/pkgs/aider-chat-env/default.nix b/pkgs/aider-chat-env/default.nix
new file mode 100644
index 0000000..2873e41
--- /dev/null
+++ b/pkgs/aider-chat-env/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  python3,
+  zlib,
+  libffi,
+  makeWrapper,
+}: let
+  pythonEnv = python3.withPackages (ps:
+    with ps; [
+      # Add any Python packages you want available globally here
+      virtualenv
+    ]);
+in
+  stdenv.mkDerivation rec {
+    pname = "aider-chat-env";
+    version = "0.1.0";
+
+    src = ./.;
+
+    nativeBuildInputs = [makeWrapper];
+    buildInputs = [pythonEnv zlib libffi];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cat > $out/bin/aider-chat-env <<EOF
+      #!/bin/sh
+      VENV_DIR="\$HOME/.aider-chat-venv"
+      if [ ! -d "\$VENV_DIR" ]; then
+        ${pythonEnv}/bin/python -m venv "\$VENV_DIR"
+      fi
+      source "\$VENV_DIR/bin/activate"
+      python -m pip install -U aider-chat
+      exec "\$SHELL"
+      EOF
+      chmod +x $out/bin/aider-chat-env
+    '';
+
+    postFixup = ''
+      wrapProgram $out/bin/aider-chat-env \
+        --prefix PATH : ${lib.makeBinPath buildInputs} \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [stdenv.cc.cc.lib zlib libffi]}
+    '';
+
+    meta = with lib; {
+      description = "Python environment with aider-chat";
+      license = licenses.mit;
+      platforms = platforms.all;
+    };
+  }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 321a739..e77a39d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,5 @@
 {pkgs, ...}: {
   # Define your custom packages here
   zellij-ps = pkgs.callPackage ./zellij-ps {};
+  aider-chat-env = pkgs.callPackage ./aider-chat-env {};
 }
diff --git a/secrets.nix b/secrets.nix
new file mode 100644
index 0000000..13db831
--- /dev/null
+++ b/secrets.nix
@@ -0,0 +1,18 @@
+let
+  # SYSTEMS
+  m3-ares = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU=";
+  m3-kratos = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDl+LtFGsk/A7BvxwiUCyq5wjRzGtQSrBJzzLGxINF4O";
+
+  systems = [
+    m3-ares
+    m3-kratos
+  ];
+in {
+  "secrets/m3tam3re-secrets.age".publicKeys = systems;
+  "secrets/tailscale-key.age".publicKeys = systems;
+  "secrets/wg-DE.age".publicKeys = systems;
+  "secrets/wg-NL.age".publicKeys = systems;
+  "secrets/wg-NO.age".publicKeys = systems;
+  "secrets/wg-US.age".publicKeys = systems;
+  "secrets/wg-BR.age".publicKeys = systems;
+}