foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-14 12:19:00 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

wrapper-manager: make modules and library set up-to-date

Browse Source
This commit is contained in:
Gabriel Arazas 2024-07-27 21:22:55 +08:00
parent 534ea2e7c3
commit 4262ccfa89
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/env-specific/wrapper-manager.nix
View File

@ -35,7 +35,7 @@ rec {
} }
(lib.mkIf (builtins.length addons > 0) { (lib.mkIf (builtins.length addons > 0) {
env.BLENDER_SYSTEM_RESOURCES = blenderAddons; env.BLENDER_SYSTEM_RESOURCES.value = blenderAddons;
}) })
(lib.removeAttrs module [ "blenderPackage" "blenderArgs" "addons" ]) (lib.removeAttrs module [ "blenderPackage" "blenderArgs" "addons" ])

2
modules/wrapper-manager/dconf.nix
View File

@ -87,7 +87,7 @@ in
}; };
config = lib.mkIf submoduleCfg.enable { config = lib.mkIf submoduleCfg.enable {
env.DCONF_PROFILE = dconfProfileFile; env.DCONF_PROFILE.value = dconfProfileFile;
}; };
}; };
in in

2
modules/wrapper-manager/programs/blender.nix
View File

@ -57,7 +57,7 @@ in
# TODO: Should we replace the .desktop file for this? # TODO: Should we replace the .desktop file for this?
wrappers.blender = { wrappers.blender = {
arg0 = lib.getExe' cfg.package "blender"; arg0 = lib.getExe' cfg.package "blender";
env.BLENDER_SYSTEM_RESOURCES = lib.mkIf (builtins.length cfg.addons > 0) addons; env.BLENDER_SYSTEM_RESOURCES.value = lib.mkIf (builtins.length cfg.addons > 0) addons;
}; };
}; };
} }

2
modules/wrapper-manager/programs/zellij.nix
View File

@ -26,7 +26,7 @@ in
basePackages = [ cfg.package ]; basePackages = [ cfg.package ];
wrappers.zellij = { wrappers.zellij = {
arg0 = lib.getExe' cfg.package "zellij"; arg0 = lib.getExe' cfg.package "zellij";
env.ZELLIJ_CONFIG_FILE = cfg.configFile; env.ZELLIJ_CONFIG_FILE.value = cfg.configFile;
}; };
}; };
} }

8
modules/wrapper-manager/sandboxing/bubblewrap/default.nix
View File

@ -79,8 +79,12 @@ in
"--proc" "/proc" "--proc" "/proc"
"--dev" "/dev" "--dev" "/dev"
] ]
++ builtins.map (var: "--unsetenv ${var}") config.unset ++ lib.mapAttrsToList
++ lib.mapAttrsToList (var: value: "--setenv ${var} ${value}") config.env; (var: metadata:
if metadata.action == "unset"
then "--unsetenv ${var}"
else "--setenv ${var} ${metadata.value}")
config.env;
arg0 = lib.getExe' submoduleCfg.package "bwrap"; arg0 = lib.getExe' submoduleCfg.package "bwrap";
prependArgs = lib.mkBefore (submoduleCfg.extraArgs ++ [ "--" submoduleCfg.wraparound.executable ] ++ submoduleCfg.wraparound.extraArgs); prependArgs = lib.mkBefore (submoduleCfg.extraArgs ++ [ "--" submoduleCfg.wraparound.executable ] ++ submoduleCfg.wraparound.extraArgs);