diff --git a/flake.lock b/flake.lock index 71a33c6..502fa20 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1727168378, - "narHash": "sha256-BvJuLTdqkKKzeVL8txVOTEUNWxZ1dfVdo02NdZUV+nU=", + "lastModified": 1730842284, + "narHash": "sha256-s0doicDkqzCqHvplBnjWPJtGJwajjDdfVkmmPu32l6Q=", "ref": "refs/heads/master", - "rev": "fbaec141c01e8b3376850bd98aabeadf9fad0fcf", - "revCount": 351, + "rev": "b528be94260b572919ff47d2f5e3150ebc1ee3e9", + "revCount": 368, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, diff --git a/flake.nix b/flake.nix index 88aff80..b685019 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + url = "git+https://git.outfoxxed.me/quickshell/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -19,6 +19,10 @@ srcpath = "${quickshell}/src"; }; + quickshell-types = pkgs.callPackage ./types.nix { + srcpath = "${quickshell}/src"; + }; + default = quickshell-docs; }); }; diff --git a/types.nix b/types.nix new file mode 100644 index 0000000..f4db295 --- /dev/null +++ b/types.nix @@ -0,0 +1,23 @@ +{ + stdenv, + nix-gitignore, + just, + + callPackage, + typegen ? (callPackage ./typegen {}), + srcpath ? ../src, +}: stdenv.mkDerivation { + name = "quickshell-types"; + version = "0.1.0"; + src = nix-gitignore.gitignoreSource "/typegen\n" ./.; + + buildInputs = [ just typegen ]; + + buildPhase = '' + SRC_PATH="${srcpath}" TYPEGEN=typegen just typedocs + ''; + + installPhase = '' + mv ./data/modules $out + ''; +}