From 3b9d68da2d9e11d2c9463f5521818b2a5ff158e8 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 9 Mar 2022 11:11:24 +0100 Subject: [PATCH] Update flake.lock, apply API changes --- flake.lock | 36 ++++++++++++------------ home-manager/modules/firefox/default.nix | 24 +++++++++++++--- modules/sound/default.nix | 19 ++++++++++++- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index cdabb11..ef91f1f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1646107632, - "narHash": "sha256-jhmNDzNICcXc0p+Esi+uWCL1wOkGDyrJGBa0IEnkE08=", + "lastModified": 1646360966, + "narHash": "sha256-fJ/WHSU45bMJRDqz9yA3B2lwXtW5DKooU+Pzn13GyZI=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "47cbeddfbf60f5b4bbf8723e90b6106ef5da3fbb", + "rev": "511c3f6a88b6964e1496fb6f441f4ae5e58bd3ea", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1646039184, - "narHash": "sha256-RXA8DpvrHZ2Mhkzn2kC4higVBrU0eCOXsUqdpe9XCJ0=", + "lastModified": 1646643944, + "narHash": "sha256-JG/hDDUg6Ohn/lY57ZVSiK0ZINw7WOgssKa2dTYPdgY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a0d6dbea94083b76155ec770f5147f8664573025", + "rev": "1cb532d4b97185431c80beefb6454d0e67efd9fc", "type": "github" }, "original": { @@ -166,11 +166,11 @@ ] }, "locked": { - "lastModified": 1645970334, - "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", + "lastModified": 1646559628, + "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", + "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1645800619, - "narHash": "sha256-fCamVUDH0+nACV1P/rqtoD4YGon5HhnW3bU/0IjA8qI=", + "lastModified": 1646658584, + "narHash": "sha256-si7SXX8yO2sF/StgNJad5xOndekhsY4jL7++FNm+QuQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "05773c5d1584cebd5eda41675c3456dcabdef42a", + "rev": "aa5e966498a2bc4aaeb8fd979ccec985f85c5f75", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1646014761, - "narHash": "sha256-HdXvdU+wV+E1nNzG2vaQsUuBJQID3AB3BX88N8lA37M=", + "lastModified": 1646619817, + "narHash": "sha256-7CP5de05lc0r6JSMtrDYRxbDYJnBUTKDuYKy0shs7iU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c7d9566796b3ad5b257e187e1628488c7429b89e", + "rev": "6ee6a13b64ac9b577070ba235e3b1e35303ce7b1", "type": "github" }, "original": { diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix index cb7dbaa..18acc54 100644 --- a/home-manager/modules/firefox/default.nix +++ b/home-manager/modules/firefox/default.nix @@ -40,10 +40,26 @@ with lib; let else "horus") + " %u"; icon = "firefox"; - categories = "GNOME;GTK;Network;WebBrowser"; - mimeType = "text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;"; - startupNotify = "true"; - extraDesktopEntries = { + categories = ["GNOME" "GTK" "Network" "WebBrowser"]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/xml" + "application/rss+xml" + "application/rdf+xml" + "image/gif" + "image/jpeg" + "image/png" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + "x-scheme-handler/chrome" + "video/webm" + "application/x-xpinstall" + ]; + startupNotify = true; + extraConfig = { "X-MultipleArgs" = "false"; }; }; diff --git a/modules/sound/default.nix b/modules/sound/default.nix index e07f8b1..50ba7c9 100644 --- a/modules/sound/default.nix +++ b/modules/sound/default.nix @@ -16,7 +16,7 @@ in { enable = true; pulse.enable = true; media-session = { - enable = true; + enable = false; config = { bluez-monitor.rules = [ @@ -45,6 +45,23 @@ in { }; }; + environment.etc = { + bluez_monitor = { + target = "wireplumber/bluetooth.lua.d/50-bluez-config.lua"; + text = '' + bluez_monitor.properties = { + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.headset-roles"] = "[ hfp_hf hsp_hs hsp_ag hfp_ag ]", + ["bluez5.codecs"] = "[ sbc sbc_xq aac ]", + ["bluez5.hfphsp-backend"] = "native", + ["bluez5.default.rate"] = 48000, + ["bluez5.default.channels"] = 2, + } + ''; + }; + }; + security.rtkit.enable = true; environment.systemPackages = with pkgs; [pavucontrol];