From 2dc389799abc167da967805d3081f94858c1e838 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Wed, 17 Nov 2021 16:35:00 +0300
Subject: [PATCH] Move sp-api to nix overlay

---
 api/api-module.nix  |  3 +--
 api/api-package.nix | 24 ------------------------
 configuration.nix   |  6 ++++++
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 api/api-package.nix

diff --git a/api/api-module.nix b/api/api-module.nix
index 35a8ac3..6b01d37 100644
--- a/api/api-module.nix
+++ b/api/api-module.nix
@@ -3,7 +3,6 @@
 with lib;
 
 let
-  selfprivacy-api = pkgs.callPackage ./api-package.nix { };
   cfg = config.services.selfprivacy-api;
   directionArg =
     if cfg.direction == ""
@@ -70,7 +69,7 @@ in
       wantedBy = [ "network-online.target" ];
       serviceConfig = {
         User = "root";
-        ExecStart = "${selfprivacy-api}/bin/app.py";
+        ExecStart = "${pkgs.selfprivacy-api}/bin/app.py";
         Restart = "always";
         RestartSec = "5";
       };
diff --git a/api/api-package.nix b/api/api-package.nix
deleted file mode 100644
index 3fb5919..0000000
--- a/api/api-package.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
-
-let
-  inherit (nixpkgs) pkgs;
-  inherit pythonPkgs;
-
-  selfprivacy-api = { buildPythonPackage, flask, flask-restful, setuptools, portalocker, flask-swagger, flask-swagger-ui }:
-    buildPythonPackage rec {
-      pname = "selfprivacy-api";
-      version = "1.1";
-      src = builtins.fetchGit {
-        url = "https://git.selfprivacy.org/ilchub/selfprivacy-rest-api.git";
-        rev = "dc56b6f4ad5358875f26d9639eee5835ea30a386";
-      };
-      propagatedBuildInputs = [ flask flask-restful setuptools portalocker flask-swagger flask-swagger-ui ];
-      meta = {
-        description = ''
-          SelfPrivacy Server Management API
-        '';
-      };
-    };
-  drv = pythonPkgs.callPackage selfprivacy-api { };
-in
-if pkgs.lib.inNixShell then drv.env else drv
diff --git a/configuration.nix b/configuration.nix
index 130754b..8f045a8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,8 @@
 { config, pkgs, lib, ... }:
+let
+  url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/1.0.tar.gz";
+  nix-overlay = (import (builtins.fetchTarball url-overlay));
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -26,6 +30,8 @@
     ./git/gitea.nix
   ];
 
+  nixpkgs.overlays = [ (nix-overlay) ];
+
   boot.cleanTmpDir = true;
   networking = {
     hostName = config.services.userdata.hostname;