diff --git a/modules/home/windowManagers/hyprland/default.nix b/modules/home/windowManagers/hyprland/default.nix index aba89ff..365ddaa 100644 --- a/modules/home/windowManagers/hyprland/default.nix +++ b/modules/home/windowManagers/hyprland/default.nix @@ -252,8 +252,8 @@ in ", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous" ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" - ", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5" - ", XF86MonBrightnessUp, exec, ${pkgs.light}/bin/light -A 5" + ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +5" + ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5-" ]; }; }; diff --git a/modules/home/windowManagers/sway/default.nix b/modules/home/windowManagers/sway/default.nix index 358f299..272bdf1 100644 --- a/modules/home/windowManagers/sway/default.nix +++ b/modules/home/windowManagers/sway/default.nix @@ -320,8 +320,8 @@ in "${modifier}+Left" = "exec 'playerctl previous'"; # Backlight keys - "XF86MonBrightnessDown" = "exec '${pkgs.light}/bin/light -U 5'"; - "XF86MonBrightnessUp" = "exec '${pkgs.light}/bin/light -A 5'"; + "XF86MonBrightnessDown" = "exec '${pkgs.brightnessctl}/bin/brightnessctl set 5+'"; + "XF86MonBrightnessUp" = "exec '${pkgs.brightnessctl}/bin/brightnessctl set 5-'"; # Navigation diff --git a/overlays/signal-desktop-bin/default.nix b/overlays/signal-desktop/default.nix similarity index 79% rename from overlays/signal-desktop-bin/default.nix rename to overlays/signal-desktop/default.nix index be1b4c3..7941eec 100644 --- a/overlays/signal-desktop-bin/default.nix +++ b/overlays/signal-desktop/default.nix @@ -1,6 +1,6 @@ { ... }: (final: prev: { - signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (oldAttrs: { + signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.makeWrapper ]; postInstall = oldAttrs.postInstall or "" + '' wrapProgram $out/bin/signal-desktop \ diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix index e1a43bd..7d3ae69 100644 --- a/systems/x86_64-linux/carbon/default.nix +++ b/systems/x86_64-linux/carbon/default.nix @@ -82,7 +82,7 @@ hugo nixos-generators vlc - signal-desktop-bin + signal-desktop zoom-us ]; environment.pathsToLink = [ @@ -90,8 +90,6 @@ "/share/xdg-desktop-portal" ]; - programs.light.enable = true; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 342ac2d..f1376a3 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -202,7 +202,7 @@ prusa-slicer esptool minicom - signal-desktop-bin + signal-desktop ncdu cntr