diff options
Diffstat (limited to '')
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 9 | ||||
| -rw-r--r-- | home-manager/config/yambar/default.nix | 9 |
2 files changed, 11 insertions, 7 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 670b7a2c..7fc75590 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -15,12 +15,17 @@ inherit pkgs sysLib + # extra information + + system ; inherit (inputs) # bins + yambar_cpu + yambar_memory strip_js_comments river_init_lesser grades @@ -32,9 +37,6 @@ # modules impermanence - # extra information - - system ; }; }; @@ -47,7 +49,6 @@ # inputs.impermanence.nixosModules.home-manager.impermanence homeManagerConfig - ]; in { tiamat = inputs.nixpkgs.lib.nixosSystem { diff --git a/home-manager/config/yambar/default.nix b/home-manager/config/yambar/default.nix index 75f2afdc..46a19f0d 100644 --- a/home-manager/config/yambar/default.nix +++ b/home-manager/config/yambar/default.nix @@ -1,6 +1,7 @@ { config, sysLib, + system, pkgs, grades, yambar_cpu, @@ -19,15 +20,17 @@ } + "/bin/${builtins.baseNameOf file}"; in { - xdg.configFile."yambar/config.yml".source = builtins.substitueAll { + xdg.configFile."yambar/config.yml".source = pkgs.substituteAll { src = ./config/config.yml; volume_script = makeScript { - dependencies = builtins.attrValues {inherit (pkgs) pactl gawk;}; + dependencies = builtins.attrValues {inherit (pkgs) pulseaudio gawk;}; file = ./scripts/sound-volume.sh; }; grade_average_script = makeScript { - dependencies = [grades]; + dependencies = [ + grades.outputs.packages.${system}.default + ]; file = ./scripts/grades-average.sh; }; cpu_script = yambar_cpu; |