l 3 newsbot-js -> k 3 newsbot-js

This commit is contained in:
lassulus 2016-03-15 14:37:46 +01:00
parent ab16f4c4b1
commit cbe70e8c39
4 changed files with 4 additions and 7 deletions

View File

@ -21,6 +21,7 @@ let
./go.nix ./go.nix
./iptables.nix ./iptables.nix
./lib.nix ./lib.nix
./newsbot-js.nix
./nginx.nix ./nginx.nix
./nixpkgs.nix ./nixpkgs.nix
./os-release.nix ./os-release.nix

View File

@ -6,10 +6,10 @@ with lib;
let let
inherit (config.krebs.lib) genid; inherit (config.krebs.lib) genid;
cfg = config.lass.newsbot-js; cfg = config.krebs.newsbot-js;
out = { out = {
options.lass.newsbot-js = api; options.krebs.newsbot-js = api;
config = mkIf cfg.enable imp; config = mkIf cfg.enable imp;
}; };

View File

@ -187,13 +187,10 @@ let
hackernews|https://news.ycombinator.com/rss|#news hackernews|https://news.ycombinator.com/rss|#news
''; '';
in { in {
imports = [
../3modules/newsbot-js.nix
];
environment.systemPackages = [ environment.systemPackages = [
pkgs.newsbot-js pkgs.newsbot-js
]; ];
lass.newsbot-js = { krebs.newsbot-js = {
enable = true; enable = true;
ircServer = "localhost"; ircServer = "localhost";
feeds = newsfile; feeds = newsfile;

View File

@ -3,7 +3,6 @@ _:
imports = [ imports = [
./xresources.nix ./xresources.nix
./folderPerms.nix ./folderPerms.nix
./newsbot-js.nix
./per-user.nix ./per-user.nix
./urxvtd.nix ./urxvtd.nix
./xresources.nix ./xresources.nix