diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix
index 777720d..1baf40d 100644
--- a/home/linux/hyprland.nix
+++ b/home/linux/hyprland.nix
@@ -12,7 +12,11 @@
];
home.packages = with pkgs; [
- firefox
+ (
+ if pkgs.stdenv.isAarch64
+ then firefox-wv
+ else firefox
+ )
lxappearance
pipewire
polkit-kde-agent
@@ -23,9 +27,6 @@
rofi-wayland
];
- # required for firefox widevine
- home.sessionVariables.MOZ_GMP_PATH = "${pkgs.widevine}/gmp-widevinecdm/system-installed";
-
# notifications daemon
services.mako.enable = true;
diff --git a/home/linux/waybar.nix b/home/linux/waybar.nix
index bd7c44b..cae8ac8 100644
--- a/home/linux/waybar.nix
+++ b/home/linux/waybar.nix
@@ -8,6 +8,8 @@
networkInterface.eth =
if osConfig.networking.hostName == "voyager"
then "wlan0"
+ else if osConfig.networking.hostName == "nixbox"
+ then "enp6s0"
else "";
colors = config.lib.stylix.colors.withHashtag;
primaryColor = colors.base04;
@@ -78,7 +80,9 @@ in {
"battery" = {
"bat" = "macsmc-battery";
- "format" = "Battery: {capacity}%";
+ "format" = "Battery: {capacity}% (P)";
+ "format-charging" = "Battery: {capacity}% (C)";
+ "format-discharging" = "Battery: {capacity}% (D)";
};
"memory" = {
@@ -99,7 +103,7 @@ in {
"format-wifi" = "WiFi: Up: {bandwidthUpBits} Down: {bandwidthDownBits} ({signalStrength}%)";
"tooltip-format-wifi" = "{essid} ({signalStrength}%)";
"format-disconnected" = "Disconnected";
- "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui";
+ "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.iwd}/bin/iwctl";
};
"pulseaudio" = {
diff --git a/nixos/hosts/voyager/default.nix b/nixos/hosts/voyager/default.nix
index b529174..92c2ea6 100755
--- a/nixos/hosts/voyager/default.nix
+++ b/nixos/hosts/voyager/default.nix
@@ -15,7 +15,9 @@
inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
];
environment.sessionVariables.MOZ_GMP_PATH = ["${pkgs.widevine}/gmp-widevinecdm/system-installed"];
- environment.systemPackages = [pkgs.firefox];
+
+ environment.systemPackages = [pkgs.powertop];
+
services.logind = {
extraConfig = ''
HandlePowerKey=suspend
@@ -24,6 +26,8 @@
lidSwitch = "suspend";
};
+ powerManagement.powertop.enable = true;
+
boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
fileSystems."/" = {
diff --git a/packages/default.nix b/packages/default.nix
index d4a1f1a..225ed76 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,7 +1,7 @@
final: prev: {
widevine-installer = prev.callPackage ./widevine-installer.nix {};
widevine = prev.callPackage ./widevine.nix {};
- firefox = prev.firefox.override (old: {
+ firefox-wv = prev.firefox.override (old: {
extraPrefsFiles = ["${final.widevine-installer}/conf/gmpwidevine.js"];
});
}