Disables aarch64 widevine on x86

This commit is contained in:
willemml 2024-02-04 11:44:03 -08:00
parent c3bdc4210e
commit 7db994fba7
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
4 changed files with 17 additions and 8 deletions

View file

@ -12,7 +12,11 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
firefox (
if pkgs.stdenv.isAarch64
then firefox-wv
else firefox
)
lxappearance lxappearance
pipewire pipewire
polkit-kde-agent polkit-kde-agent
@ -23,9 +27,6 @@
rofi-wayland rofi-wayland
]; ];
# required for firefox widevine
home.sessionVariables.MOZ_GMP_PATH = "${pkgs.widevine}/gmp-widevinecdm/system-installed";
# notifications daemon # notifications daemon
services.mako.enable = true; services.mako.enable = true;

View file

@ -8,6 +8,8 @@
networkInterface.eth = networkInterface.eth =
if osConfig.networking.hostName == "voyager" if osConfig.networking.hostName == "voyager"
then "wlan0" then "wlan0"
else if osConfig.networking.hostName == "nixbox"
then "enp6s0"
else ""; else "";
colors = config.lib.stylix.colors.withHashtag; colors = config.lib.stylix.colors.withHashtag;
primaryColor = colors.base04; primaryColor = colors.base04;
@ -78,7 +80,9 @@ in {
"battery" = { "battery" = {
"bat" = "macsmc-battery"; "bat" = "macsmc-battery";
"format" = "<span color='${primaryColor}'>Battery: {capacity}%</span>"; "format" = "<span color='${primaryColor}'>Battery: {capacity}% (P)</span>";
"format-charging" = "<span color='${primaryColor}'>Battery: {capacity}% (C)</span>";
"format-discharging" = "<span color='${primaryColor}'>Battery: {capacity}% (D)</span>";
}; };
"memory" = { "memory" = {
@ -99,7 +103,7 @@ in {
"format-wifi" = "<span color='${primaryColor}'>WiFi: Up: {bandwidthUpBits} Down: {bandwidthDownBits} ({signalStrength}%)</span>"; "format-wifi" = "<span color='${primaryColor}'>WiFi: Up: {bandwidthUpBits} Down: {bandwidthDownBits} ({signalStrength}%)</span>";
"tooltip-format-wifi" = "<span color='${primaryColor}'>{essid} ({signalStrength}%)</span>"; "tooltip-format-wifi" = "<span color='${primaryColor}'>{essid} ({signalStrength}%)</span>";
"format-disconnected" = "<span color='${primaryColor}'>Disconnected</span>"; "format-disconnected" = "<span color='${primaryColor}'>Disconnected</span>";
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui"; "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.iwd}/bin/iwctl";
}; };
"pulseaudio" = { "pulseaudio" = {

View file

@ -15,7 +15,9 @@
inputs.nixos-apple-silicon.nixosModules.apple-silicon-support inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
]; ];
environment.sessionVariables.MOZ_GMP_PATH = ["${pkgs.widevine}/gmp-widevinecdm/system-installed"]; environment.sessionVariables.MOZ_GMP_PATH = ["${pkgs.widevine}/gmp-widevinecdm/system-installed"];
environment.systemPackages = [pkgs.firefox];
environment.systemPackages = [pkgs.powertop];
services.logind = { services.logind = {
extraConfig = '' extraConfig = ''
HandlePowerKey=suspend HandlePowerKey=suspend
@ -24,6 +26,8 @@
lidSwitch = "suspend"; lidSwitch = "suspend";
}; };
powerManagement.powertop.enable = true;
boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"]; boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
fileSystems."/" = { fileSystems."/" = {

View file

@ -1,7 +1,7 @@
final: prev: { final: prev: {
widevine-installer = prev.callPackage ./widevine-installer.nix {}; widevine-installer = prev.callPackage ./widevine-installer.nix {};
widevine = prev.callPackage ./widevine.nix {}; widevine = prev.callPackage ./widevine.nix {};
firefox = prev.firefox.override (old: { firefox-wv = prev.firefox.override (old: {
extraPrefsFiles = ["${final.widevine-installer}/conf/gmpwidevine.js"]; extraPrefsFiles = ["${final.widevine-installer}/conf/gmpwidevine.js"];
}); });
} }