diff --git a/applications/discord_t-800.nix b/applications/discord_t-800.nix new file mode 100644 index 0000000..cad630a --- /dev/null +++ b/applications/discord_t-800.nix @@ -0,0 +1,32 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +with lib; let + name = "discord_bot_t-800"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + inputs.skynet_discord_bot_t-800.nixosModule."x86_64-linux" + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Logging Bot"; + }; + + config = mkIf cfg.enable { + #backups = [ "/etc/silver_ul_ical/database.db" ]; + + age.secrets.discord_t-800_details.file = ../secrets/discord/t-800.age; + + # this is what was imported + services.skynet_discord_bot_t-800 = { + enable = true; + + env = config.age.secrets.discord_t-800_details.path; + }; + }; +} diff --git a/flake.lock b/flake.lock index 75e9573..f719ece 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1719514321, @@ -537,6 +537,24 @@ "inputs": { "nixpkgs": "nixpkgs_11" }, + "locked": { + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_4": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, "locked": { "lastModified": 1739824009, "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", @@ -621,6 +639,22 @@ } }, "nixpkgs-mozilla_2": { + "flake": false, + "locked": { + "lastModified": 1744624473, + "narHash": "sha256-S6zT/w5SyAkJ//dYdjbrXgm+6Vkd/k7qqUl4WgZ6jjk=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "2292d4b35aa854e312ad2e95c4bb5c293656f21a", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "nixpkgs-mozilla_3": { "flake": false, "locked": { "lastModified": 1740762144, @@ -652,6 +686,37 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1750731501, + "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69dfebb3d175bde602f612915c5576a41b18486b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -665,7 +730,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -680,7 +745,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -694,7 +759,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -708,34 +773,6 @@ "type": "indirect" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -752,11 +789,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -766,11 +803,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -796,11 +833,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -823,6 +860,34 @@ } }, "nixpkgs_22": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_24": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -836,7 +901,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -852,7 +917,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -981,6 +1046,7 @@ "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", + "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", @@ -1074,13 +1140,34 @@ "url": "https://forgejo.skynet.ie/Skynet/discord-bot" } }, - "skynet_ldap_backend": { + "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_12", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, + "locked": { + "lastModified": 1751383566, + "narHash": "sha256-MchpwkTBUlpa8Spj8UJbvPPW1TOaAtffsraQQSJ4a58=", + "ref": "refs/heads/main", + "rev": "4fe416b9e7280d02e6ecc4b5e77c95b8d218f419", + "revCount": 23, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + } + }, + "skynet_ldap_backend": { + "inputs": { + "naersk": "naersk_4", + "nixpkgs": "nixpkgs_14", + "nixpkgs-mozilla": "nixpkgs-mozilla_3", + "utils": "utils_5" + }, "locked": { "lastModified": 1751234352, "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", @@ -1097,8 +1184,8 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_13", - "utils": "utils_5" + "nixpkgs": "nixpkgs_15", + "utils": "utils_6" }, "locked": { "lastModified": 1727122070, @@ -1116,8 +1203,8 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_14", - "utils": "utils_6" + "nixpkgs": "nixpkgs_16", + "utils": "utils_7" }, "locked": { "lastModified": 1732375016, @@ -1135,8 +1222,8 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_7" + "nixpkgs": "nixpkgs_17", + "utils": "utils_8" }, "locked": { "lastModified": 1744118392, @@ -1154,8 +1241,8 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_8" + "nixpkgs": "nixpkgs_18", + "utils": "utils_9" }, "locked": { "lastModified": 1743721206, @@ -1173,8 +1260,8 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_9" + "nixpkgs": "nixpkgs_19", + "utils": "utils_10" }, "locked": { "lastModified": 1743715699, @@ -1192,8 +1279,8 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_10" + "nixpkgs": "nixpkgs_20", + "utils": "utils_11" }, "locked": { "lastModified": 1743722645, @@ -1211,8 +1298,8 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "nixpkgs": "nixpkgs_21", + "utils": "utils_12" }, "locked": { "lastModified": 1743727062, @@ -1232,8 +1319,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_20", - "utils": "utils_12" + "nixpkgs": "nixpkgs_22", + "utils": "utils_13" }, "locked": { "lastModified": 1696876711, @@ -1253,8 +1340,8 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_21", - "utils": "utils_13" + "nixpkgs": "nixpkgs_23", + "utils": "utils_14" }, "locked": { "lastModified": 1732375016, @@ -1274,8 +1361,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_22", - "utils": "utils_14" + "nixpkgs": "nixpkgs_24", + "utils": "utils_15" }, "locked": { "lastModified": 1727122069, @@ -1294,8 +1381,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_24", - "utils": "utils_15" + "nixpkgs": "nixpkgs_26", + "utils": "utils_16" }, "locked": { "lastModified": 1745466454, @@ -1477,6 +1564,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1620,11 +1722,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1637,6 +1739,24 @@ "inputs": { "systems": "systems_14" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_15" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -1651,9 +1771,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1689068808, @@ -1669,9 +1789,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, @@ -1687,9 +1807,9 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1694529238, @@ -1705,9 +1825,9 @@ "type": "github" } }, - "utils_15": { + "utils_16": { "inputs": { - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1710146030, @@ -1782,11 +1902,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1800,11 +1920,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -1818,11 +1938,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 034dd7b..f63e7c8 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; + skynet_discord_bot_t-800.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot-t-800"; # for testing a local build # skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1"; diff --git a/machines/kitt.nix b/machines/kitt.nix index 93298ac..35600c8 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -29,6 +29,7 @@ in { ../applications/ldap/server.nix ../applications/ldap/backend.nix ../applications/discord.nix + ../applications/discord_t-800.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix ../applications/sso.nix @@ -53,6 +54,9 @@ in { # private member services discord_bot.enable = true; + # for logging on our own discord + discord_bot_t-800.enable = true; + # committee/admin services vaultwarden.enable = true; diff --git a/secrets/discord/t-800.age b/secrets/discord/t-800.age new file mode 100644 index 0000000..4961161 Binary files /dev/null and b/secrets/discord/t-800.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5321af2..a69d2c4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -138,6 +138,7 @@ in { # discord bot and discord "discord/token.age".publicKeys = users ++ discord; + "discord/t-800.age".publicKeys = users ++ discord; # email stuff "email/details.age".publicKeys = users ++ ldap ++ discord;