|
168 | 168 | mkFirejailWrapper = {
|
169 | 169 | pkgs,
|
170 | 170 | pkg,
|
171 |
| - executable, |
| 171 | + exe, |
172 | 172 | desktop ? null,
|
173 | 173 | profile ? null,
|
174 | 174 | extraArgs ? [],
|
|
194 | 194 | mkdir -p $out/share/applications
|
195 | 195 | cat <<'_EOF' >"$command_path"
|
196 | 196 | #! ${pkgs.runtimeShell} -e
|
197 |
| - exec /run/wrappers/bin/firejail ${firejailArgs} -- ${ |
198 |
| - toString executable |
199 |
| - } "$@" |
| 197 | + exec /run/wrappers/bin/firejail ${firejailArgs} -- ${toString exe} "$@" |
200 | 198 | _EOF
|
201 | 199 | chmod 0755 "$command_path"
|
202 | 200 | ''
|
203 | 201 | + pkgs.lib.optionalString (desktop != null) ''
|
204 | 202 | substitute ${desktop} $out/share/applications/$(basename ${desktop}) \
|
205 |
| - --replace ${executable} "$command_path" |
| 203 | + --replace ${exe} "$command_path" |
206 | 204 | ''
|
207 | 205 | );
|
208 | 206 | mkKbd = cfg: dev: {
|
|
437 | 435 | TERMINAL = "alacritty";
|
438 | 436 | WLR_NO_HARDWARE_CURSORS = "1";
|
439 | 437 | NIXOS_OZONE_WL = "1";
|
| 438 | + ROC_ENABLE_PRE_VEGA = "1"; |
440 | 439 | };
|
441 | 440 | environment.sessionVariables = environment.variables;
|
442 | 441 | #
|
@@ -467,11 +466,18 @@ in {
|
467 | 466 | #
|
468 | 467 | # GPU
|
469 | 468 | #
|
| 469 | + systemd.tmpfiles.rules = [ |
| 470 | + "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages_5.clr}" |
| 471 | + ]; |
470 | 472 | hardware.opengl = {
|
471 | 473 | enable = true;
|
472 | 474 | driSupport32Bit = true;
|
473 | 475 | extraPackages = with pkgs; [
|
474 | 476 | amdvlk
|
| 477 | + rocmPackages_5.clr.icd |
| 478 | + rocmPackages_5.clr |
| 479 | + rocmPackages_5.rocminfo |
| 480 | + rocmPackages_5.rocm-runtime |
475 | 481 | # vulkan-validation-layers
|
476 | 482 | # intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
477 | 483 | # vaapiIntel # LIBVA_DRIVER_NAME=i965
|
@@ -964,16 +970,6 @@ in {
|
964 | 970 | simple-scan
|
965 | 971 | system-config-printer
|
966 | 972 | pulsemixer
|
967 |
| - (mkFirejailWrapper { |
968 |
| - inherit pkgs; |
969 |
| - pkg = "firefox-firejail"; |
970 |
| - executable = "${firefox-esr}/bin/firefox-esr"; |
971 |
| - profile = mkFirejailProfile { |
972 |
| - pkg = "tabby"; |
973 |
| - dir = "tabby"; |
974 |
| - net = true; |
975 |
| - }; |
976 |
| - }) |
977 | 973 | ];
|
978 | 974 | programs.git = {
|
979 | 975 | enable = true;
|
|
0 commit comments