feat: various nixos fixes and improvements

bluetooth: trying to disable handsfree mode (wip)
fonts: conform to new font pkg naming

4 files changed, 54 insertions, 36 deletions

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 57244ae..6d6fe6f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -65,11 +65,7 @@
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;
-    settings = {
-      General = {
-        Disable = "Headset";
-      };
-    };
+    settings = {General = {Disable = "Handsfree,Headset";};};
   };
   specialisation = {
     in-china.configuration = {
@@ -116,6 +112,7 @@
     libsForQt5.qt5.qtquickcontrols2
     libsForQt5.qt5.qtgraphicaleffects
     blender
+    trash-cli
     #inputs.hyprswitch.packages.x86_64-linux.default
   ];
   # turned off because timedatectl doesn't like it
@@ -144,7 +141,10 @@
   #};
   nixpkgs = {
     overlays = [];
-    config = {allowUnfree = true;};
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = ["dotnet-core-combined"];
+    };
   };
 
   nix = let
diff --git a/nixos/fonts.nix b/nixos/fonts.nix
index d8d32a6..2c29f8c 100644
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -1,32 +1,27 @@
 {pkgs, ...}: {
-  fonts.packages = with pkgs; [
-    helvetica-neue-lt-std
-    aileron
-    corefonts
-    vistafonts
-    vistafonts-chs
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-emoji
-    liberation_ttf
-    mplus-outline-fonts.githubRelease
-    dina-font
+  fonts.packages = with pkgs;
+    [
+      helvetica-neue-lt-std
+      aileron
+      corefonts
+      vistafonts
+      vistafonts-chs
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-emoji
+      liberation_ttf
+      mplus-outline-fonts.githubRelease
+      dina-font
 
-    #proggyfonts
-    #glasstty-ttf
-    (
-      nerdfonts.override {
-        fonts = [
-          "FiraCode"
-          "IBMPlexMono"
-          "IntelOneMono"
-          "CascadiaMono"
-          "CommitMono"
-          "JetBrainsMono"
-          "ProggyClean"
-        ];
-      }
-    )
-    monocraft
-  ];
+      #proggyfonts
+      #glasstty-ttf
+    ]
+    ++ (with nerd-fonts; [
+      ubuntu-mono
+      jetbrains-mono
+      intone-mono
+      fira-code
+      commit-mono
+      blex-mono
+    ]);
 }
diff --git a/nixos/services/pipewire.service.nix b/nixos/services/pipewire.service.nix
index 03e82ef..be0cc76 100644
--- a/nixos/services/pipewire.service.nix
+++ b/nixos/services/pipewire.service.nix
@@ -41,6 +41,26 @@ in {
     jack.enable = true;
     wireplumber.configPackages = [
       (pkgs.writeTextDir
+        "share/wireplumber/wireplumber.conf.d/52-profile-switch.conf" ''
+          wireplumber.settings = {
+            bluetooth.autoswitch-to-headset-profile = false
+          }
+
+          monitor.bluez.properties = {
+            ## Supported roles: hsp_hs (HSP Headset),
+            ##                  hsp_ag (HSP Audio Gateway),
+            ##                  hfp_hf (HFP Hands-Free),
+            ##                  hfp_ag (HFP Audio Gateway)
+            ##                  a2dp_sink (A2DP Audio Sink)
+            ##                  a2dp_source (A2DP Audio Source)
+            ##                  bap_sink (LE Audio Basic Audio Profile Sink)
+            ##                  bap_source (LE Audio Basic Audio Profile Source)
+            ## --
+            ## Only enable A2DP here and disable HFP. See note at the top as to why.
+            bluez5.roles = [ a2dp_sink a2dp_source ]
+          }
+        '')
+      (pkgs.writeTextDir
         "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
           bluez_monitor.properties = {
           ["bluez5.enable-sbc-xq"] = true,
diff --git a/nixos/virtualisation.nix b/nixos/virtualisation.nix
index dfc8896..ccf9fe9 100644
--- a/nixos/virtualisation.nix
+++ b/nixos/virtualisation.nix
@@ -4,7 +4,10 @@
   config,
   ...
 }: {
-  virtualisation.libvirtd.enable = true;
+  virtualisation = {
+    libvirtd.enable = true;
+    waydroid.enable = true;
+  };
   programs.virt-manager.enable = true;
   #virtualisation.vmware.host.enable = true;
   #virtualisation.virtualbox.host = {