From c0728e13e6564a7fa49cf666cd7e988a8aa8cd23 Mon Sep 17 00:00:00 2001
From: pinpox <clan@pablo.tools>
Date: Wed, 4 Jun 2025 11:11:42 +0200
Subject: [PATCH 1/2] Simplify and tidy up golem-provider module

---
 clanModules/golem-provider/default.nix       | 34 -------------
 clanModules/golem-provider/interface.nix     | 20 --------
 clanModules/golem-provider/roles/default.nix | 53 ++++++++++++++++++++
 clanModules/golem-provider/test/vm.nix       |  4 --
 4 files changed, 53 insertions(+), 58 deletions(-)
 delete mode 100644 clanModules/golem-provider/default.nix
 delete mode 100644 clanModules/golem-provider/interface.nix
 create mode 100644 clanModules/golem-provider/roles/default.nix
 delete mode 100644 clanModules/golem-provider/test/vm.nix

diff --git a/clanModules/golem-provider/default.nix b/clanModules/golem-provider/default.nix
deleted file mode 100644
index 6a3325db9..000000000
--- a/clanModules/golem-provider/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, ... }:
-let
-  cfg = config.clan.golem-provider;
-  yagna = pkgs.callPackage ../../pkgs/yagna { };
-  accountFlag = if cfg.account != null then "--account ${cfg.account}" else "";
-in
-{
-  imports = [ ./interface.nix ];
-
-  users.users.golem = {
-    isSystemUser = true;
-    home = "/var/lib/golem";
-    group = "golem";
-    createHome = true;
-  };
-
-  users.groups.golem = { };
-
-  environment.systemPackages = [ yagna ];
-
-  systemd.services.golem-provider = {
-    description = "Golem Provider";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${yagna}/bin/golemsp run --no-interactive ${accountFlag}";
-      Restart = "always";
-      RestartSec = "5";
-      User = "golem";
-      Group = "golem";
-    };
-  };
-}
diff --git a/clanModules/golem-provider/interface.nix b/clanModules/golem-provider/interface.nix
deleted file mode 100644
index 98ae7ccf3..000000000
--- a/clanModules/golem-provider/interface.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) mkOption;
-
-  inherit (lib.types) nullOr str;
-
-in
-{
-  options.clan.golem-provider = {
-    account = mkOption {
-      type = nullOr str;
-      description = ''
-        Ethereum address for payouts.
-
-        Leave empty to automatically generate a new address upon first start.
-      '';
-      default = null;
-    };
-  };
-}
diff --git a/clanModules/golem-provider/roles/default.nix b/clanModules/golem-provider/roles/default.nix
new file mode 100644
index 000000000..21789289c
--- /dev/null
+++ b/clanModules/golem-provider/roles/default.nix
@@ -0,0 +1,53 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.clan.golem-provider;
+  yagna = pkgs.callPackage ../../pkgs/yagna { };
+  accountFlag = if cfg.account != null then "--account ${cfg.account}" else "";
+in
+{
+
+  options.clan.golem-provider = {
+
+    account = lib.mkOption {
+      type = with lib.types; nullOr str;
+      description = ''
+        Ethereum address for payouts.
+
+        Leave empty to automatically generate a new address upon first start.
+      '';
+      default = null;
+    };
+  };
+
+  config = {
+    users.users.golem = {
+      isSystemUser = true;
+      home = "/var/lib/golem";
+      group = "golem";
+      createHome = true;
+    };
+
+    users.groups.golem = { };
+
+    environment.systemPackages = [ yagna ];
+
+    systemd.services.golem-provider = {
+      description = "Golem Provider";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${yagna}/bin/golemsp run --no-interactive ${accountFlag}";
+        Restart = "always";
+        RestartSec = "5";
+        User = "golem";
+        Group = "golem";
+      };
+    };
+  };
+}
diff --git a/clanModules/golem-provider/test/vm.nix b/clanModules/golem-provider/test/vm.nix
deleted file mode 100644
index 006e5a042..000000000
--- a/clanModules/golem-provider/test/vm.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ../. ];
-}

From b27046c604f7dae6bfac887cabf850be9ea79678 Mon Sep 17 00:00:00 2001
From: pinpox <clan@pablo.tools>
Date: Wed, 4 Jun 2025 12:23:29 +0200
Subject: [PATCH 2/2] Remove yagna package and golem-provider

---
 clanModules/flake-module.nix                 |  1 -
 clanModules/golem-provider/README.md         |  7 ---
 clanModules/golem-provider/roles/default.nix | 53 --------------------
 docs/mkdocs.yml                              |  1 -
 pkgs/flake-module.nix                        | 10 +---
 pkgs/yagna/default.nix                       | 35 -------------
 6 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 clanModules/golem-provider/README.md
 delete mode 100644 clanModules/golem-provider/roles/default.nix
 delete mode 100644 pkgs/yagna/default.nix

diff --git a/clanModules/flake-module.nix b/clanModules/flake-module.nix
index d83d96b95..e088e83df 100644
--- a/clanModules/flake-module.nix
+++ b/clanModules/flake-module.nix
@@ -18,7 +18,6 @@ in
     dyndns = ./dyndns;
     ergochat = ./ergochat;
     garage = ./garage;
-    golem-provider = ./golem-provider;
     heisenbridge = ./heisenbridge;
     importer = ./importer;
     iwd = ./iwd;
diff --git a/clanModules/golem-provider/README.md b/clanModules/golem-provider/README.md
deleted file mode 100644
index f9b6bf789..000000000
--- a/clanModules/golem-provider/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-description = "Golem Provider for the Golem Network, an open-source and decentralized platform where everyone can use and share each other's computing power without relying on centralized entities like cloud computing corporations"
----
-
-By running a golem provider your machine's compute resources are offered via the golem network which will allow other members to execute compute tasks on your machine. If this happens, you will be compensated with GLM, an ERC20 token.
-
-More about golem providers: https://docs.golem.network/docs/golem/overview
diff --git a/clanModules/golem-provider/roles/default.nix b/clanModules/golem-provider/roles/default.nix
deleted file mode 100644
index 21789289c..000000000
--- a/clanModules/golem-provider/roles/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.clan.golem-provider;
-  yagna = pkgs.callPackage ../../pkgs/yagna { };
-  accountFlag = if cfg.account != null then "--account ${cfg.account}" else "";
-in
-{
-
-  options.clan.golem-provider = {
-
-    account = lib.mkOption {
-      type = with lib.types; nullOr str;
-      description = ''
-        Ethereum address for payouts.
-
-        Leave empty to automatically generate a new address upon first start.
-      '';
-      default = null;
-    };
-  };
-
-  config = {
-    users.users.golem = {
-      isSystemUser = true;
-      home = "/var/lib/golem";
-      group = "golem";
-      createHome = true;
-    };
-
-    users.groups.golem = { };
-
-    environment.systemPackages = [ yagna ];
-
-    systemd.services.golem-provider = {
-      description = "Golem Provider";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network-online.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${yagna}/bin/golemsp run --no-interactive ${accountFlag}";
-        Restart = "always";
-        RestartSec = "5";
-        User = "golem";
-        Group = "golem";
-      };
-    };
-  };
-}
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index e01f90744..337f30de9 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -106,7 +106,6 @@ nav:
           - reference/clanModules/dyndns.md
           - reference/clanModules/ergochat.md
           - reference/clanModules/garage.md
-          - reference/clanModules/golem-provider.md
           - reference/clanModules/heisenbridge.md
           - reference/clanModules/importer.md
           - reference/clanModules/iwd.md
diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix
index b717794e0..9ee5b69a5 100644
--- a/pkgs/flake-module.nix
+++ b/pkgs/flake-module.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ ... }:
 
 {
   imports = [
@@ -13,14 +13,6 @@
     ./testing/flake-module.nix
   ];
 
-  flake.packages.x86_64-linux =
-    let
-      pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-    in
-    {
-      yagna = pkgs.callPackage ./yagna { };
-    };
-
   perSystem =
     { config, pkgs, ... }:
     {
diff --git a/pkgs/yagna/default.nix b/pkgs/yagna/default.nix
deleted file mode 100644
index d10ab0292..000000000
--- a/pkgs/yagna/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  fetchzip,
-  makeWrapper,
-}:
-let
-  ya-runtime-vm = fetchzip {
-    url = "https://github.com/golemfactory/ya-runtime-vm/releases/download/pre-rel-v0.4.0-ITL-rc21/ya-runtime-vm-linux-pre-rel-v0.4.0-ITL-rc21.tar.gz";
-    sha256 = "sha256-z9dr5cr9j89AWdIFYVzdDZX6+nqLeIccioUvkSXn+7U=";
-  };
-in
-
-stdenv.mkDerivation (finalAttrs: {
-
-  name = "yagna";
-  version = "pre-rel-v0.16.0-preview.deposits.3";
-  src = fetchurl {
-    url = "https://github.com/golemfactory/yagna/releases/download/${finalAttrs.version}/golem-provider-linux-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-RbNqzNjppGa0zK3cmpt8X13CpUO3fuRzrjttl4cwsGM=2";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    mv * $out/bin
-    # wrap all executables under $out/bin using wrapProgram
-    for bin in $(find $out/bin -type f); do
-      wrapProgram $bin --prefix PATH : $out/bin
-    done
-
-    cp -r ${ya-runtime-vm}/* $out/bin/plugins/
-  '';
-})