summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/newsbot-js.nix (renamed from lass/3modules/newsbot-js.nix)4
-rw-r--r--lass/2configs/newsbot-js.nix5
-rw-r--r--lass/3modules/default.nix1
4 files changed, 4 insertions, 7 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index bdd9049cb..af5076e0f 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -21,6 +21,7 @@ let
./go.nix
./iptables.nix
./lib.nix
+ ./newsbot-js.nix
./nginx.nix
./nixpkgs.nix
./os-release.nix
diff --git a/lass/3modules/newsbot-js.nix b/krebs/3modules/newsbot-js.nix
index 0772971da..b58c555e7 100644
--- a/lass/3modules/newsbot-js.nix
+++ b/krebs/3modules/newsbot-js.nix
@@ -6,10 +6,10 @@ with lib;
let
inherit (config.krebs.lib) genid;
- cfg = config.lass.newsbot-js;
+ cfg = config.krebs.newsbot-js;
out = {
- options.lass.newsbot-js = api;
+ options.krebs.newsbot-js = api;
config = mkIf cfg.enable imp;
};
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