diff --git a/hosts/MaxNixosLaptop/configuration.nix b/hosts/MaxNixosLaptop/configuration.nix
index fe7dc70..8e58df0 100644
--- a/hosts/MaxNixosLaptop/configuration.nix
+++ b/hosts/MaxNixosLaptop/configuration.nix
@@ -58,23 +58,6 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
@@ -102,20 +85,9 @@
     neovim
     wget
     fprintd
-    binutils
-    usbutils
-    pciutils
     home-manager
     git
-    gcc
-    clang
-    clang_multi
-    libclang
-    clang-tools
     alejandra
-    libnotify
-    gnomeExtensions.hibernate-status-button
-    ffmpeg
   ];
 
   fonts.packages = with pkgs; [
@@ -132,17 +104,6 @@
   programs.ssh.startAgent = true;
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [
-    glfw
-    wayland-protocols
-    libxkbcommon
-    xorg.libX11
-    xorg.libXinerama
-    xorg.libXcursor
-    xorg.libXrandr
-    xorg.libXi
-    xorg.libXext
-    libGL
-    libGLU
   ];
 
   programs.zsh.enable = true;
diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix
index 44903ad..95c7029 100644
--- a/modules/nixos/sway.nix
+++ b/modules/nixos/sway.nix
@@ -50,6 +50,7 @@ in {
     wdisplays # tool to configure displays
   ];
 
+  sound.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -58,6 +59,7 @@ in {
     jack.enable = true;
     wireplumber.enable = true;
   };
+  security.rtkit.enable = true;
 
   # xdg-desktop-portal works by exposing a series of D-Bus interfaces
   # known as portals under a well-known name