fix: revert zellij-ps workaround, remove nixpkgs.config (useGlobalPkgs handles it)
This commit is contained in:
@@ -1,12 +1,10 @@
|
|||||||
# Zellij-ps — project-aware Zellij session manager.
|
# Zellij-ps — project-aware Zellij session manager from m3ta-nixpkgs.
|
||||||
# Installs the zellij-ps package directly and sets project folders.
|
# Delegates to `cli.zellij-ps` — the home-manager module namespace provided by
|
||||||
# Note: Does NOT use the m3ta-nixpkgs cli.zellij-ps module to avoid
|
# m3ta-nixpkgs. Requires m3ta-nixpkgs overlays to be applied to pkgs
|
||||||
# overlay dependency issues when m3ta-home is used standalone.
|
# (via home-manager.useGlobalPkgs = true in NixOS, or overlays in standalone).
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
@@ -24,9 +22,9 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = [
|
cli.zellij-ps = {
|
||||||
(inputs.m3ta-nixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.zellij-ps or pkgs.zellij-ps)
|
enable = true;
|
||||||
];
|
projectFolders = cfg.projectFolders;
|
||||||
home.sessionVariables.PROJECT_FOLDERS = lib.concatStringsSep ":" (map toString cfg.projectFolders);
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,10 +30,9 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# ── nixpkgs configuration ──
|
# ── nixpkgs configuration ──
|
||||||
nixpkgs.config = {
|
# NOTE: When used via NixOS with useGlobalPkgs=true, nixpkgs.config is
|
||||||
allowUnfree = true;
|
# managed at the NixOS level. Only set it here for standalone HM usage.
|
||||||
allowUnfreePredicate = _: true;
|
# nixpkgs.config.allowUnfree = true;
|
||||||
};
|
|
||||||
|
|
||||||
# ── Nix settings ──
|
# ── Nix settings ──
|
||||||
nix = {
|
nix = {
|
||||||
|
|||||||
Reference in New Issue
Block a user