noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-07-06 19:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix infinite recursion by namespacing new pkgs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
platforms/home-manager/modules/nmasur/presets/programs/fish.nix
View File

@ -1,5 +1,6 @@
{
config,
pkgs,
lib,
...
}:
@ -43,7 +44,7 @@ in
body = builtins.readFile ./functions/fish_user_key_bindings.fish;
};
ip = {
body = builtins.readFile ./functions/ip.fish;
body = lib.getExe pkgs.nmasur.ip-check;
};
json = {
description = "Tidy up JSON using jq";

2
platforms/home-manager/modules/nmasur/presets/programs/github.nix
View File

@ -20,7 +20,7 @@ in
gitCredentialHelper.enable = true;
settings.git_protocol = "https";
extensions = [
pkgs.gh-collaborators
pkgs.nmasur.gh-collaborators
pkgs.gh-dash
pkgs.gh-copilot
];

2
platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix
View File

@ -47,7 +47,7 @@ in
pkgs.ponymix
rofi
];
text = builtins.readFile ./rofi/pulse-sink.sh;
text = builtins.readFile ./pulse-sink.sh;
}
);
};

2
platforms/home-manager/modules/nmasur/presets/services/i3.nix
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 {

4
platforms/home-manager/modules/nmasur/presets/services/polybar.nix
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;
};

8
platforms/home-manager/modules/nmasur/presets/services/volnoti.nix
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