diff --git a/README.md b/README.md index 8397ef6..5aaf8bb 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Alternatively, if you're using NixOS and/or Home-Manager, you can setup AGS usin inherit system; # ... overlays = [ - inputs.hyprpanel.overlay.${system} + inputs.hyprpanel.overlay ]; }; in { diff --git a/nix/default.nix b/nix/default.nix index 16e1ece..67b7c7f 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,36 +1,36 @@ -{ inputs -, pkgs -, system -, stdenv -, lib -, writeShellScriptBin -, bun -, dart-sass -, fd -, accountsservice -, btop -, pipewire -, bluez -, bluez-tools -, grimblast -, gpu-screen-recorder -, networkmanager -, brightnessctl -, matugen -, swww -, python3 -, gnome -}: -let +{ + inputs, + pkgs, + system, + stdenv, + lib, + writeShellScriptBin, + bun, + dart-sass, + fd, + accountsservice, + btop, + pipewire, + bluez, + bluez-tools, + grimblast, + gpu-screen-recorder, + networkmanager, + brightnessctl, + matugen, + swww, + python3, + gnome, +}: let ags = inputs.ags.packages.${system}.default.override { - extraPackages = [ accountsservice ]; + extraPackages = [accountsservice]; }; pname = "hyprpanel"; config = stdenv.mkDerivation { inherit pname; version = "latest"; - src = ./.; + src = ../.; buildPhase = '' ${bun}/bin/bun build ./main.ts \ @@ -48,12 +48,11 @@ let cp -f main.js $out/config.js ''; }; -in -{ +in { desktop = { inherit config; script = writeShellScriptBin pname '' - export PATH=$PATH:${lib.makeBinPath [dart-sass fd btop pipewire bluez bluez-tools grimblast gpu-screen-recorder brightnessctl gnome.gnome-bluetooth python3]} + export PATH=$PATH:${lib.makeBinPath [dart-sass fd btop pipewire bluez bluez-tools networkmanager matugen swww grimblast gpu-screen-recorder brightnessctl gnome.gnome-bluetooth python3]} ${ags}/bin/ags -b hyprpanel -c ${config}/config.js $@ ''; };