diff --git a/flake.lock b/flake.lock index 30c1a88..2417d92 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1725841979, - "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", + "lastModified": 1727303518, + "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", "owner": "Aylur", "repo": "ags", - "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", + "rev": "cd543afec4d9ed708990e5ba52184716809bf248", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d09503c..685fed7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,31 +2,29 @@ description = "A Bar/Panel for Hyprland with extensive customizability."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; ags.url = "github:Aylur/ags"; }; - outputs = inputs: - let - systems = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-darwin" - "aarch64-linux" - ]; - forEachSystem = inputs.nixpkgs.lib.genAttrs systems; - pkgsFor = forEachSystem ( - system: + outputs = inputs: let + systems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; + forEachSystem = inputs.nixpkgs.lib.genAttrs systems; + pkgsFor = forEachSystem ( + system: import inputs.nixpkgs { inherit system; config.allowUnfree = true; } - ); + ); - devShellFor = - system: - inputs.nixpkgs.lib.genAttrs [ "default" ] ( - _: + devShellFor = system: + inputs.nixpkgs.lib.genAttrs ["default"] ( + _: inputs.nixpkgs.legacyPackages.${system}.mkShell { buildInputs = [ pkgsFor.${system}.esbuild @@ -59,26 +57,22 @@ export GI_TYPELIB_PATH=${pkgsFor.${system}.libgtop}/lib/girepository-1.0:${pkgsFor.${system}.glib}/lib/girepository-1.0:$GI_TYPELIB_PATH ''; } - ); - in - { - devShells = forEachSystem devShellFor; - - overlay = final: prev: { - hyprpanel = - if final ? callPackage - then (final.callPackage ./nix { inherit inputs; }).desktop.script - else inputs.self.packages.${prev.stdenv.system}.default; - }; - packages = forEachSystem ( - system: - let - pkgs = pkgsFor.${system}; - in - { - default = (pkgs.callPackage ./nix { inherit inputs; }).desktop.script; - } ); - }; -} + in { + devShells = forEachSystem devShellFor; + overlay = final: prev: { + hyprpanel = + if final ? callPackage + then (final.callPackage ./nix {inherit inputs;}).desktop.script + else inputs.self.packages.${prev.stdenv.system}.default; + }; + packages = forEachSystem ( + system: let + pkgs = pkgsFor.${system}; + in { + default = (pkgs.callPackage ./nix {inherit inputs;}).desktop.script; + } + ); + }; +}