diff --git a/configuration.nix b/configuration.nix
index bf0fcc7..7f09a99 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,6 +11,8 @@
     ./hardware-configuration.nix
     #user home configuration
     ./users
+	#
+	./modules/pipewire.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
@@ -96,7 +98,7 @@
     initialPassword = "ctie";
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZixkix0KfKuq7Q19whS5FQQg51/AJGB5BiNF/7h/LM"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSXqbGLOeTVFRgeafkCJ1IRMyxl3/VcpLRdAJ7Br3CW"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxD4GOrwrBTG4/qQhm5hoSB2CP7W9g1LPWP11oLGOjQ"
     ];
     shell = pkgs.zsh;
   };
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
new file mode 100644
index 0000000..fbff078
--- /dev/null
+++ b/modules/pipewire.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [pulseaudio pulsemixer];
+
+  hardware.pulseaudio.enable = lib.mkForce false;
+  hardware.bluetooth.enable = true;
+
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    #jack.enable = true;
+    pulse.enable = true;
+    config = {
+      pipewire."context.properties"."default.clock.allowed-rates" = [
+        44100
+        48000
+        88200
+        96000
+        176400
+        192000
+        358000
+        384000
+        716000
+        768000
+      ];
+      pipewire-pulse."stream.properties"."resample.quality" = 15;
+      client."stream.properties"."resample.quality" = 15;
+      client-rt."stream.properties"."resample.quality" = 15;
+    };
+  };
+
+  sound.enable = true;
+}
diff --git a/users/common/default.nix b/users/common/default.nix
index 3878c16..5d1f518 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -13,9 +13,11 @@
     bat
     ripgrep
 	killall
-	fzf
   ];
 
+  # has to be enabled to support zsh reverse search
+  programs.fzf.enable = true;
+
   programs.gpg = {
     enable = true;
 	settings = import ../../data/gpg/gpg.conf.nix;
@@ -74,11 +76,11 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxD4GOrwrBTG4/qQhm5hoSB2CP7W9g1LPWP11oLGOjQ
     defaultEditor = true;
     withNodeJs = true;
   };
-
   xdg.configFile.nvim = {
     recursive = true;
     source = ../../data/nvim;
   };
+
   programs.git.enable = true;
   services.gpg-agent = {
     enable = true;
diff --git a/users/common/zsh.nix b/users/common/zsh.nix
index 4028ebc..a8b21fe 100644
--- a/users/common/zsh.nix
+++ b/users/common/zsh.nix
@@ -1,4 +1,4 @@
-  {config,pkgs,...}:
+{  config,pkgs,...}:
 {
   programs.zsh = {
     enable = true;
diff --git a/users/patrick.nix b/users/patrick.nix
index d4b8a27..25afc23 100644
--- a/users/patrick.nix
+++ b/users/patrick.nix
@@ -9,6 +9,7 @@
       thunderbird
       discord
 	  bitwarden
+	  nextcloud-client
     ];
   };
   imports = [