Merge remote-tracking branch 'refs/remotes/origin/main'

flake.nix

@@ -169,6 +169,10 @@
       url = "github:isabelroses/website";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    blahaj = {
+      url = "github:isabelroses/blahaj";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # a tree-wide formatter
     treefmt-nix = {

home/isabel/programs/configs/gui/default.nix

@@ -2,11 +2,11 @@
   imports = [
     ./bars
     ./browsers
-    ./discord
     ./fileMangers
     ./launchers
     ./terminals
 
+    ./discord.nix
     ./swaync.nix
     ./viewnior.nix
     ./zathura.nix

home/isabel/programs/configs/gui/discord/default.nix → home/isabel/programs/configs/gui/discord.nix

@@ -1,12 +1,12 @@
 {
   lib,
   pkgs,
-  config,
   osConfig,
   ...
 }: let
   inherit (lib) mkIf isWayland ldTernary;
-  inherit (osConfig.modules) environment system;
+
+  fmt = pkgs.formats.json {};
 in {
   config = mkIf osConfig.modules.programs.gui.discord.enable {
     home.packages =
@@ -34,8 +34,8 @@ in {
         })
       ];
 
-    xdg.configFile = {
-      "discord/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${environment.flakePath}/home/${system.mainUser}/programs/configs/gui/discord/settings.json";
+    xdg.configFile."discord/settings.json".source = fmt.generate "discord.json" {
+      SKIP_HOST_UPDATE = true;
     };
   };
 }

hosts/luz/services.nix

@@ -2,6 +2,7 @@
   modules.services = {
     vaultwarden.enable = true;
     isabelroses-website.enable = true;
+    blahaj.enable = true;
     vikunja.enable = true;
     kanidm.enable = true;
     mailserver.enable = true;

modules/base/options/services/default.nix

@@ -43,6 +43,8 @@ in {
         port = 3000;
       };
 
+      blahaj = {};
+
       vikunja = {
         domain = "todo.${rdomain}";
         port = 3456;

modules/base/secrets.nix

@@ -151,6 +151,10 @@ in {
         group = "forgejo";
       };
 
+      blahaj-env = mkSecret services.blahaj.enable {
+        file = "blahaj-env";
+      };
+
       vikunja-env = mkSecret services.vikunja.enable {
         file = "vikunja-env";
         owner = "vikunja";

modules/nixos/services/blahaj.nix

@@ -0,0 +1,21 @@
+{
+  lib,
+  pkgs,
+  config,
+  inputs',
+  ...
+}: {
+  systemd.services."blahaj" = lib.mkIf config.modules.services.blahaj.enable {
+    description = "blahaj";
+    after = ["network.target"];
+    wantedBy = ["multi-user.target"];
+
+    serviceConfig = {
+      Type = "simple";
+      DynamicUser = true;
+      EnvironmentFile = config.age.secrets.blahaj-env.path;
+      ExecStart = "${lib.getExe pkgs.nodejs-slim} ${inputs'.blahaj.packages.default}/lib/node_modules/blahaj/src/bot.js";
+      Restart = "always";
+    };
+  };
+}

modules/nixos/services/default.nix

@@ -6,6 +6,7 @@
     ./monitoring
     ./networking
 
+    ./blahaj.nix
     ./kanidm.nix
     ./mailserver.nix
     ./vaultwarden.nix

secrets/secrets.nix

@@ -49,6 +49,8 @@ in {
   "mailserver-grafana-nohash.age".publicKeys = defAccess types.servers;
   "mailserver-git-nohash.age".publicKeys = defAccess types.servers;
 
+  "blahaj-env.age".publicKeys = defAccess types.servers;
+
   "vikunja-env.age".publicKeys = defAccess types.servers;
 
   "nextcloud-passwd.age".publicKeys = defAccess types.servers;