refactor: clean up quickshell devShell

This commit is contained in:
matt1432 2025-04-25 12:04:24 -04:00
parent 2445b665bc
commit 525a93341d
4 changed files with 28 additions and 14 deletions

View file

@ -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. |

View file

@ -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;};
}

View file

@ -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.
'';
}