From f5a1f5d3968e457390717e24ce14e194f9a7d373 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Mon, 10 Mar 2025 14:32:12 +0100
Subject: [PATCH] nixy: add pw keybindings, disable waydroid

---
 nixy/configuration.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/nixy/configuration.nix b/nixy/configuration.nix
index f02aa66..4f6413f 100644
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -88,7 +88,7 @@ in
       "psmouse.synaptics_intertouch=0"
       "mem_sleep_default=deep"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    #kernelPackages = pkgs.linuxPackages_latest;
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
@@ -236,6 +236,13 @@ in
       enable = true;
       binfmt = true;
     };
+    nix-ld = {
+      enable = true;
+      libraries = with pkgs; [
+        stdenv.cc.cc.lib
+        zlib
+      ];
+    };
     zsh.enable = true;
     firejail.enable = true;
     adb.enable = true;
@@ -372,6 +379,7 @@ in
     acpid.enable = true;
     dbus.enable = true;
     dbus.implementation = "broker";
+    envfs.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -438,9 +446,9 @@ in
       enable = true;
       bindings = [
         {
-          keys = [ 113 ];
+          keys = [ 115 ];
           events = [ "key" ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
         }
 
         {
@@ -449,16 +457,16 @@ in
             "key"
             "rep"
           ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
         }
 
         {
-          keys = [ 115 ];
+          keys = [ 113 ];
           events = [
             "key"
             "rep"
           ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
         }
 
         {
@@ -591,6 +599,7 @@ in
   };
 
   virtualisation = {
+    waydroid.enable = false;
     libvirtd = {
       enable = true;
       allowedBridges = [