diff --git a/nixos/base.nix b/nixos/base.nix
index e846fd3c..6a9aca6d 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -47,15 +47,15 @@ makeEnable config "myModules.base" true {
 
   # Audio
 
-  services.pulseaudio.enable = true;
-  services.pulseaudio.extraConfig = "load-module module-dbus-protocol";
+  security.rtkit.enable = true;
+  services.pulseaudio.enable = false;
   services.pipewire = {
-    enable = false;
-    systemWide = true;
+    enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     jack.enable = true;
     pulse.enable = true;
+    wireplumber.enable = true;
   };
 
   # Bluetooth
diff --git a/nixos/electron.nix b/nixos/electron.nix
index e9c7203d..d8a4a691 100644
--- a/nixos/electron.nix
+++ b/nixos/electron.nix
@@ -3,37 +3,42 @@
   config,
   makeEnable,
   ...
-}:
-makeEnable config "myModules.electron" false {
-  environment.systemPackages = with pkgs; [
-    element-desktop
-    # bitwarden
-    discord
-    # etcher
-    # keybase-gui
-    zoom-us
-  ];
-  home-manager.sharedModules = [
-    (
-      if pkgs.stdenv.hostPlatform.system == "x86_64-linux"
-      then {
-        # systemd.user.services.bitwarden = {
-        #   Unit = {
-        #     Description = "Bitwarden";
-        #     After = [ "graphical-session-pre.target" "tray.target" ];
-        #     PartOf = [ "graphical-session.target" ];
-        #   };
+}: let
+  discordWayland = pkgs.discord.override {
+    commandLineArgs = "--enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true";
+  };
+in
+  makeEnable config "myModules.electron" false {
+    environment.systemPackages = with pkgs; [
+      element-desktop
+      # bitwarden
+      discordWayland
+      vesktop
+      # etcher
+      # keybase-gui
+      zoom-us
+    ];
+    home-manager.sharedModules = [
+      (
+        if pkgs.stdenv.hostPlatform.system == "x86_64-linux"
+        then {
+          # systemd.user.services.bitwarden = {
+          #   Unit = {
+          #     Description = "Bitwarden";
+          #     After = [ "graphical-session-pre.target" "tray.target" ];
+          #     PartOf = [ "graphical-session.target" ];
+          #   };
 
-        #   Install = { WantedBy = [ "graphical-session.target" ]; };
+          #   Install = { WantedBy = [ "graphical-session.target" ]; };
 
-        #   Service = {
-        #     ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
-        #     Restart = "always";
-        #     RestartSec = 3;
-        #   };
-        # };
-      }
-      else {}
-    )
-  ];
-}
+          #   Service = {
+          #     ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
+          #     Restart = "always";
+          #     RestartSec = 3;
+          #   };
+          # };
+        }
+        else {}
+      )
+    ];
+  }