From a5606ce51d74b63bc73f9ed0cfe5c3bb1234d342 Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sun, 25 Aug 2024 18:18:23 +0200 Subject: [PATCH] feat: change qs package to fork including qml lib generation for linter --- flake.lock | 18 +++++++++--------- flake.nix | 12 +++++++++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8969c4c..e0e35d3 100644 --- a/flake.lock +++ b/flake.lock @@ -23,17 +23,17 @@ ] }, "locked": { - "lastModified": 1724197264, - "narHash": "sha256-kw8zZyskszCECn8Di6z7WSquBiP7UGCb3SNN5EAF6BE=", - "ref": "refs/heads/master", - "rev": "f95e7dbaf61b9868acc912896e65126bb1ee048c", - "revCount": 304, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "lastModified": 1724598086, + "narHash": "sha256-RwLvR0p1vnGDFz9qXz6QLaFPQ751doKLG1ROWZh6zcA=", + "owner": "Nydragon", + "repo": "quickshell", + "rev": "7aa93ccf9ddb383e54a742cccba27cff37a43c8c", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "owner": "Nydragon", + "repo": "quickshell", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index 4514beb..b113614 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ utils.url = "github:numtide/flake-utils"; quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + #url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + url = "github:Nydragon/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -17,10 +18,15 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; - quickshell = inputs.quickshell.packages.${system}.default; + quickshell = inputs.quickshell.packages.${system}.default.override { withQMLLib = true; }; in { - devShell = pkgs.mkShell { buildInputs = [ quickshell ]; }; + devShell = pkgs.mkShell { + buildInputs = [ + quickshell + pkgs.kdePackages.qtdeclarative + ]; + }; defaultPackage = import ./nix/package.nix { inherit (pkgs) stdenv; inherit quickshell;