flake.nix

@@ -9,61 +9,63 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    ...
-      ...
+  } @ inputs: let
-    }@inputs:
+    forAllSystems = fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
-    let
+  in {
-      forAllSystems =
+    formatter = forAllSystems (pkgs: pkgs.nixfmt);
-        fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
-    in
-    {
-      formatter = forAllSystems (pkgs: pkgs.nixfmt);
 
-      packages = forAllSystems (
+    packages = forAllSystems (
-        pkgs:
+      pkgs: let
-        let
+        pythonEnv = pkgs.python3.withPackages (ps: [
-          pythonEnv = pkgs.python3.withPackages (ps: [
+          ps.pillow
-            ps.pillow
+          ps.materialyoucolor
-            ps.materialyoucolor
+        ]);
-          ]);
+      in rec {
-        in
+        zshell-cli = pkgs.callPackage ./nix/zshell-cli.nix {};
-        rec {
-          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;
+        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;
           };
 
-          default = zshell;
+          app2unit = pkgs.callPackage ./nix/app2unit.nix {};
-        }
-      );
 
-      devShells = forAllSystems (pkgs: {
+          inherit pythonEnv zshell-cli;
-        default =
+        };
-          let
+
-            shell = self.packages.${pkgs.stdenv.hostPlatform.system}.zshell;
+        default = zshell;
-          in
+      }
-          pkgs.mkShell.override { stdenv = shell.stdenv; } {
+    );
-            inputsFrom = [
+
-              shell
+    devShells = forAllSystems (pkgs: {
-              shell.Plugins
+      default = let
-            ];
+        system = pkgs.stdenv.hostPlatform.system;
-            packages = with pkgs; [
+        shellPkg = self.packages.${system}.zshell;
-              material-symbols
+        cliPkg = self.packages.${system}.zshell-cli;
-              rubik
+      in
-              nerd-fonts.caskaydia-cove
+        pkgs.mkShell.override {stdenv = shellPkg.stdenv;} {
-            ];
+          inputsFrom = [
-          };
+            shellPkg
-      });
+            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"];