fix: revert zellij-ps workaround, remove nixpkgs.config (useGlobalPkgs handles it)

This commit is contained in:
2026-05-02 10:08:40 +02:00
parent 727dacb713
commit ffcb17b956
2 changed files with 11 additions and 14 deletions

View File

@@ -1,12 +1,10 @@
# Zellij-ps — project-aware Zellij session manager.
# Installs the zellij-ps package directly and sets project folders.
# Note: Does NOT use the m3ta-nixpkgs cli.zellij-ps module to avoid
# overlay dependency issues when m3ta-home is used standalone.
# Zellij-ps — project-aware Zellij session manager from m3ta-nixpkgs.
# Delegates to `cli.zellij-ps` — the home-manager module namespace provided by
# m3ta-nixpkgs. Requires m3ta-nixpkgs overlays to be applied to pkgs
# (via home-manager.useGlobalPkgs = true in NixOS, or overlays in standalone).
{
config,
lib,
pkgs,
inputs,
...
}:
with lib; let
@@ -24,9 +22,9 @@ in {
};
config = mkIf cfg.enable {
home.packages = [
(inputs.m3ta-nixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.zellij-ps or pkgs.zellij-ps)
];
home.sessionVariables.PROJECT_FOLDERS = lib.concatStringsSep ":" (map toString cfg.projectFolders);
cli.zellij-ps = {
enable = true;
projectFolders = cfg.projectFolders;
};
};
}

View File

@@ -30,10 +30,9 @@
];
# ── nixpkgs configuration ──
nixpkgs.config = {
allowUnfree = true;
allowUnfreePredicate = _: true;
};
# NOTE: When used via NixOS with useGlobalPkgs=true, nixpkgs.config is
# managed at the NixOS level. Only set it here for standalone HM usage.
# nixpkgs.config.allowUnfree = true;
# ── Nix settings ──
nix = {