From 525cb9908d12329ca3a83b407dcadce49b76090a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Mon, 10 May 2021 19:49:51 +0100
Subject: [PATCH] remove vultr as builder, fix mindforger

---
 nixos/common.nix             |  4 ++++
 nixos/distributed-builds.nix | 10 ----------
 nixos/gui/default.nix        | 10 ++++++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/nixos/common.nix b/nixos/common.nix
index a6db72ef..ea9d976c 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -3,6 +3,7 @@
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz;
   bisqTarball = fetchTarball https://github.com/emmanuelrosa/nixpkgs/archive/6ee154d2bc8c4c48cde2d7ae5bcd0a3da28b2b72.tar.gz;
+  mindforgerTarball = fetchTarball https://github.com/cyplo/nixpkgs/archive/80286e3d62406777c08c4afbeeb5deeb1c44062b.tar.gz;
   nurTarball = fetchTarball https://github.com/nix-community/NUR/archive/master.tar.gz;
 in
   {
@@ -27,6 +28,9 @@ in
           bisq = import bisqTarball {
             config = config.nixpkgs.config;
           };
+          mindforgerPatched = import mindforgerTarball {
+            config = config.nixpkgs.config;
+          };
           nur = import nurTarball {
             inherit pkgs;
           };
diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix
index 06c02aaf..4aa18fd1 100644
--- a/nixos/distributed-builds.nix
+++ b/nixos/distributed-builds.nix
@@ -15,16 +15,6 @@
       supportedFeatures = [ "kvm" ];
       mandatoryFeatures = [ ];
     }
-    {
-      hostName = "vultr1.vpn";
-      sshUser = "nix-builder";
-      sshKey = "/home/cyryl/.ssh/id_ed25519";
-      system = "x86_64-linux";
-      maxJobs = 2;
-      speedFactor = 1;
-      supportedFeatures = [ ];
-      mandatoryFeatures = [ ];
-    }
   ];
 
   nix.extraOptions = ''
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index 74933a73..c0c64902 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -19,7 +19,6 @@
     ];
 
     home.packages = with pkgs; [
-      wineFull
       anarchism
       apvlv
       digikam
@@ -32,12 +31,15 @@
       gnome3.nautilus
       gsettings-desktop-schemas
       keybase-gui
-      libreoffice simple-scan
+      libreoffice
+      mindforgerPatched.mindforger
       passff-host
       python38Packages.binwalk-full
       qemu aqemu
+      shotwell
+      simple-scan
       slack
-      spotify shotwell
+      spotify
       ssb-patchwork
       unstable.discord
       unstable.electrum
@@ -45,12 +47,12 @@
       unstable.ghidra-bin
       unstable.hopper
       unstable.inkscape
-      unstable.mindforger
       unstable.openscad
       unstable.qcad
       unstable.signal-desktop
       unstable.wireshark
       vlc
+      wineFull
       xclip
       xidlehook
       yubico-piv-tool