merge main #11

Merged
Zacharias-Brohn merged 10 commits from main into settingsWindow 2026-02-23 18:16:25 +01:00
2 changed files with 78 additions and 43 deletions
Showing only changes of commit f33f3f19a8 - Show all commits
+53 -43
View File
@@ -9,51 +9,61 @@
};
};
outputs = {
self,
nixpkgs,
...
} @ inputs: let
forAllSystems = fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
in {
formatter = forAllSystems (pkgs: pkgs.nixfmt);
outputs =
{
self,
nixpkgs,
...
}@inputs:
let
forAllSystems =
fn: nixpkgs.lib.genAttrs nixpkgs.lib.platforms.linux (system: fn nixpkgs.legacyPackages.${system});
in
{
formatter = forAllSystems (pkgs: pkgs.nixfmt);
packages = forAllSystems (pkgs: let
pythonEnv = pkgs.python3.withPackages (ps: [
ps.pillow
ps.materialyoucolor
]);
in 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;};
packages = forAllSystems (
pkgs:
let
pythonEnv = pkgs.python3.withPackages (ps: [
ps.pillow
ps.materialyoucolor
]);
in
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;
};
inherit pythonEnv;
};
default = zshell;
});
default = zshell;
}
);
devShells = forAllSystems (pkgs: {
default = let
shell = self.packages.${pkgs.stdenv.hostPlatform.system}.zshell;
in
pkgs.mkShell.override {stdenv = shell.stdenv;} {
inputsFrom = [
shell
shell.Plugins
];
packages = with pkgs; [
material-symbols
rubik
nerd-fonts.caskaydia-cove
];
};
});
};
devShells = forAllSystems (pkgs: {
default =
let
shell = self.packages.${pkgs.stdenv.hostPlatform.system}.zshell;
in
pkgs.mkShell.override { stdenv = shell.stdenv; } {
inputsFrom = [
shell
shell.Plugins
];
packages = with pkgs; [
material-symbols
rubik
nerd-fonts.caskaydia-cove
];
};
});
};
}
+25
View File
@@ -0,0 +1,25 @@
{
python3,
}:
python3.pkgs.buildPythonApplication {
pname = "zshell-cli";
version = "0.1.0";
src = ./cli/.;
pyproject = true;
build-system = with python3.pkgs; [
hatch-vcs
hatchling
];
dependencies = with python3.pkgs; [
materialyoucolor
pillow
];
pythonImportsCheck = [ "zshell" ];
nativeBuildInputs = [ installShellFiles ];
SETUPTOOLS_SCM_PRETEND_VERSION = 1;
}