flake.nix

@@ -9,39 +9,36 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
+    forAllSystems = fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
-      forAllSystems =
+  in {
-        fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
-    in
-    {
     formatter = forAllSystems (pkgs: pkgs.nixfmt);
 
     packages = forAllSystems (
-        pkgs:
+      pkgs: let
-        let
         pythonEnv = pkgs.python3.withPackages (ps: [
           ps.pillow
           ps.materialyoucolor
         ]);
-        in
+      in rec {
-        rec {
+        zshell-cli = pkgs.callPackage ./nix/zshell-cli.nix {};
+
         zshell = pkgs.callPackage ./nix {
           rev = self.rev or self.dirtyRev;
           stdenv = pkgs.clangStdenv;
+
           quickshell = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
             withX11 = false;
             withI3 = false;
           };
-            app2unit = pkgs.callPackage ./nix/app2unit.nix { inherit pkgs; };
-            zshell-cli = pkgs.callPackage ./nix/zshell-cli.nix { inherit pkgs; };
 
-            inherit pythonEnv;
+          app2unit = pkgs.callPackage ./nix/app2unit.nix {};
+
+          inherit pythonEnv zshell-cli;
         };
 
         default = zshell;
@@ -49,16 +46,21 @@
     );
 
     devShells = forAllSystems (pkgs: {
-        default =
+      default = let
-          let
+        system = pkgs.stdenv.hostPlatform.system;
-            shell = self.packages.${pkgs.stdenv.hostPlatform.system}.zshell;
+        shellPkg = self.packages.${system}.zshell;
+        cliPkg = self.packages.${system}.zshell-cli;
       in
-          pkgs.mkShell.override { stdenv = shell.stdenv; } {
+        pkgs.mkShell.override {stdenv = shellPkg.stdenv;} {
           inputsFrom = [
-              shell
+            shellPkg
-              shell.Plugins
+            shellPkg.plugin
           ];
+
           packages = with pkgs; [
+            shellPkg
+            cliPkg
+
             material-symbols
             rubik
             nerd-fonts.caskaydia-cove

nix/default.nix

@@ -22,6 +22,7 @@
   ninja,
   pkg-config,
   pythonEnv,
+  zshell-cli,
 }: let
   version = "1.0.0";
 
@@ -100,7 +101,7 @@ in
       qt6.qtbase
       qt6.qtwayland
     ];
-    propagatedBuildInputs = runtimeDeps;
+    propagatedBuildInputs = runtimeDeps ++ [zshell-cli];
 
     cmakeFlags =
       [

nix/zshell-cli.nix

@@ -5,7 +5,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "zshell-cli";
   version = "0.1.0";
-  src = ./cli/.;
+  src = ../cli;
   pyproject = true;
 
   build-system = with python3.pkgs; [
@@ -16,6 +16,7 @@ python3.pkgs.buildPythonApplication {
   dependencies = with python3.pkgs; [
     materialyoucolor
     pillow
+    typer
   ];
 
   pythonImportsCheck = ["zshell"];