From 82d03af80a4fd235e8a2f567987795615af8282b Mon Sep 17 00:00:00 2001
From: Stefan Kempinger <kempinger@ins.jku.at>
Date: Sun, 26 Apr 2026 15:25:52 +0200
Subject: [PATCH] push latest state from dad machine

---
 dad/configuration.nix | 45 ++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/dad/configuration.nix b/dad/configuration.nix
index 267f58f..70b2ddb 100644
--- a/dad/configuration.nix
+++ b/dad/configuration.nix
@@ -11,11 +11,10 @@
   ];
 
   # Bootloader.
-  #boot.loader.systemd-boot.enable = true;
-  #boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  #boot.loader.grub.device = "/dev/vda";
+  #boot.loader.grub.useOSProber = true;
 
   networking.hostName = "nixos-dad"; # Define your hostname.
   networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -85,8 +84,8 @@
     libinput
     pciutils
     pulseaudio
-    pwvucontrol
-    ];
+    (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })
+  ];
 
   programs.firefox = {
     enable = true;
@@ -110,28 +109,26 @@
     user = "kemp";
     program = "${pkgs.writeScriptBin "start-cage-app" ''
       #!/usr/bin/env bash
-      exec pwvucontrol
-      exec firefox
+      exec ${ (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })}/bin/firefox
     ''}/bin/start-cage-app";
   };
   services.getty.loginProgram = "${pkgs.coreutils}/bin/true";
 
   services.actkbd.enable = true;
-  services.actkbd.bindings = [
-    # Mute
-    { keys = [ 113 ]; events = [ "key" ];
-      command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-    }
-    # Volume down
-    { keys = [ 114 ]; events = [ "key" "rep" ];
-      command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
-    }
-    # Volume up
-    { keys = [ 115 ]; events = [ "key" "rep" ];
-      command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
-    }
-  ];
-  
+           services.actkbd.bindings = [
+             # Mute
+             { keys = [ 113 ]; events = [ "key" ];
+               command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+             }
+             # Volume down
+             { keys = [ 114 ]; events = [ "key" "rep" ];
+               command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
+             }
+             # Volume up
+             { keys = [ 115 ]; events = [ "key" "rep" ];
+               command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
+             }
+           ];
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true; # if not already enabled