dad/configuration.nix

@@ -11,10 +11,11 @@
   ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = 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.enable = 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.
@@ -84,8 +85,8 @@
     libinput
     pciutils
     pulseaudio
-    (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })
-  ];
+    pwvucontrol
+    ];
 
   programs.firefox = {
     enable = true;
@@ -109,26 +110,28 @@
     user = "kemp";
     program = "${pkgs.writeScriptBin "start-cage-app" ''
       #!/usr/bin/env bash
-      exec ${ (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })}/bin/firefox
+      exec pwvucontrol
+      exec 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

kemptop/configuration.nix

@@ -150,20 +150,8 @@
     jdk
     gradle
     
-    
-    (pkgs.python3.withPackages (python-pkgs: with python-pkgs; [
-          requests
-          odfpy
-          websocket-client
-          selenium
-          webdriver-manager
-          pytest
-          pytest-html
-          python-dotenv
-          pillow
-          config
-    ]))
-    chromedriver
+    dconf
+    gsettings-desktop-schemas
     
     # GUI programs
 
@@ -180,7 +168,6 @@
     texstudio
     (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })
     google-chrome
-    chromium
     tor-browser
     zathura
     vlc