fix infinite recursion by namespacing new pkgs

This commit is contained in:
Noah Masur
2025-02-24 21:14:38 -05:00
parent 3206b48f28
commit e7366f9510
13 changed files with 31 additions and 19 deletions

View File

@ -20,7 +20,7 @@ in
wallpaper = lib.mkOption {
type = lib.types.path;
description = "Wallpaper background image file";
default = "${pkgs.wallpapers}/gruvbox/road.jpg";
default = "${pkgs.nmasur.wallpapers}/gruvbox/road.jpg";
};
commands = {
launcher = lib.mkOption {

View File

@ -162,7 +162,7 @@ in
ramp-volume-0 = "";
ramp-volume-1 = "󰕾";
ramp-volume-2 = "";
click-right = config.audioSwitchCommand;
click-right = config.nmasur.presets.services.i3.commands.audioSwitch;
};
# "module/xkeyboard" = {
# type = "internal/xkeyboard";
@ -217,7 +217,7 @@ in
"module/power" = {
type = "custom/text";
content = " ";
click-left = config.powerCommand;
click-left = config.nmasur.presets.services.i3.commands.toggleBar;
click-right = "polybar-msg cmd restart";
content-foreground = config.theme.colors.base04;
};

View File

@ -14,23 +14,23 @@ let
increaseVolume = pkgs.writeShellScriptBin "increaseVolume" ''
${pkgs.pamixer}/bin/pamixer -i 2
volume=$(${pkgs.pamixer}/bin/pamixer --get-volume)
${pkgs.volnoti}/bin/volnoti-show $volume
${pkgs.nmasur.volnoti}/bin/volnoti-show $volume
'';
decreaseVolume = pkgs.writeShellScriptBin "decreaseVolume" ''
${pkgs.pamixer}/bin/pamixer -d 2
volume=$(${pkgs.pamixer}/bin/pamixer --get-volume)
${pkgs.volnoti}/bin/volnoti-show $volume
${pkgs.nmasur.volnoti}/bin/volnoti-show $volume
'';
toggleMute = pkgs.writeShellScriptBin "toggleMute" ''
${pkgs.pamixer}/bin/pamixer --toggle-mute
mute=$(${pkgs.pamixer}/bin/pamixer --get-mute)
if [ "$mute" == "true" ]; then
${pkgs.volnoti}/bin/volnoti-show --mute
${pkgs.nmasur.volnoti}/bin/volnoti-show --mute
else
volume=$(${pkgs.pamixer}/bin/pamixer --get-volume)
${pkgs.volnoti}/bin/volnoti-show $volume
${pkgs.nmasur.volnoti}/bin/volnoti-show $volume
fi
'';
in