diff --git a/desktop.nix b/desktop.nix
index 1d92a58..7607c6e 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -90,7 +90,7 @@ in {
       jack.enable = true;
       alsa.enable = true;
       alsa.support32Bit = mkDefault true;
-      media-session.enable = true;
+      wireplumber.enable = true;
     };
     security.rtkit.enable = true; # Real-time support for pipewire
 
@@ -207,7 +207,7 @@ in {
     services.packagekit.enable = true;
     
     networking.networkmanager = {
-      packages = [
+      plugins = [
         pkgs.networkmanager-openvpn
       ];
     };
diff --git a/filesystems.nix b/filesystems.nix
index 54f3988..3884e6b 100644
--- a/filesystems.nix
+++ b/filesystems.nix
@@ -83,9 +83,10 @@ in
       )
     ]);
 
+    boot.initrd.services.udev.rules = concatStringsSep "\n" cfg.udevRules;
+
     services.udev = {
       extraRules = concatStringsSep "\n" cfg.udevRules;
-      initrdRules = concatStringsSep "\n" cfg.udevRules;
     };
 
     boot.tmpOnTmpfs = true;
diff --git a/general.nix b/general.nix
index 8a8e04e..56731c8 100644
--- a/general.nix
+++ b/general.nix
@@ -29,6 +29,10 @@ let
   };
 in
 {
+  imports = [
+    (mkRemovedOptionModule [ "aviallon" "general" "flakes" "enable" ] "Flakes are now enabled by default")
+  ];
+
   options.aviallon.general = {
     enable = mkOption {
       default = true;
@@ -56,7 +60,6 @@ in
       type = types.str;
     };
     unsafeOptimizations = mkEnableOption "unsafe system tuning";
-    flakes.enable = mkEnableOption "experimental flake support";
     debug = mkEnableOption "debug-specific configuration";
   };
 
diff --git a/network.nix b/network.nix
index 428c0ad..1f64ab5 100644
--- a/network.nix
+++ b/network.nix
@@ -41,7 +41,7 @@ in
     networking.networkmanager = {
       wifi.backend = mkDefault "iwd";
       dns = mkDefault cfg.dns;
-      packages = with pkgs; concatLists [
+      plugins = with pkgs; concatLists [
         (optional (cfg.dns == "dnsmasq") dnsmasq)
       ];
     };
diff --git a/nix.nix b/nix.nix
index 7e31482..edd9550 100644
--- a/nix.nix
+++ b/nix.nix
@@ -29,9 +29,7 @@ in
     
     nix.extraOptions = myLib.config.toNix {
       builders-use-substitutes = true;
-      experimental-features = concatLists [
-        (optionals generalCfg.flakes.enable ["nix-command" "flakes"])
-      ];
+      experimental-features = [ "nix-command" "flakes"];
       download-attempts = 5;
       stalled-download-timeout = 20;
     };