From f7319c3e20a940c19186f738bf985ef7738b4515 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 22 Oct 2021 11:06:14 +0200
Subject: [PATCH] dogetipbot-telegram: migrate to flake

---
 flake.lock                    | 45 +++++++++++++++++++++++++++++++----
 flake.nix                     |  4 +++-
 systems/LoutreOS/services.nix | 18 +-------------
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index ff9fd15..9e9e5f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,31 @@
 {
   "nodes": {
+    "dogetipbot-telegram": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1634893013,
+        "narHash": "sha256-6vcnuqNvg49PN+4FePU50CQpdy5dPbj7+58wD7duRlw=",
+        "owner": "nyanloutre",
+        "repo": "dogetipbot-telegram",
+        "rev": "8807fb1a2a8f2d965618e72daf300eba0233327b",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "nyanloutre",
+        "ref": "master",
+        "repo": "dogetipbot-telegram",
+        "type": "gitlab"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1634758644,
-        "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=",
+        "lastModified": 1627805549,
+        "narHash": "sha256-+LHhcpzw6vAxF6q0VSLkZSEGpDC02JN21KM8eUWz+is=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3",
+        "rev": "16bf3980bfa0d8929639be93fa8491ebad9d61ec",
         "type": "github"
       },
       "original": {
@@ -47,6 +66,21 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1634758644,
+        "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-21.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1607522989,
         "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
@@ -63,7 +97,8 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "dogetipbot-telegram": "dogetipbot-telegram",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-nyanloutre-pysmart": "nixpkgs-nyanloutre-pysmart",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
@@ -71,7 +106,7 @@
     },
     "simple-nixos-mailserver": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "utils": "utils"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index afdacc5..62fb6ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,10 @@
     nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
     nixpkgs-nyanloutre-pysmart.url = "github:nyanloutre/nixpkgs/pysmart-init";
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05";
+    dogetipbot-telegram.url = "gitlab:nyanloutre/dogetipbot-telegram/master";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, nixpkgs-nyanloutre-pysmart }: {
+  outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, nixpkgs-nyanloutre-pysmart }: {
     nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
@@ -18,6 +19,7 @@
         nixpkgs.nixosModules.notDetected
         "${nixpkgs-unstable}/nixos/modules/services/audio/navidrome.nix"
         simple-nixos-mailserver.nixosModule
+        dogetipbot-telegram.nixosModule
         ./systems/LoutreOS/configuration.nix
         ({ pkgs, ... }: {
           systemd.services.ipmihddtemp = {
diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix
index 4cf1e18..56cab71 100644
--- a/systems/LoutreOS/services.nix
+++ b/systems/LoutreOS/services.nix
@@ -675,23 +675,7 @@ in
     };
   };
 
-  systemd.services.dogetipbot-telegram = let
-    dogetipbot-telegram = pkgs.callPackage (pkgs.fetchgit {
-      url = "https://gitlab.com/nyanloutre/dogetipbot-telegram.git";
-      rev = "18c875a2e4b98221523818515a1eecb9c5aeb093";
-      sha256 = "0mhv00y1c2py425wxl13if6nlv97xk5k6flf772jj1yaxipjdmpn";
-    }) { inherit pkgs; };
-  in {
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-    script = "${dogetipbot-telegram}/bin/dogetipbot-telegram --db-path $STATE_DIRECTORY/users.db";
-    enable = true;
-    serviceConfig = {
-      EnvironmentFile = "/mnt/secrets/dogetipbot-telegram_env";
-      DynamicUser = true;
-      StateDirectory = "dogetipbot";
-    };
-  };
+  dogetipbot-telegram.enable = true;
 
   # systemd.services.minecraft-overviewer =
   # let