diff --git a/devShells/README.md b/devShells/README.md index 59ce05cb..b56f8112 100644 --- a/devShells/README.md +++ b/devShells/README.md @@ -14,6 +14,8 @@ This directory contains every derivations for devShells exposed by this flake. | `markdown` | markdown shell to be loaded by my Neovim config dynamically. | | `netdaemon` | Shell that makes sure we have the right dotnet-sdk version for NetDaemon development. | | `node` | Shell that provides `bumpNpmDeps`, node and typescript. | +| `qml` | qml shell to be loaded by my Neovim config dynamically. | +| `quickshell` | Shell that provides the quickshell executable with `QML2_IMPORT_PATH` correctly defined for quickshell development. | | `rust` | rust shell to be loaded by my Neovim config dynamically. | | `subtitles-dev` | Shell that provides the dependencies for my subtitle management scripts. | | `web` | web shell to be loaded by my Neovim config dynamically. | diff --git a/devShells/default.nix b/devShells/default.nix index 2ef64464..ff21862a 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -3,7 +3,7 @@ self, ... }: let - inherit (pkgs.lib) attrValues makeSearchPath; + inherit (pkgs.lib) attrValues; neovimShells = import ./neovim-shells {inherit pkgs self;}; @@ -37,18 +37,7 @@ in node = pkgs.callPackage ./node {inherit bumpNpmDeps;}; - quickshell = pkgs.mkShell { - packages = [ - pkgs.quickshell - ]; - - shellHook = '' - export QML2_IMPORT_PATH="$QML2_IMPORT_PATH:${makeSearchPath "lib/qt-6/qml" [ - pkgs.quickshell - pkgs.kdePackages.qtdeclarative - ]}" - ''; - }; + quickshell = pkgs.callPackage ./quickshell {}; subtitles-dev = pkgs.callPackage ./subtitle-dev {inherit bumpNpmDeps;}; } diff --git a/devShells/quickshell/default.nix b/devShells/quickshell/default.nix new file mode 100644 index 00000000..04b1d361 --- /dev/null +++ b/devShells/quickshell/default.nix @@ -0,0 +1,24 @@ +{ + lib, + mkShell, + kdePackages, + quickshell, + ... +}: +mkShell { + packages = [ + quickshell + ]; + + shellHook = '' + export QML2_IMPORT_PATH="$QML2_IMPORT_PATH:${lib.makeSearchPath "lib/qt-6/qml" [ + quickshell + kdePackages.qtdeclarative + ]}" + ''; + + meta.description = '' + Shell that provides the quickshell executable with `QML2_IMPORT_PATH` + correctly defined for quickshell development. + ''; +} diff --git a/scopedPackages/README.md b/scopedPackages/README.md index 59ed2973..e30b7502 100644 --- a/scopedPackages/README.md +++ b/scopedPackages/README.md @@ -35,7 +35,6 @@ Every extensions I use in my firefox module. | `sponsorblock` | Easily skip YouTube video sponsors. When you visit a YouTube video, the extension will check the database for reported sponsors and automatically skip known sponsors. You can also report sponsors in videos. Other browsers: https://sponsor.ajay.app | https://sponsor.ajay.app | | `stylus` | Redesign your favorite websites with Stylus, an actively developed and community driven userstyles manager. Easily install custom themes from popular online repositories, or create, edit, and manage your own personalized CSS stylesheets. | https://add0n.com/stylus.html | | `tampermonkey` | Tampermonkey is the world's most popular userscript manager. | https://tampermonkey.net | -| `ttv-lol-pro` | TTV LOL PRO removes most livestream ads from Twitch. | https://github.com/younesaassila/ttv-lol-pro | | `ublock-origin` | Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory. | https://github.com/gorhill/uBlock#ublock-origin | | `undoclosetabbutton` | Allows you to restore the tab you just closed with a single click---plus it can offer a list of recently closed tabs within a convenient context menu. | https://github.com/M-Reimer/undoclosetab |