From 26705829d8e6aeb7bfb7cdb6dde8054f0ee5d073 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 1 Dec 2016 17:10:31 +0100
Subject: l 2 games: add doom{1,2} wrappers

---
 lass/2configs/games.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'lass/2configs/games.nix')

diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 0eec97922..82b7eb2c9 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -2,10 +2,28 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  doom = pkgs.writeDash "doom" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${pkgs.zandronum}/bin/zandronum \
+      -file $DOOM_DIR/lib/brutalv20.pk3 \
+      -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \
+      -fov 120 \
+      "$@"
+  '';
+  doom1 = pkgs.writeDashBin "doom1" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${doom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
+  '';
+  doom2 = pkgs.writeDashBin "doom2" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
+  '';
 
 in {
   environment.systemPackages = with pkgs; [
     dwarf_fortress
+    doom1
+    doom2
   ];
 
   users.extraUsers = {
-- 
cgit v1.2.3


From ddf04562b2a155f1599988d089c0ca6ed2def3a4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 7 Dec 2016 10:14:27 +0100
Subject: l 2 games: add vdoom{1,2} to pkgs

---
 lass/2configs/games.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/games.nix')

diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 82b7eb2c9..245f3ca1e 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -2,12 +2,16 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
+  vdoom = pkgs.writeDash "vdoom" ''
+    ${pkgs.zandronum}/bin/zandronum \
+      -fov 120 \
+      "$@"
+  '';
   doom = pkgs.writeDash "doom" ''
     DOOM_DIR=''${DOOM_DIR:-~/doom/}
-    ${pkgs.zandronum}/bin/zandronum \
+    ${vdoom} \
       -file $DOOM_DIR/lib/brutalv20.pk3 \
       -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \
-      -fov 120 \
       "$@"
   '';
   doom1 = pkgs.writeDashBin "doom1" ''
@@ -18,12 +22,22 @@ let
     DOOM_DIR=''${DOOM_DIR:-~/doom/}
     ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
   '';
+  vdoom1 = pkgs.writeDashBin "vdoom1" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
+  '';
+  vdoom2 = pkgs.writeDashBin "vdoom2" ''
+    DOOM_DIR=''${DOOM_DIR:-~/doom/}
+    ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
+  '';
 
 in {
   environment.systemPackages = with pkgs; [
     dwarf_fortress
     doom1
     doom2
+    vdoom1
+    vdoom2
   ];
 
   users.extraUsers = {
-- 
cgit v1.2.3


From 19c648e0f380fd8efc94428151a09469187b5019 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 7 Dec 2016 21:38:55 +0100
Subject: l 2 games: use zandronum-bin instead of zandronum

---
 lass/2configs/games.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/games.nix')

diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 245f3ca1e..e7c7de938 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -3,7 +3,7 @@
 let
   mainUser = config.users.extraUsers.mainUser;
   vdoom = pkgs.writeDash "vdoom" ''
-    ${pkgs.zandronum}/bin/zandronum \
+    ${pkgs.zandronum-bin}/bin/zandronum \
       -fov 120 \
       "$@"
   '';
-- 
cgit v1.2.3