finish up dwarf-fortress stuff

2 files changed, 14 insertions, 45 deletions

diff --git a/home/modules/games.nix b/home/modules/games.nix
index 14b2d1b4b3..c68342ba6b 100644
--- a/home/modules/games.nix
+++ b/home/modules/games.nix
@@ -30,15 +30,23 @@ let
   '';
 
   df = runCommand "dwarf-fortress" {} ''
-     mkdir -p $out/bin
-     sed \
-       -e '4icp -f ${init} "$DF_DIR/data/init/init.txt"' \
-       -e '4icp -f ${d_init} "$DF_DIR/data/init/d_init.txt"' \
-       < "${df-full}/bin/dwarf-fortress" >"$out/bin/dwarf-fortress"
-     chmod +x $out/bin/dwarf-fortress
+    mkdir -p $out/bin
+    sed \
+      -e '4icp -f ${init} "$DF_DIR/data/init/init.txt"' \
+      -e '4icp -f ${d_init} "$DF_DIR/data/init/d_init.txt"' \
+      < "${df-full}/bin/dwarf-fortress" >"$out/bin/dwarf-fortress"
+
+    shopt -s extglob
+    ln -s ${df-full}/bin/!(dwarf-fortress) $out/bin
+
+    chmod +x $out/bin/dwarf-fortress
   '';
 
 in {
+  imports = [
+    ./obs.nix
+  ];
+
   home.packages = [
     crawl
     df
diff --git a/home/modules/games/dwarf-fortress.nix b/home/modules/games/dwarf-fortress.nix
deleted file mode 100644
index 8db6145660..0000000000
--- a/home/modules/games/dwarf-fortress.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ pkgs ? import <nixpkgs> {}, ... }:
-
-with pkgs;
-
-rec {
-  df-orig = dwarf-fortress-packages.dwarf-fortress-original;
-
-  df-full = (dwarf-fortress-packages.dwarf-fortress-full.override {
-    theme = null;
-    enableIntro = false;
-    enableFPS = true;
-  });
-
-  init = runCommand "init.txt" {} ''
-    substitute "${df-orig}/data/init/init.txt" $out \
-      --replace "[INTRO:YES]" "[INTRO:NO]" \
-      --replace "[VOLUME:255]" "[VOLUME:0]" \
-      --replace "[FPS:NO]" "[FPS:YES]"
-  '';
-
-  d_init = runCommand "d_init.txt" {} ''
-    substitute "${df-orig}/data/init/d_init.txt" $out \
-      --replace "[AUTOSAVE:NONE]" "[AUTOSAVE:SEASONAL]" \
-      --replace "[AUTOSAVE_PAUSE:NO]" "[AUTOSAVE_PAUSE:YES]" \
-      --replace "[INITIAL_SAVE:NO]" "[INITIAL_SAVE:YES]" \
-      --replace "[EMBARK_WARNING_ALWAYS:NO]" "[EMBARK_WARNING_ALWAYS:YES]" \
-      --replace "[VARIED_GROUND_TILES:YES]" "[VARIED_GROUND_TILES:NO]" \
-      --replace "[SHOW_FLOW_AMOUNTS:NO]" "[SHOW_FLOW_AMOUNTS:YES]"
-  '';
-
-  df = runCommand "dwarf-fortress" {} ''
-     mkdir -p $out/bin
-     sed \
-       -e '2icp -f ${init} "$DF_DIR/data/init/init.txt"' \
-       -e '3icp -f ${d_init} "$DF_DIR/data/init/d_init.txt"' \
-       < "${df-full}/bin/dwarf-fortress" >"$out/bin/dwarf-fortress"
-  '';
-
-}