diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index d5c1f98..750aeaf 100644
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -30,22 +30,4 @@ environment.systemPackages = with pkgs; [
     transmission_gtk
     transmission_remote_gtk
   ];
-
-  /* TODO: voir pour appliquer la personnalisation
-  nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
-      enablePluginPdf = true;
-      enablePluginRavatar = true;
-      enablePluginSmime = true;
-      enablePluginVcalendar = true;
-      enableSpellcheck = true;
-    };
-    mumble = pkgs.mumble.override { pulseSupport = true; };
-  };
-  */
-
-  #nixpkgs.config.permittedInsecurePackages = [
-  #  "webkitgtk-2.4.11"       # pour que le plugin fancy de claws-mail fonctionne
-  #];
 }
diff --git a/applications/overrides.nix b/applications/overrides.nix
new file mode 100644
index 0000000..71afe7e
--- /dev/null
+++ b/applications/overrides.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    clawsMail = pkgs.clawsMail.override {
+      enablePgp = true;
+      enablePluginArchive = true;
+      enablePluginFancy = false; # nécessite wekitgtk qui est troué
+      enablePluginPdf = true;
+      enablePluginRavatar = true;
+      enablePluginSmime = true;
+      enablePluginVcalendar = true;
+      enableSpellcheck = true;
+    };
+
+    ffmpeg-full = pkgs.ffmpeg-full.override {
+      nonfreeLicensing = true;
+      nvenc  = true;
+    };
+
+    gnuradio-with-packages = pkgs.gnuradio-with-packages.override {
+      extraPackages = with pkgs; [
+        gnuradio-ais
+        gnuradio-gsm
+        gnuradio-nacl
+        gnuradio-osmosdr
+        gnuradio-rds
+      ];
+    };
+
+    mumble = pkgs.mumble.override { pulseSupport = true; };
+  };
+
+  #nixpkgs.config.permittedInsecurePackages = [
+  #  "webkitgtk-2.4.11"       # pour que le plugin fancy de claws-mail fonctionne
+  #];
+}
diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix
index 19b2bfa..af23cb8 100644
--- a/applications/terminal/edition-video.nix
+++ b/applications/terminal/edition-video.nix
@@ -13,13 +13,4 @@ mkIf flags.edition-video {
   environment.systemPackages = with pkgs; [
     ffmpeg-full   # assemblage de flux audio & video en ligne de commande
   ];
-
-  /* TODO: voir pour appliquer la personnalisation
-  nixpkgs.config.packageOverrides = pkgs: {
-    ffmpeg-full = pkgs.ffmpeg-full.override {
-      nonfreeLicensing = true;
-      nvenc  = true;
-    };
-  };
-  */
 }
diff --git a/base.nix b/base.nix
index 0aaa718..c4d6c1d 100644
--- a/base.nix
+++ b/base.nix
@@ -6,6 +6,9 @@
     /*./config-generator.nix*/
     ./options.nix
 
+    # Redéfinition d'applications et de modules
+    ./applications/overrides.nix
+
     # subfolders
     ./applications/graphical/default.nix
     ./applications/terminal/default.nix