summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/newsbot-js.nix5
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/newsbot-js.nix89
3 files changed, 1 insertions, 94 deletions
diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix
index 4482c4e9d..d7c68bd7d 100644
--- a/lass/2configs/newsbot-js.nix
+++ b/lass/2configs/newsbot-js.nix
@@ -187,13 +187,10 @@ let
hackernews|https://news.ycombinator.com/rss|#news
'';
in {
- imports = [
- ../3modules/newsbot-js.nix
- ];
environment.systemPackages = [
pkgs.newsbot-js
];
- lass.newsbot-js = {
+ krebs.newsbot-js = {
enable = true;
ircServer = "localhost";
feeds = newsfile;
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 0dcad971c..f891498c2 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -3,7 +3,6 @@ _:
imports = [
./xresources.nix
./folderPerms.nix
- ./newsbot-js.nix
./per-user.nix
./urxvtd.nix
./xresources.nix
diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix
deleted file mode 100644
index 0772971da..000000000
--- a/lass/3modules/newsbot-js.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with builtins;
-with lib;
-
-let
- inherit (config.krebs.lib) genid;
-
- cfg = config.lass.newsbot-js;
-
- out = {
- options.lass.newsbot-js = api;
- config = mkIf cfg.enable imp;
- };
-
- api = {
- enable = mkEnableOption "Enable krebs newsbot";
- ircServer = mkOption {
- type = types.str;
- default = "echelon.retiolum";
- description = "to which server the bot should connect";
- };
- channel = mkOption {
- type = types.str;
- default = "#news";
- description = "post the news in this channel";
- };
- masterNick = mkOption {
- type = types.str;
- default = "knews";
- description = "nickname of the master bot";
- };
- feeds = mkOption {
- type = types.path;
- description = ''
- file with feeds to post
- format:
- $nick|$feedURI
- '';
- };
- urlShortenerHost = mkOption {
- type = types.str;
- default = "echelon";
- description = "what server to use for url shortening, host";
- };
- urlShortenerPort = mkOption {
- type = types.str;
- default = "80";
- description = "what server to use for url shortening, port";
- };
- };
-
- imp = {
- users.extraUsers.newsbot-js = {
- name = "newsbot-js";
- uid = genid "newsbot-js";
- description = "newsbot-js user";
- home = "/var/empty";
- };
-
- systemd.services.newsbot-js = {
- description = "krebs newsbot";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- path = with pkgs; [
- newsbot-js
- ];
-
- environment = {
- irc_server = cfg.ircServer;
- master_nick = cfg.masterNick;
- news_channel = cfg.channel;
- feeds_file = cfg.feeds;
- url_shortener_host = cfg.urlShortenerHost;
- url_shortener_port = cfg.urlShortenerPort;
- };
-
- restartIfChanged = true;
-
- serviceConfig = {
- User = "newsbot-js";
- Restart = "always";
- ExecStart = "${pkgs.newsbot-js}/bin/newsbot";
- };
- };
- };
-
-in out