3 files changed, 0 insertions, 245 deletions

diff --git a/customized/factorio.nix b/customized/factorio.nix
deleted file mode 100644
index beed0910..00000000
--- a/customized/factorio.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-{ stdenv, callPackage, fetchurl, makeWrapper
-, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
-, factorio-utils
-, releaseType
-, mods ? []
-, username ? "" , password ? ""
-}:
-
-assert releaseType == "alpha" || releaseType == "headless";
-
-with stdenv.lib;
-let
-  version = "0.14.5";
-  isHeadless = releaseType == "headless";
-
-  arch = if stdenv.system == "x86_64-linux" then {
-    inUrl = "linux64";
-    inTar = "x64";
-  } else if stdenv.system == "i686-linux" then {
-    inUrl = "linux32";
-    inTar = "i386";
-  } else abort "Unsupported platform";
-
-  authenticatedFetch = callPackage ./fetch.nix { inherit username password; };
-
-  fetch = rec {
-    url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
-    x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "734b3689146baa340cf8f8139d31f170538ebfad807b09b0b64527b8f3e97a94"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = null; };
-    };
-    i386 = {
-      headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = null; };
-    };
-  };
-
-  configBaseCfg = ''
-    use-system-read-write-data-directories=false
-    [path]
-    read-data=$out/share/factorio/data/
-    [other]
-    check_updates=false
-  '';
-
-  updateConfigSh = ''
-    #! $SHELL
-    if [[ -e ~/.factorio/config.cfg ]]; then
-      # Config file exists, but may have wrong path.
-      # Try to edit it. I'm sure this is perfectly safe and will never go wrong.
-      sed -i 's|^read-data=.*|read-data=$out/share/factorio/data/|' ~/.factorio/config.cfg
-    else
-      # Config file does not exist. Phew.
-      install -D $out/share/factorio/config-base.cfg ~/.factorio/config.cfg
-    fi
-  '';
-
-  modDir = factorio-utils.mkModDirDrv mods;
-
-  base = {
-    name = "factorio-${releaseType}-${version}";
-
-    src = fetch.${arch.inTar}.${releaseType};
-
-    preferLocalBuild = true;
-    dontBuild = true;
-
-    installPhase = ''
-      mkdir -p $out/{bin,share/factorio}
-      cp -a data $out/share/factorio
-      cp -a bin/${arch.inTar}/factorio $out/bin/factorio
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        $out/bin/factorio
-    '';
-
-    meta = {
-      description = "A game in which you build and maintain factories";
-      longDescription = ''
-        Factorio is a game in which you build and maintain factories.
-
-        You will be mining resources, researching technologies, building
-        infrastructure, automating production and fighting enemies. Use your
-        imagination to design your factory, combine simple elements into
-        ingenious structures, apply management skills to keep it working and
-        finally protect it from the creatures who don't really like you.
-
-        Factorio has been in development since spring of 2012 and it is
-        currently in late alpha.
-      '';
-      homepage = https://www.factorio.com/;
-      license = stdenv.lib.licenses.unfree;
-      maintainers = with stdenv.lib.maintainers; [ Baughn elitak ];
-      platforms = [ "i686-linux" "x86_64-linux" ];
-    };
-  };
-  headless = base;
-  alpha = base // {
-
-    buildInputs = [ makeWrapper ];
-
-    libPath = stdenv.lib.makeLibraryPath [
-      alsaLib
-      libX11
-      libXcursor
-      libXinerama
-      libXrandr
-      libXi
-      mesa_noglu
-    ];
-
-    installPhase = base.installPhase + ''
-      wrapProgram $out/bin/factorio                                \
-        --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
-        --run "$out/share/factorio/update-config.sh"               \
-        --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
-
-        # TODO Currently, every time a mod is changed/added/removed using the
-        # modlist, a new derivation will take up the entire footprint of the
-        # client. The only way to avoid this is to remove the mods arg from the
-        # package function. The modsDir derivation will have to be built
-        # separately and have the user specify it in the .factorio config or
-        # right along side it using a symlink into the store I think i will
-        # just remove mods for the client derivation entirely. this is much
-        # cleaner and more useful for headless mode.
-
-        # TODO: trying to toggle off a mod will result in read-only-fs-error.
-        # not much we can do about that except warn the user somewhere. In
-        # fact, no exit will be clean, since this error will happen on close
-        # regardless. just prints an ugly stacktrace but seems to be otherwise
-        # harmless, unless maybe the user forgets and tries to use the mod
-        # manager.
-
-      install -m0644 <(cat << EOF
-      ${configBaseCfg}
-      EOF
-      ) $out/share/factorio/config-base.cfg
-
-      install -m0755 <(cat << EOF
-      ${updateConfigSh}
-      EOF
-      ) $out/share/factorio/update-config.sh
-
-      cp -a doc-html $out/share/factorio
-    '';
-  };
-in stdenv.mkDerivation (if isHeadless then headless else alpha)
diff --git a/ymir.nix b/ymir.nix
index 4e8c332c..31a20a86 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -25,7 +25,6 @@ in rec {
     [
       ./ymir/hw.nix
       ./ymir/mlmmj-expose.nix
-      ./ymir/factorio.nix
       ./custom/zsh.nix
       ./users.nix
       ./custom/tinc/def.nix
@@ -590,12 +589,4 @@ in rec {
   users.groups."filebin" = {
     members = ["gkleen" "uucp"];
   };
-
-  services.murmur = {
-    enable = true;
-    clientCertRequired = true;
-    registerName = "ymir.yggdrasil.li";
-    sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
-    sslKey = "/var/lib/acme/yggdrasil.li/key.pem";
-  };
 }
diff --git a/ymir/factorio.nix b/ymir/factorio.nix
deleted file mode 100644
index 15969d9a..00000000
--- a/ymir/factorio.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  modDrv = pkgs.factorio-utils.modDrv {
-    allRecommendedMods = true;
-    allOptionalMods = false;
-  };
-  modPortalDrv = { name, version, sha256, deps ? [], optionalDeps ? [], recommendedDeps ? [] }: modDrv {
-    # src = pkgs.factorio-fetch {
-    #   name = ''${name}_${version}.zip'';
-    #   url = ''https://mods.factorio.com/api/downloads/data/mods/${id}_${version}.zip'';
-    #   inherit sha256;
-    #   loginUrl = "";
-    # };
-    name = ''${name}-${version}'';
-    src = pkgs.fetchurl {
-      url = ''https://f.141.li/${name}_${version}.zip'';
-      inherit sha256;
-    };
-    inherit deps optionalDeps recommendedDeps;
-  };
-
-  availableMods = rec {
-    autofill = modPortalDrv {
-      name = "autofill";
-      version = "1.4.5";
-      sha256 = "1nmn12d7fpi6gk5i6dvzqnca1hs9icqssgvjc2qdi9hz2n07h265";
-    };
-    EvoGUI = modPortalDrv {
-      name = "EvoGUI";
-      version = "0.4.108";
-      sha256 = "1z7cx8a4ybilccvxsmd85i7q2fy95as1mjs7gvbmnllp0r6p73pj";
-    };
-    factorio-reach = modPortalDrv {
-      name = "factorio-reach";
-      version = "2.1.1";
-      sha256 = "1ll77ns2bvzsvypd27y545inb5489lsk2is4wv01q4i8zbvbviac";
-    };
-    FAIR = modPortalDrv {
-      name = "FAIR";
-      version = "0.0.1";
-      sha256 = "0cwgidy3ycp90jy9qrll2gyvkmdxys5v8w6qrciifh3h77dx5ryg";
-    };
-    EvenMoreLight = modPortalDrv {
-      name = "EvenMoreLight";
-      version = "0.0.3";
-      sha256 = "06j891nbcl07di2rs0zh87hczp2p1mbpai14w52myxag0ysy4zya";
-    };
-    RailTanker = modPortalDrv {
-      name = "RailTanker";
-      version = "1.4.0";
-      sha256 = "1y9p6qiwrypyqk58rr3ahq11ikyk752fbap3n15mdplkc9i4gpfr";
-    };
-    rso-mod = modPortalDrv {
-      name = "rso-mod";
-      version = "2.2.2";
-      sha256 = "0d46vz204bv220ifjaa8qcvnbzkalrqgppmzwk43kvy1jyp9xil4";
-    };
-    YARM = modPortalDrv {
-      name = "YARM";
-      version = "0.7.106";
-      sha256 = "1qy7bylp79jfs9s81sc4g9qqwby2hsy3hcjz80cfha1sz0c048i7";
-    };
-  };
-in {
-  services.factorio = {
-    enable = true;
-    saveName = config.networking.hostName;
-    mods = with availableMods; [
-      autofill
-      EvoGUI
-      factorio-reach
-      FAIR
-      EvenMoreLight
-      RailTanker
-      rso-mod
-      YARM
-    ];
-    autosave-interval = 10;
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    factorio-mkModDirDrv = pkgs.factorio-utils.mkModDirDrv;
-    factorio-headless = pkgs.callPackage ../customized/factorio.nix { releaseType = "headless"; };
-  };
-}