From 27f67a386b710379e975df6fa0d280cacf38e155 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Sun, 10 Sep 2023 23:19:41 +0200
Subject: [PATCH] Add dbInit for bot

---
 flake.lock                              | 54 ++++++++++++++-----------
 flake.nix                               | 10 ++++-
 nixos-configurations/server/default.nix |  5 ++-
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6311d4b..f17c221 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,9 @@
   "nodes": {
     "aurora-blog-template": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1693750073,
@@ -18,6 +20,26 @@
         "type": "github"
       }
     },
+    "denbot": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1694376907,
+        "narHash": "sha256-z3FUE3Kb/WhYCHslyFBDyuQpnYt1gRz7g8s60ztWqiw=",
+        "owner": "thiloho",
+        "repo": "discord-bot",
+        "rev": "8278bbf024d5a6c20c92437bdf2b46b14c2ea856",
+        "type": "github"
+      },
+      "original": {
+        "owner": "thiloho",
+        "repo": "discord-bot",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -25,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693713564,
-        "narHash": "sha256-00w2uwb4O6Y1e2W5LG5UFyl1ZN3KFG7aoRdYEvT/BqA=",
+        "lastModified": 1694375657,
+        "narHash": "sha256-32X8dcty4vPXx+D4yJPQZBo5hJ1NQikALhevGv6elO4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8e49b883890ccb52c059abb152b00a416342ec1c",
+        "rev": "f7848d3e5f15ed02e3f286029697e41ee31662d7",
         "type": "github"
       },
       "original": {
@@ -40,26 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684787197,
-        "narHash": "sha256-tvGDj3zgpW5NGoVKvoTQvkhfFPDgkbzfX+zFUW8NeHw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e2614d8ebcdf9a9eae0efe074f4d745d28595886",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1693663421,
-        "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
+        "lastModified": 1694183432,
+        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e56990880811a451abd32515698c712788be5720",
+        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
         "type": "github"
       },
       "original": {
@@ -72,8 +79,9 @@
     "root": {
       "inputs": {
         "aurora-blog-template": "aurora-blog-template",
+        "denbot": "denbot",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "website": "website"
       }
     },
diff --git a/flake.nix b/flake.nix
index be2aa41..888f8c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,14 @@
       url = "github:thiloho/website";
       flake = false;
     };
-    aurora-blog-template.url = "github:thiloho/aurora";
-    denbot.url = "github:thiloho/discord-bot";
+    aurora-blog-template = {
+      url = "github:thiloho/aurora";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    denbot = {
+      url = "github:thiloho/discord-bot";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{ nixpkgs, home-manager, ... }: {
diff --git a/nixos-configurations/server/default.nix b/nixos-configurations/server/default.nix
index d858f15..e50ed46 100644
--- a/nixos-configurations/server/default.nix
+++ b/nixos-configurations/server/default.nix
@@ -108,9 +108,10 @@
     wantedBy = ["multi-user.target"];
     after = ["network-online.target"];
     serviceConfig = {
-      ExecStart = "${pkgs.nodejs_20}/bin/node index.js --token=$CREDENTIALS_DIRECTORY/bot.token";
+      ExecStartPre = "${pkgs.nodejs_20}/bin/node dbInit.js";
+      ExecStart = "${pkgs.nodejs_20}/bin/node index.js --token=%d/bot.token";
       LoadCredential = "bot.token:/var/run/bot-token.txt";
-      WorkingDirectory = inputs.denbot;
+      WorkingDirectory = inputs.denbot.packages.${pkgs.system}.default;
       Restart = "always";
     };
   };