Skip to content

Commit 000ad81

Browse files
committed
doom wip
1 parent cfd60f2 commit 000ad81

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

nix/configuration.nix

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,7 @@ in {
748748
programs.firejail.wrappedBinaries =
749749
fj.mkFirejailSimple "chromium"
750750
// mkOpenArena "rat"
751+
// import ./doom.nix
751752
// fj.mkFirejailCustom {
752753
pkg = "doom-infinite";
753754
dir = "doom";
@@ -769,18 +770,6 @@ in {
769770
-file ./SimpleSlots.1.1.pk7
770771
'';
771772
}
772-
// fj.mkFirejailCustom {
773-
pkg = "doom-64";
774-
dir = "doom";
775-
exe = ''
776-
${unst.gzdoom}/bin/gzdoom \
777-
-iwad ./freedoom-0.13.0/freedoom2.wad \
778-
-file ./BD64-VoH_game.pk3 \
779-
-file ./BD64-VoH_maps.pk3 \
780-
-file ./relite_0.7.3b.pk3 \
781-
-file ./SimpleSlots.1.1.pk7
782-
'';
783-
}
784773
// fj.mkFirejailCustom {
785774
pkg = "doom-mall";
786775
dir = "doom";

nix/doom.nix

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
let
2+
pkgs = import ./nixpkgs.nix;
3+
fj = import ./firejail.nix;
4+
in
5+
pkgs.lib.optionalAttrs (builtins.pathExists ../bak/doom)
6+
(
7+
fj.mkFirejailCustom rec {
8+
pkg = "doom-64";
9+
dir = "doom";
10+
exe = ''
11+
${pkgs.gzdoom}/bin/gzdoom \
12+
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
13+
-file ${../bak/doom/BD64-VoH_game_v1.4.2.pk3} \
14+
-file ${../bak/doom/BD64-VoH_maps_v1.4.2.pk3} \
15+
-file ${../bak/doom/BD64-VoH_MoreSFX.pk3} \
16+
-file ${../bak/doom/relite_0.7.3b.pk3} \
17+
-file ${../bak/doom/SimpleSlots.1.1.pk7}
18+
'';
19+
}
20+
)

0 commit comments

Comments
 (0)