From 1234efe72de6912f0a728eaac6c64979a729c973 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 21:32:36 +0200 Subject: [PATCH 01/25] Reaktor plugins: add wiki-todo --- krebs/5pkgs/simple/Reaktor/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index e85e41cfe..d4fa5b1cf 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -128,4 +128,23 @@ rec { ''; }); + wiki-todo-add = buildSimpleReaktorPlugin "wiki-todo-add" { + pattern = "^wiki-todo: (?P.*)$$"; + script = pkgs.writeDash "wiki-todo-add" '' + echo "$@" >> wiki-todo + echo "added todo" + ''; + }; + wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" { + pattern = "^wiki-todo-done: (?P.*)$$"; + script = pkgs.writeDash "wiki-todo-done" '' + ${pkgs.gnugrep}/bin/grep -vFx "$@" wiki-todo > wiki-todo.tmp + ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo + ''; + }; + wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" { + script = pkgs.writeDash "wiki-todo-add" '' + ${pkgs.coreutils}/bin/cat wiki-todo + ''; + }; } From c6ed05c10d9b5b11e623e3bb36b3f40b824691bb Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 22:05:21 +0200 Subject: [PATCH 02/25] l: add Reaktor|krebs --- lass/1systems/prism/config.nix | 1 + lass/2configs/reaktor-krebs.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 lass/2configs/reaktor-krebs.nix diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 744bae551..c50100181 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -42,6 +42,7 @@ in { + { lass.pyload.enable = true; } diff --git a/lass/2configs/reaktor-krebs.nix b/lass/2configs/reaktor-krebs.nix new file mode 100644 index 000000000..7727bbf9c --- /dev/null +++ b/lass/2configs/reaktor-krebs.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: +with import ; + +{ + krebs.Reaktor.krebs = { + nickname = "Reaktor|krebs"; + channels = [ + "#krebs" + "#nixos-wiki" + ]; + extraEnviron = { + REAKTOR_HOST = "irc.freenode.org"; + }; + plugins = with pkgs.ReaktorPlugins; [ + sed-plugin + wiki-todo-add + wiki-todo-done + wiki-todo-show + ]; + }; +} From 78ea2c5b1a8e483edecff58b5cfe06425a2ba7b9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 22:06:09 +0200 Subject: [PATCH 03/25] l: coders-irc -> reaktor-coders --- lass/1systems/prism/config.nix | 2 +- lass/2configs/{coders-irc.nix => reaktor-coders.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lass/2configs/{coders-irc.nix => reaktor-coders.nix} (100%) diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index c50100181..91f9956f1 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -39,7 +39,7 @@ in { - + diff --git a/lass/2configs/coders-irc.nix b/lass/2configs/reaktor-coders.nix similarity index 100% rename from lass/2configs/coders-irc.nix rename to lass/2configs/reaktor-coders.nix From 877edfa122837c3025ac9fc74895be5cb92d3433 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 22:15:51 +0200 Subject: [PATCH 04/25] Reaktor plugins wiki-todo: fix flag injection found by makefu --- krebs/5pkgs/simple/Reaktor/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index d4fa5b1cf..eb591b274 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -131,14 +131,14 @@ rec { wiki-todo-add = buildSimpleReaktorPlugin "wiki-todo-add" { pattern = "^wiki-todo: (?P.*)$$"; script = pkgs.writeDash "wiki-todo-add" '' - echo "$@" >> wiki-todo + echo "$*" >> wiki-todo echo "added todo" ''; }; wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" { pattern = "^wiki-todo-done: (?P.*)$$"; script = pkgs.writeDash "wiki-todo-done" '' - ${pkgs.gnugrep}/bin/grep -vFx "$@" wiki-todo > wiki-todo.tmp + ${pkgs.gnugrep}/bin/grep -Fvxe "$*" wiki-todo > wiki-todo.tmp ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo ''; }; From 66f76c34b72f295a341cebe5e80a7574960592e6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 22:31:54 +0200 Subject: [PATCH 05/25] l: no longer sync nixpkgs --- lass/1systems/prism/config.nix | 4 ---- lass/2configs/repo-sync.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 91f9956f1..b3f547452 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -245,10 +245,6 @@ in { OnUnitInactiveSec = "2min"; RandomizedDelaySec = "2min"; }; - krebs.repo-sync.repos.nixpkgs.timerConfig = { - OnBootSec = "90min"; - OnUnitInactiveSec = "24h"; - }; } { lass.usershadow = { diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix index 0b6cd8231..f0c0ebfee 100644 --- a/lass/2configs/repo-sync.nix +++ b/lass/2configs/repo-sync.nix @@ -107,7 +107,6 @@ in { (sync-remote "painload" "https://github.com/krebscode/painload") (sync-remote "Reaktor" "https://github.com/krebscode/Reaktor") (sync-remote "nixos-wiki" "https://github.com/Mic92/nixos-wiki.wiki.git") - (sync-remote-silent "nixpkgs" "https://github.com/nixos/nixpkgs") (sync-retiolum "go") (sync-retiolum "much") (sync-retiolum "newsbot-js") From 121e14310ff6ad58d513e5caec0a2990d19bbead Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Sep 2017 22:55:02 +0200 Subject: [PATCH 06/25] l git: add nixpkgs --- lass/2configs/git.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index eb606037e..61a352bde 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -34,6 +34,10 @@ let cgit.desc = "take a rss feed and a timeout and print it to stdout"; cgit.section = "software"; }; + nixpkgs = { + cgit.desc = "nixpkgs fork"; + cgit.section = "configuration"; + }; stockholm = { cgit.desc = "take all the computers hostage, they'll love you!"; cgit.section = "configuration"; From 28aadfeb357ed1c57c8af0d79045406c8f1ef0cd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 16:13:30 +0200 Subject: [PATCH 07/25] l daedalus.r: add de keyboard layout --- lass/1systems/daedalus/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 36daea1d5..a3db0f1b4 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -37,6 +37,7 @@ with import ; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; services.xserver.desktopManager.plasma5.enable = true; + services.xserver.layout = "de"; } { krebs.per-user.bitcoin.packages = [ From 8675e81a60b14ce8570e29cc8aae242d81363bf3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 16:14:53 +0200 Subject: [PATCH 08/25] l reaktor-krebs: show tiki-todo with nginx --- lass/2configs/reaktor-krebs.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lass/2configs/reaktor-krebs.nix b/lass/2configs/reaktor-krebs.nix index 7727bbf9c..6b17b457d 100644 --- a/lass/2configs/reaktor-krebs.nix +++ b/lass/2configs/reaktor-krebs.nix @@ -18,4 +18,8 @@ with import ; wiki-todo-show ]; }; + services.nginx.virtualHosts."lassul.us".locations."/wiki-todo".extraConfig = '' + default_type "text/plain"; + alias /var/lib/Reaktor/state/wiki-todo; + ''; } From ec3128bb559996443f71076090208664b41e5548 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 16:15:33 +0200 Subject: [PATCH 09/25] l xresources: set browser-select on active browser --- lass/2configs/xresources.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix index b5ba3df14..2fbc31677 100644 --- a/lass/2configs/xresources.nix +++ b/lass/2configs/xresources.nix @@ -14,7 +14,9 @@ let ! ref https://github.com/muennich/urxvt-perls URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select - URxvt.url-select.launcher: ${config.lass.browser.select}/bin/browser-select + ${optionalString (hasAttr "browser" config.lass) + "URxvt.url-select.launcher: ${config.lass.browser.select}/bin/browser-select" + } URxvt.url-select.underline: true URxvt.keysym.M-u: perl:url-select:select_next URxvt.keysym.M-Escape: perl:keyboard-select:activate From 04626b6b0a0bcbf978735e6f2abb74b4f5631c9e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 16:16:37 +0200 Subject: [PATCH 10/25] l source: make overrideable --- lass/source.nix | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/lass/source.nix b/lass/source.nix index 26c668241..52b0d99f2 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -1,24 +1,27 @@ with import ; -host@{ name, secure ? false }: let +host@{ name, secure ? false, override ? {} }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "lass"; _file = + "/lass/1systems/${name}/source.nix"; in - evalSource (toString _file) { - nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; - secrets.file = getAttr builder { - buildbot = toString ; - lass = "/home/lass/secrets/${name}"; - }; - stockholm.file = toString ; - nixpkgs.git = { - url = http://cgit.lassul.us/nixpkgs; - # nixos-17.03 - # + copytoram: - # 87a4615 & 334ac4f - # + acme permissions for groups - # fd7a8f1 - ref = "fe46ffc"; - }; - } + evalSource (toString _file) [ + { + nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; + nixpkgs.git = { + url = http://cgit.lassul.us/nixpkgs; + # nixos-17.03 + # + copytoram: + # 87a4615 & 334ac4f + # + acme permissions for groups + # fd7a8f1 + ref = "fe46ffc"; + }; + secrets.file = getAttr builder { + buildbot = toString ; + lass = "/home/lass/secrets/${name}"; + }; + stockholm.file = toString ; + } + override + ] From 8c131beb3ab6011276e3f123b8fea50fe8c7d91c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 21:41:00 +0200 Subject: [PATCH 11/25] l mors.r: remove elasticsearch --- lass/1systems/mors/config.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 58f55ce68..a0e0f90a2 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -34,11 +34,6 @@ with import ; { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; } ]; } - { - services.elasticsearch = { - enable = true; - }; - } { lass.umts = { enable = true; From 495d8cddb0b59351f08ee6154b483f1826b3d70c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 22:16:46 +0200 Subject: [PATCH 12/25] l daedalus.r: add pkgs.libreoffice --- lass/1systems/daedalus/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index a3db0f1b4..db1bb5d3a 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -33,6 +33,7 @@ with import ; firefox hexchat networkmanagerapplet + libreoffice ]; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; From 5184d19651f9319d63fd812601f3df635b1416b8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 22:17:31 +0200 Subject: [PATCH 13/25] l daedalus.r: add remote control --- lass/1systems/daedalus/config.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index db1bb5d3a..e1bce5da8 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -57,6 +57,15 @@ with import ; bubsy ALL=(bitcoin) NOPASSWD: ALL ''; } + { + #remote control + environment.systemPackages = with pkgs; [ + x11vnc + ]; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp -i retiolum --dport 5900"; target = "ACCEPT"; } + ]; + } ]; time.timeZone = "Europe/Berlin"; From 6ed86f26f4b65c27205d9c36adcbe9018dab7eb1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Sep 2017 10:35:05 +0200 Subject: [PATCH 14/25] Reaktor plugins wiki-todo: update feedback text --- krebs/5pkgs/simple/Reaktor/plugins.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index eb591b274..c611d7471 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -132,14 +132,15 @@ rec { pattern = "^wiki-todo: (?P.*)$$"; script = pkgs.writeDash "wiki-todo-add" '' echo "$*" >> wiki-todo - echo "added todo" + echo "added todo. check on http://lassul.us/wiki-todo" ''; }; wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" { - pattern = "^wiki-todo-done: (?P.*)$$"; + pattern = "^wiki-done: (?P.*)$$"; script = pkgs.writeDash "wiki-todo-done" '' ${pkgs.gnugrep}/bin/grep -Fvxe "$*" wiki-todo > wiki-todo.tmp ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo + echo "thank you for resolving todo: $*" ''; }; wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" { From 6ab81a2797d5bc58dbe3acfb0a3c268baf159220 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Sep 2017 10:36:14 +0200 Subject: [PATCH 15/25] l mors.r: add c-base config --- lass/1systems/mors/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index a0e0f90a2..53854d3be 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -28,6 +28,7 @@ with import ; + { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ From bd413110f1319cc78a42e43bf81d9cdfcd2d927c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Sep 2017 10:38:36 +0200 Subject: [PATCH 16/25] l: add btce@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 611e1b9da..a70d58828 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -41,6 +41,7 @@ with import ; { from = "steam@lassul.us"; to = lass.mail; } { from = "securityfocus@lassul.us"; to = lass.mail; } { from = "radio@lassul.us"; to = lass.mail; } + { from = "btce@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } From 4d583ce9a13488f068d7dbbfb625b64f73ea4f4a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Sep 2017 10:42:12 +0200 Subject: [PATCH 17/25] l pkgs.xmonad: add quick brightness control keys --- lass/5pkgs/xmonad-lass.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index 38a9550df..67a1dc787 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -130,6 +130,11 @@ myKeyMap = , ("M4-S-q", return ()) , ("M4-w", floatNext True >> spawn "${pkgs.copyq}/bin/copyq show") + + , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 1") + , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 10") + , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 33") + , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 100") ] forkFile :: FilePath -> [String] -> Maybe [(String, String)] -> X () From 5b4af805ecc2ea4ea7abd4f3298686282778d7e9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 00:14:29 +0200 Subject: [PATCH 18/25] move go.r: echelon.r -> puyak.r --- krebs/3modules/krebs/default.nix | 1 + krebs/3modules/lass/default.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 881329a47..44fcbdb37 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -100,6 +100,7 @@ in { "puyak.r" "build.puyak.r" "cgit.puyak.r" + "go.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 9b1e6ba20..257268af2 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -56,7 +56,6 @@ with import ; aliases = [ "echelon.r" "cgit.echelon.r" - "go.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- From 2855881c732c041d9b6cd9c830d6ac4b84157b17 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 00:16:54 +0200 Subject: [PATCH 19/25] move news & deps: echelon.r -> puyak.r --- krebs/1systems/puyak/config.nix | 3 + {lass => krebs}/2configs/go.nix | 0 {lass => krebs}/2configs/ircd.nix | 4 +- krebs/2configs/news.nix | 179 +++++++++++++++++++++++++++++ lass/1systems/echelon/config.nix | 3 - lass/1systems/mors/config.nix | 2 +- lass/2configs/newsbot-js.nix | 180 ------------------------------ 7 files changed, 185 insertions(+), 186 deletions(-) rename {lass => krebs}/2configs/go.nix (100%) rename {lass => krebs}/2configs/ircd.nix (94%) create mode 100644 krebs/2configs/news.nix delete mode 100644 lass/2configs/newsbot-js.nix diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index d4a4941ca..31cc024af 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -11,6 +11,9 @@ + + + ]; krebs.build.host = config.krebs.hosts.puyak; diff --git a/lass/2configs/go.nix b/krebs/2configs/go.nix similarity index 100% rename from lass/2configs/go.nix rename to krebs/2configs/go.nix diff --git a/lass/2configs/ircd.nix b/krebs/2configs/ircd.nix similarity index 94% rename from lass/2configs/ircd.nix rename to krebs/2configs/ircd.nix index ee4c0216c..116337733 100644 --- a/lass/2configs/ircd.nix +++ b/krebs/2configs/ircd.nix @@ -1,8 +1,8 @@ { config, pkgs, ... }: { - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-i retiolum -p tcp --dport 6667"; target = "ACCEPT"; } + networking.firewall.allowedTCPPorts = [ + 6667 6669 ]; services.charybdis = { diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix new file mode 100644 index 000000000..e61392b17 --- /dev/null +++ b/krebs/2configs/news.nix @@ -0,0 +1,179 @@ +{ config, pkgs, ... }: + +let +in { + environment.systemPackages = [ + pkgs.newsbot-js + ]; + krebs.newsbot-js = { + enable = true; + ircServer = "localhost"; + urlShortenerHost = "go"; + urlShortenerPort = "80"; + feeds = pkgs.writeText "feeds" '' + aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#news + allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#news + antirez|http://antirez.com/rss|#news + arbor|http://feeds2.feedburner.com/asert/|#news + archlinux|http://www.archlinux.org/feeds/news/|#news + ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#news + augustl|http://augustl.com/atom.xml|#news + bbc|http://feeds.bbci.co.uk/news/rss.xml|#news + bdt_aktuelle_themen|http://www.bundestag.de/blueprint/servlet/service/de/14154/asFeed/index.rss|#news + bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news #bundestag + bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag + bdt_pressemitteilungen|http://www.bundestag.de/blueprint/servlet/service/de/273112/asFeed/index.rss|#news + bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial + cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news + carta|http://feeds2.feedburner.com/carta-standard-rss|#news + catholic_news|http://feeds.feedburner.com/catholicnewsagency/dailynews|#news + cbc_busi|http://rss.cbc.ca/lineup/business.xml|#news + cbc_offbeat|http://www.cbc.ca/cmlink/rss-offbeat|#news + cbc_pol|http://rss.cbc.ca/lineup/politics.xml|#news + cbc_tech|http://rss.cbc.ca/lineup/technology.xml|#news + cbc_top|http://rss.cbc.ca/lineup/topstories.xml|#news + ccc|http://www.ccc.de/rss/updates.rdf|#news + chan_b|https://boards.4chan.org/b/index.rss|#brainfuck + chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck + chan_g|https://boards.4chan.org/g/index.rss|#news + chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck + chan_sci|https://boards.4chan.org/sci/index.rss|#news + chan_x|https://boards.4chan.org/x/index.rss|#news + c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news + cryptogon|http://www.cryptogon.com/?feed=rss2|#news + csm|http://rss.csmonitor.com/feeds/csm|#news + csm_world|http://rss.csmonitor.com/feeds/world|#news + danisch|http://www.danisch.de/blog/feed/|#news + dod|http://www.defense.gov/news/afps2.xml|#news + dwn|http://deutsche-wirtschafts-nachrichten.de/feed/customfeed/|#news + ecat|http://ecat.com/feed|#news + eia_press|http://www.eia.gov/rss/press_rss.xml|#news + eia_today|http://www.eia.gov/rss/todayinenergy.xml|#news + embargowatch|https://embargowatch.wordpress.com/feed/|#news + ethereum-comments|http://blog.ethereum.org/comments/feed|#news + ethereum|http://blog.ethereum.org/feed|#news + europa_ric|http://ec.europa.eu/research/infocentre/rss/infocentre-rss.xml|#news + eu_survei|http://www.eurosurveillance.org/public/RSSFeed/RSS.aspx|#news + exploitdb|http://www.exploit-db.com/rss.xml|#news + fars|http://www.farsnews.com/rss.php|#news #test + faz_feui|http://www.faz.net/rss/aktuell/feuilleton/|#news + faz_politik|http://www.faz.net/rss/aktuell/politik/|#news + faz_wirtschaft|http://www.faz.net/rss/aktuell/wirtschaft/|#news + fbi|https://www.fbi.gov/news/rss.xml|#news + fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news + fefe|http://blog.fefe.de/rss.xml|#news + forbes|http://www.forbes.com/forbes/feed2/|#news + forbes_realtime|http://www.forbes.com/real-time/feed2/|#news + fox|http://feeds.foxnews.com/foxnews/latest|#news + geheimorganisation|http://geheimorganisation.org/feed/|#news + GerForPol|http://www.german-foreign-policy.com/de/news/rss-2.0|#news + gmanet|http://www.gmanetwork.com/news/rss/news|#news + golem|https://rss.golem.de/rss.php|#news + google|http://news.google.com/?output=rss|#news + greenpeace|http://feeds.feedburner.com/GreenpeaceNews|#news + guardian_uk|http://feeds.theguardian.com/theguardian/uk-news/rss|#news + gulli|http://ticker.gulli.com/rss/|#news + hackernews|https://news.ycombinator.com/rss|#news + handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial + heise|https://www.heise.de/newsticker/heise-atom.xml|#news + hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial + hindu|http://www.thehindu.com/?service=rss|#news + ign|http://feeds.ign.com/ign/all|#news + independent|http://www.independent.com/rss/headlines/|#news + indymedia|https://de.indymedia.org/rss.xml|#news + info_libera|http://www.informationliberation.com/rss.xml|#news + klagen-gegen-rundfuckbeitrag|http://klagen-gegen-rundfunkbeitrag.blogspot.com/feeds/posts/default|#news + korea_herald|http://www.koreaherald.com/rss_xml.php|#news + linuxinsider|http://www.linuxinsider.com/perl/syndication/rssfull.pl|#news + lisp|http://planet.lisp.org/rss20.xml|#news + liveleak|http://www.liveleak.com/rss|#news + lolmythesis|http://lolmythesis.com/rss|#news + LtU|http://lambda-the-ultimate.org/rss.xml|#news + lukepalmer|http://lukepalmer.wordpress.com/feed/|#news + mit|http://web.mit.edu/newsoffice/rss-feeds.feed?type=rss|#news + mongrel2_master|https://github.com/zedshaw/mongrel2/commits/master.atom|#news + nds|http://www.nachdenkseiten.de/?feed=atom|#news + netzpolitik|https://netzpolitik.org/feed/|#news + newsbtc|http://newsbtc.com/feed/|#news #financial + nnewsg|http://www.net-news-global.net/rss/rssfeed.xml|#news + npr_busi|http://www.npr.org/rss/rss.php?id=1006|#news + npr_headlines|http://www.npr.org/rss/rss.php?id=1001|#news + npr_pol|http://www.npr.org/rss/rss.php?id=1012|#news + npr_world|http://www.npr.org/rss/rss.php?id=1004|#news + nsa|https://www.nsa.gov/rss.xml|#news #bullerei + nytimes|http://rss.nytimes.com/services/xml/rss/nyt/World.xml|#news + painload|https://github.com/krebscode/painload/commits/master.atom|#news + phys|http://phys.org/rss-feed/|#news + piraten|https://www.piratenpartei.de/feed/|#news + polizei_berlin|http://www.berlin.de/polizei/presse-fahndung/_rss_presse.xml|#news #bullerei + presse_polizei|http://www.presseportal.de/rss/polizei.rss2|#news #bullerei + presseportal|http://www.presseportal.de/rss/presseportal.rss2|#news + prisonplanet|http://prisonplanet.com/feed.rss|#news + rawstory|http://www.rawstory.com/rs/feed/|#news + reddit_4chan|http://www.reddit.com/r/4chan/new/.rss|#news #brainfuck + reddit_anticonsum|http://www.reddit.com/r/Anticonsumption/new/.rss|#news + reddit_btc|http://www.reddit.com/r/Bitcoin/new/.rss|#news #financial + reddit_consp|http://reddit.com/r/conspiracy/.rss|#news + reddit_haskell|http://www.reddit.com/r/haskell/.rss|#news + reddit_nix|http://www.reddit.com/r/nixos/.rss|#news + reddit_prog|http://www.reddit.com/r/programming/new/.rss|#news + reddit_sci|http://www.reddit.com/r/science/.rss|#news + reddit_tech|http://www.reddit.com/r/technology/.rss|#news + reddit_tpp|http://www.reddit.com/r/twitchplayspokemon/.rss|#news #tpp + reddit_world|http://www.reddit.com/r/worldnews/.rss|#news + r-ethereum|http://www.reddit.com/r/ethereum/.rss|#news + reuters|http://feeds.reuters.com/Reuters/worldNews|#news + reuters-odd|http://feeds.reuters.com/reuters/oddlyEnoughNews?format=xml|#news + rt|http://rt.com/rss/news/|#news + schallurauch|http://feeds.feedburner.com/SchallUndRauch|#news + sciencemag|http://news.sciencemag.org/rss/current.xml|#news + scmp|http://www.scmp.com/rss/91/feed|#news + sec-db|http://feeds.security-database.com/SecurityDatabaseToolsWatch|#news + shackspace|http://blog.shackspace.de/?feed=rss2|#news + shz_news|http://www.shz.de/nachrichten/newsticker/rss|#news + sky_busi|http://feeds.skynews.com/feeds/rss/business.xml|#news + sky_pol|http://feeds.skynews.com/feeds/rss/politics.xml|#news + sky_strange|http://feeds.skynews.com/feeds/rss/strange.xml|#news + sky_tech|http://feeds.skynews.com/feeds/rss/technology.xml|#news + sky_world|http://feeds.skynews.com/feeds/rss/world.xml|#news + slashdot|http://rss.slashdot.org/Slashdot/slashdot|#news + slate|http://feeds.slate.com/slate|#news + spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#news + spiegelfechter|http://feeds.feedburner.com/DerSpiegelfechter?format=xml|#news + spiegel_top|http://www.spiegel.de/schlagzeilen/tops/index.rss|#news + standardmedia_ke|http://www.standardmedia.co.ke/rss/headlines.php|#news + stern|http://www.stern.de/feed/standard/all/|#news + stz|http://www.stuttgarter-zeitung.de/rss/topthemen.rss.feed|#news + sz_politik|http://rss.sueddeutsche.de/rss/Politik|#news + sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news #financial + sz_wissen|http://rss.sueddeutsche.de/rss/Wissen|#news + tagesschau|http://www.tagesschau.de/newsticker.rdf|#news + taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news + telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial + telegraph_pol|http://www.telegraph.co.uk/news/politics/rss|#news + telegraph_uk|http://www.telegraph.co.uk/news/uknews/rss|#news + telegraph_world|http://www.telegraph.co.uk/news/worldnews/rss|#news + telepolis|http://www.heise.de/tp/rss/news-atom.xml|#news + the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#news + tigsource|http://www.tigsource.com/feed/|#news + tinc|http://tinc-vpn.org/news/index.rss|#news + topix_b|http://www.topix.com/rss/wire/de/berlin|#news + torr_bits|http://feeds.feedburner.com/TorrentfreakBits|#news + torrentfreak|http://feeds.feedburner.com/Torrentfreak|#news + torr_news|http://feed.torrentfreak.com/Torrentfreak/|#news + travel_warnings|http://feeds.travel.state.gov/ca/travelwarnings-alerts|#news + un_afr|http://www.un.org/apps/news/rss/rss_africa.asp|#news + un_am|http://www.un.org/apps/news/rss/rss_americas.asp|#news + un_eu|http://www.un.org/apps/news/rss/rss_europe.asp|#news + un_me|http://www.un.org/apps/news/rss/rss_mideast.asp|#news + un_pac|http://www.un.org/apps/news/rss/rss_asiapac.asp|#news + un_top|http://www.un.org/apps/news/rss/rss_top.asp|#news + us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#news + vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news + weechat|http://dev.weechat.org/feed/atom|#news + wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#news + xkcd|https://xkcd.com/rss.xml|#news + zdnet|http://www.zdnet.com/news/rss.xml|#news + ''; + }; +} diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix index 77958267d..127819379 100644 --- a/lass/1systems/echelon/config.nix +++ b/lass/1systems/echelon/config.nix @@ -12,9 +12,6 @@ in { - - - { networking.interfaces.enp2s1.ip4 = [ { diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 53854d3be..4d2f8b0f8 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -24,7 +24,7 @@ with import ; - + diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix deleted file mode 100644 index 5e028a3fb..000000000 --- a/lass/2configs/newsbot-js.nix +++ /dev/null @@ -1,180 +0,0 @@ -{ config, pkgs, ... }: - -let - newsfile = pkgs.writeText "feeds" '' - aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#news - allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#news - antirez|http://antirez.com/rss|#news - arbor|http://feeds2.feedburner.com/asert/|#news - archlinux|http://www.archlinux.org/feeds/news/|#news - ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#news - augustl|http://augustl.com/atom.xml|#news - bbc|http://feeds.bbci.co.uk/news/rss.xml|#news - bdt_aktuelle_themen|http://www.bundestag.de/blueprint/servlet/service/de/14154/asFeed/index.rss|#news - bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news #bundestag - bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag - bdt_pressemitteilungen|http://www.bundestag.de/blueprint/servlet/service/de/273112/asFeed/index.rss|#news - bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial - cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news - carta|http://feeds2.feedburner.com/carta-standard-rss|#news - catholic_news|http://feeds.feedburner.com/catholicnewsagency/dailynews|#news - cbc_busi|http://rss.cbc.ca/lineup/business.xml|#news - cbc_offbeat|http://www.cbc.ca/cmlink/rss-offbeat|#news - cbc_pol|http://rss.cbc.ca/lineup/politics.xml|#news - cbc_tech|http://rss.cbc.ca/lineup/technology.xml|#news - cbc_top|http://rss.cbc.ca/lineup/topstories.xml|#news - ccc|http://www.ccc.de/rss/updates.rdf|#news - chan_b|https://boards.4chan.org/b/index.rss|#brainfuck - chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck - chan_g|https://boards.4chan.org/g/index.rss|#news - chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck - chan_sci|https://boards.4chan.org/sci/index.rss|#news - chan_x|https://boards.4chan.org/x/index.rss|#news - c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news - cryptogon|http://www.cryptogon.com/?feed=rss2|#news - csm|http://rss.csmonitor.com/feeds/csm|#news - csm_world|http://rss.csmonitor.com/feeds/world|#news - danisch|http://www.danisch.de/blog/feed/|#news - dod|http://www.defense.gov/news/afps2.xml|#news - dwn|http://deutsche-wirtschafts-nachrichten.de/feed/customfeed/|#news - ecat|http://ecat.com/feed|#news - eia_press|http://www.eia.gov/rss/press_rss.xml|#news - eia_today|http://www.eia.gov/rss/todayinenergy.xml|#news - embargowatch|https://embargowatch.wordpress.com/feed/|#news - ethereum-comments|http://blog.ethereum.org/comments/feed|#news - ethereum|http://blog.ethereum.org/feed|#news - europa_ric|http://ec.europa.eu/research/infocentre/rss/infocentre-rss.xml|#news - eu_survei|http://www.eurosurveillance.org/public/RSSFeed/RSS.aspx|#news - exploitdb|http://www.exploit-db.com/rss.xml|#news - fars|http://www.farsnews.com/rss.php|#news #test - faz_feui|http://www.faz.net/rss/aktuell/feuilleton/|#news - faz_politik|http://www.faz.net/rss/aktuell/politik/|#news - faz_wirtschaft|http://www.faz.net/rss/aktuell/wirtschaft/|#news - fbi|https://www.fbi.gov/news/rss.xml|#news - fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news - fefe|http://blog.fefe.de/rss.xml|#news - forbes|http://www.forbes.com/forbes/feed2/|#news - forbes_realtime|http://www.forbes.com/real-time/feed2/|#news - fox|http://feeds.foxnews.com/foxnews/latest|#news - geheimorganisation|http://geheimorganisation.org/feed/|#news - GerForPol|http://www.german-foreign-policy.com/de/news/rss-2.0|#news - gmanet|http://www.gmanetwork.com/news/rss/news|#news - golem|https://rss.golem.de/rss.php|#news - google|http://news.google.com/?output=rss|#news - greenpeace|http://feeds.feedburner.com/GreenpeaceNews|#news - guardian_uk|http://feeds.theguardian.com/theguardian/uk-news/rss|#news - gulli|http://ticker.gulli.com/rss/|#news - hackernews|https://news.ycombinator.com/rss|#news - handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial - heise|https://www.heise.de/newsticker/heise-atom.xml|#news - hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial - hindu|http://www.thehindu.com/?service=rss|#news - ign|http://feeds.ign.com/ign/all|#news - independent|http://www.independent.com/rss/headlines/|#news - indymedia|https://de.indymedia.org/rss.xml|#news - info_libera|http://www.informationliberation.com/rss.xml|#news - klagen-gegen-rundfuckbeitrag|http://klagen-gegen-rundfunkbeitrag.blogspot.com/feeds/posts/default|#news - korea_herald|http://www.koreaherald.com/rss_xml.php|#news - linuxinsider|http://www.linuxinsider.com/perl/syndication/rssfull.pl|#news - lisp|http://planet.lisp.org/rss20.xml|#news - liveleak|http://www.liveleak.com/rss|#news - lolmythesis|http://lolmythesis.com/rss|#news - LtU|http://lambda-the-ultimate.org/rss.xml|#news - lukepalmer|http://lukepalmer.wordpress.com/feed/|#news - mit|http://web.mit.edu/newsoffice/rss-feeds.feed?type=rss|#news - mongrel2_master|https://github.com/zedshaw/mongrel2/commits/master.atom|#news - nds|http://www.nachdenkseiten.de/?feed=atom|#news - netzpolitik|https://netzpolitik.org/feed/|#news - newsbtc|http://newsbtc.com/feed/|#news #financial - nnewsg|http://www.net-news-global.net/rss/rssfeed.xml|#news - npr_busi|http://www.npr.org/rss/rss.php?id=1006|#news - npr_headlines|http://www.npr.org/rss/rss.php?id=1001|#news - npr_pol|http://www.npr.org/rss/rss.php?id=1012|#news - npr_world|http://www.npr.org/rss/rss.php?id=1004|#news - nsa|https://www.nsa.gov/rss.xml|#news #bullerei - nytimes|http://rss.nytimes.com/services/xml/rss/nyt/World.xml|#news - painload|https://github.com/krebscode/painload/commits/master.atom|#news - phys|http://phys.org/rss-feed/|#news - piraten|https://www.piratenpartei.de/feed/|#news - polizei_berlin|http://www.berlin.de/polizei/presse-fahndung/_rss_presse.xml|#news #bullerei - presse_polizei|http://www.presseportal.de/rss/polizei.rss2|#news #bullerei - presseportal|http://www.presseportal.de/rss/presseportal.rss2|#news - prisonplanet|http://prisonplanet.com/feed.rss|#news - rawstory|http://www.rawstory.com/rs/feed/|#news - reddit_4chan|http://www.reddit.com/r/4chan/new/.rss|#news #brainfuck - reddit_anticonsum|http://www.reddit.com/r/Anticonsumption/new/.rss|#news - reddit_btc|http://www.reddit.com/r/Bitcoin/new/.rss|#news #financial - reddit_consp|http://reddit.com/r/conspiracy/.rss|#news - reddit_haskell|http://www.reddit.com/r/haskell/.rss|#news - reddit_nix|http://www.reddit.com/r/nixos/.rss|#news - reddit_prog|http://www.reddit.com/r/programming/new/.rss|#news - reddit_sci|http://www.reddit.com/r/science/.rss|#news - reddit_tech|http://www.reddit.com/r/technology/.rss|#news - reddit_tpp|http://www.reddit.com/r/twitchplayspokemon/.rss|#news #tpp - reddit_world|http://www.reddit.com/r/worldnews/.rss|#news - r-ethereum|http://www.reddit.com/r/ethereum/.rss|#news - reuters|http://feeds.reuters.com/Reuters/worldNews|#news - reuters-odd|http://feeds.reuters.com/reuters/oddlyEnoughNews?format=xml|#news - rt|http://rt.com/rss/news/|#news - schallurauch|http://feeds.feedburner.com/SchallUndRauch|#news - sciencemag|http://news.sciencemag.org/rss/current.xml|#news - scmp|http://www.scmp.com/rss/91/feed|#news - sec-db|http://feeds.security-database.com/SecurityDatabaseToolsWatch|#news - shackspace|http://blog.shackspace.de/?feed=rss2|#news - shz_news|http://www.shz.de/nachrichten/newsticker/rss|#news - sky_busi|http://feeds.skynews.com/feeds/rss/business.xml|#news - sky_pol|http://feeds.skynews.com/feeds/rss/politics.xml|#news - sky_strange|http://feeds.skynews.com/feeds/rss/strange.xml|#news - sky_tech|http://feeds.skynews.com/feeds/rss/technology.xml|#news - sky_world|http://feeds.skynews.com/feeds/rss/world.xml|#news - slashdot|http://rss.slashdot.org/Slashdot/slashdot|#news - slate|http://feeds.slate.com/slate|#news - spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#news - spiegelfechter|http://feeds.feedburner.com/DerSpiegelfechter?format=xml|#news - spiegel_top|http://www.spiegel.de/schlagzeilen/tops/index.rss|#news - standardmedia_ke|http://www.standardmedia.co.ke/rss/headlines.php|#news - stern|http://www.stern.de/feed/standard/all/|#news - stz|http://www.stuttgarter-zeitung.de/rss/topthemen.rss.feed|#news - sz_politik|http://rss.sueddeutsche.de/rss/Politik|#news - sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news #financial - sz_wissen|http://rss.sueddeutsche.de/rss/Wissen|#news - tagesschau|http://www.tagesschau.de/newsticker.rdf|#news - taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news - telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial - telegraph_pol|http://www.telegraph.co.uk/news/politics/rss|#news - telegraph_uk|http://www.telegraph.co.uk/news/uknews/rss|#news - telegraph_world|http://www.telegraph.co.uk/news/worldnews/rss|#news - telepolis|http://www.heise.de/tp/rss/news-atom.xml|#news - the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#news - tigsource|http://www.tigsource.com/feed/|#news - tinc|http://tinc-vpn.org/news/index.rss|#news - topix_b|http://www.topix.com/rss/wire/de/berlin|#news - torr_bits|http://feeds.feedburner.com/TorrentfreakBits|#news - torrentfreak|http://feeds.feedburner.com/Torrentfreak|#news - torr_news|http://feed.torrentfreak.com/Torrentfreak/|#news - travel_warnings|http://feeds.travel.state.gov/ca/travelwarnings-alerts|#news - un_afr|http://www.un.org/apps/news/rss/rss_africa.asp|#news - un_am|http://www.un.org/apps/news/rss/rss_americas.asp|#news - un_eu|http://www.un.org/apps/news/rss/rss_europe.asp|#news - un_me|http://www.un.org/apps/news/rss/rss_mideast.asp|#news - un_pac|http://www.un.org/apps/news/rss/rss_asiapac.asp|#news - un_top|http://www.un.org/apps/news/rss/rss_top.asp|#news - us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#news - vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news - weechat|http://dev.weechat.org/feed/atom|#news - wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#news - xkcd|https://xkcd.com/rss.xml|#news - zdnet|http://www.zdnet.com/news/rss.xml|#news - ''; -in { - environment.systemPackages = [ - pkgs.newsbot-js - ]; - krebs.newsbot-js = { - enable = true; - ircServer = "localhost"; - feeds = newsfile; - urlShortenerHost = "go"; - urlShortenerPort = "80"; - }; -} From adc185b629a5fa6b64c5a99e182730e53fc814bf Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 00:17:48 +0200 Subject: [PATCH 20/25] l echelon.r: deactivate realwallpaper --- lass/1systems/echelon/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix index 127819379..6f96883bf 100644 --- a/lass/1systems/echelon/config.nix +++ b/lass/1systems/echelon/config.nix @@ -9,7 +9,6 @@ in { - { From 6b00893d8f23972d0dda03e4c75f0050587ef0e5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 00:35:47 +0200 Subject: [PATCH 21/25] nixpkgs: 51a8326 -> 56da88a --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/source.nix b/krebs/source.nix index 400826351..085f3c0d3 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "51a83266d164195698f04468d90d2c6238ed3491"; # nixos-17.03 @ 2017-07-30 + ref = "56da88a298a6f549701a10bb12072804a1ebfbd5"; # nixos-17.03 @ 2017-09-03 }; } From 2c667e9a25bc6e426f14d553f9237a9083e3474f Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 00:44:21 +0200 Subject: [PATCH 22/25] hotdog.r: add build.r --- krebs/3modules/krebs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 44fcbdb37..2fe3e5115 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -71,6 +71,7 @@ in { ip6.addr = "42:0:0:0:0:0:77:3"; aliases = [ "hotdog.r" + "build.r" "build.hotdog.r" "cgit.hotdog.r" ]; From fcf59a00e2ab675cb171cbe4f21b8df73836d144 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2017 01:00:30 +0200 Subject: [PATCH 23/25] news: merge all telegraph feeds --- krebs/2configs/news.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix index e61392b17..d9176c328 100644 --- a/krebs/2configs/news.nix +++ b/krebs/2configs/news.nix @@ -149,10 +149,7 @@ in { sz_wissen|http://rss.sueddeutsche.de/rss/Wissen|#news tagesschau|http://www.tagesschau.de/newsticker.rdf|#news taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news - telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial - telegraph_pol|http://www.telegraph.co.uk/news/politics/rss|#news - telegraph_uk|http://www.telegraph.co.uk/news/uknews/rss|#news - telegraph_world|http://www.telegraph.co.uk/news/worldnews/rss|#news + telegraph|http://www.telegraph.co.uk/rss.xml|#news telepolis|http://www.heise.de/tp/rss/news-atom.xml|#news the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#news tigsource|http://www.tigsource.com/feed/|#news From c59e9203bbeff674d9df9409a9afba563f2a8ac3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Sep 2017 21:05:51 +0200 Subject: [PATCH 24/25] news: cleanup --- krebs/2configs/news.nix | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix index d9176c328..5ff4ce3f2 100644 --- a/krebs/2configs/news.nix +++ b/krebs/2configs/news.nix @@ -20,10 +20,10 @@ in { augustl|http://augustl.com/atom.xml|#news bbc|http://feeds.bbci.co.uk/news/rss.xml|#news bdt_aktuelle_themen|http://www.bundestag.de/blueprint/servlet/service/de/14154/asFeed/index.rss|#news - bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news #bundestag - bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag + bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news + bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news bdt_pressemitteilungen|http://www.bundestag.de/blueprint/servlet/service/de/273112/asFeed/index.rss|#news - bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial + bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news carta|http://feeds2.feedburner.com/carta-standard-rss|#news catholic_news|http://feeds.feedburner.com/catholicnewsagency/dailynews|#news @@ -33,12 +33,11 @@ in { cbc_tech|http://rss.cbc.ca/lineup/technology.xml|#news cbc_top|http://rss.cbc.ca/lineup/topstories.xml|#news ccc|http://www.ccc.de/rss/updates.rdf|#news - chan_b|https://boards.4chan.org/b/index.rss|#brainfuck - chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck - chan_g|https://boards.4chan.org/g/index.rss|#news - chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck - chan_sci|https://boards.4chan.org/sci/index.rss|#news - chan_x|https://boards.4chan.org/x/index.rss|#news + chan_biz|http://boards.4chan.org/biz/index.rss|#news + chan_g|http://boards.4chan.org/g/index.rss|#news + chan_int|http://boards.4chan.org/int/index.rss|#news + chan_sci|http://boards.4chan.org/sci/index.rss|#news + chan_x|http://boards.4chan.org/x/index.rss|#news c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news cryptogon|http://www.cryptogon.com/?feed=rss2|#news csm|http://rss.csmonitor.com/feeds/csm|#news @@ -68,15 +67,15 @@ in { geheimorganisation|http://geheimorganisation.org/feed/|#news GerForPol|http://www.german-foreign-policy.com/de/news/rss-2.0|#news gmanet|http://www.gmanetwork.com/news/rss/news|#news - golem|https://rss.golem.de/rss.php|#news + golem|http://rss.golem.de/rss.php|#news google|http://news.google.com/?output=rss|#news greenpeace|http://feeds.feedburner.com/GreenpeaceNews|#news guardian_uk|http://feeds.theguardian.com/theguardian/uk-news/rss|#news gulli|http://ticker.gulli.com/rss/|#news hackernews|https://news.ycombinator.com/rss|#news - handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial + handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news heise|https://www.heise.de/newsticker/heise-atom.xml|#news - hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial + hindu_business|http://www.thehindubusinessline.com/?service=rss|#news hindu|http://www.thehindu.com/?service=rss|#news ign|http://feeds.ign.com/ign/all|#news independent|http://www.independent.com/rss/headlines/|#news @@ -94,7 +93,7 @@ in { mongrel2_master|https://github.com/zedshaw/mongrel2/commits/master.atom|#news nds|http://www.nachdenkseiten.de/?feed=atom|#news netzpolitik|https://netzpolitik.org/feed/|#news - newsbtc|http://newsbtc.com/feed/|#news #financial + newsbtc|http://newsbtc.com/feed/|#news nnewsg|http://www.net-news-global.net/rss/rssfeed.xml|#news npr_busi|http://www.npr.org/rss/rss.php?id=1006|#news npr_headlines|http://www.npr.org/rss/rss.php?id=1001|#news @@ -105,21 +104,21 @@ in { painload|https://github.com/krebscode/painload/commits/master.atom|#news phys|http://phys.org/rss-feed/|#news piraten|https://www.piratenpartei.de/feed/|#news - polizei_berlin|http://www.berlin.de/polizei/presse-fahndung/_rss_presse.xml|#news #bullerei - presse_polizei|http://www.presseportal.de/rss/polizei.rss2|#news #bullerei + polizei_berlin|http://www.berlin.de/polizei/presse-fahndung/_rss_presse.xml|#news + presse_polizei|http://www.presseportal.de/rss/polizei.rss2|#news presseportal|http://www.presseportal.de/rss/presseportal.rss2|#news prisonplanet|http://prisonplanet.com/feed.rss|#news rawstory|http://www.rawstory.com/rs/feed/|#news - reddit_4chan|http://www.reddit.com/r/4chan/new/.rss|#news #brainfuck + reddit_4chan|http://www.reddit.com/r/4chan/new/.rss|#news reddit_anticonsum|http://www.reddit.com/r/Anticonsumption/new/.rss|#news - reddit_btc|http://www.reddit.com/r/Bitcoin/new/.rss|#news #financial + reddit_btc|http://www.reddit.com/r/Bitcoin/new/.rss|#news reddit_consp|http://reddit.com/r/conspiracy/.rss|#news reddit_haskell|http://www.reddit.com/r/haskell/.rss|#news reddit_nix|http://www.reddit.com/r/nixos/.rss|#news reddit_prog|http://www.reddit.com/r/programming/new/.rss|#news reddit_sci|http://www.reddit.com/r/science/.rss|#news reddit_tech|http://www.reddit.com/r/technology/.rss|#news - reddit_tpp|http://www.reddit.com/r/twitchplayspokemon/.rss|#news #tpp + reddit_tpp|http://www.reddit.com/r/twitchplayspokemon/.rss|#news reddit_world|http://www.reddit.com/r/worldnews/.rss|#news r-ethereum|http://www.reddit.com/r/ethereum/.rss|#news reuters|http://feeds.reuters.com/Reuters/worldNews|#news @@ -145,7 +144,7 @@ in { stern|http://www.stern.de/feed/standard/all/|#news stz|http://www.stuttgarter-zeitung.de/rss/topthemen.rss.feed|#news sz_politik|http://rss.sueddeutsche.de/rss/Politik|#news - sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news #financial + sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news sz_wissen|http://rss.sueddeutsche.de/rss/Wissen|#news tagesschau|http://www.tagesschau.de/newsticker.rdf|#news taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news From ef0904b6d1a60a3d4f59b64f6d8afd1a8e9decd1 Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 5 Sep 2017 22:34:01 +0200 Subject: [PATCH 25/25] nin nixpkgs: 01c3847 -> 799435b --- nin/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nin/source.nix b/nin/source.nix index 5dd4311f2..183c71bae 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "01c3847"; + ref = "799435b"; }; }