Merge remote-tracking branch 'lass/master'
This commit is contained in:
makefu
commit
fb1fff243a
|
|
@ -302,6 +302,27 @@ with import <stockholm/lib>;
|
|||
iso = {
|
||||
cores = 1;
|
||||
};
|
||||
sokrateslaptop = {
|
||||
nets = {
|
||||
retiolum = {
|
||||
ip4.addr = "10.243.142.104";
|
||||
ip6.addr = "42:f8a1:044d:0f75:9d73:56d8:f432:c6cc";
|
||||
aliases = [
|
||||
"sokrateslaptop.r"
|
||||
];
|
||||
tinc.pubkey = ''
|
||||
-----BEGIN RSA PUBLIC KEY-----
|
||||
MIIBCgKCAQEA0EMbBv5NCSns4V/VR/NJHhwe2qNLUYjWWtCDY4zDuoiJdm3JNZJ2
|
||||
t0iKNxFwd6Mmg3ahAlndsH4FOjOBGBQCgBG25VRnQgli1sypI/gYTsSgIWHVIRoZ
|
||||
rgrng0K3oyJ6FuTP+nH1rd7UAYkrOQolXQBY+LqAbxOVjiJl+DpbAXIxCIs5TBeW
|
||||
egtBiXZ1S53Lv5EGFXug716XlgZLHjw7PzRLJXSlvUAIRZj0Sjq4UD9VrhazM9s5
|
||||
aDuxJIdknccEEXm6NK7a51hU/o8L+T0IUpZxhaXOdi6fvO/y3TbffKb1yRTbN0/V
|
||||
VBjBh18Le7h0SmAEED5tz7NOCrAjMZQtJQIDAQAB
|
||||
-----END RSA PUBLIC KEY-----
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
users = {
|
||||
lass = {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
pkgs.writeDashBin "goify" ''
|
||||
pkgs.writeBashBin "goify" ''
|
||||
set -euf
|
||||
|
||||
GO_HOST=''${GO_HOST:-go}
|
||||
|
||||
while read line; do
|
||||
echo "$line" | sed -E 's|https?://\S*|\n&\n|g' | while read word; do
|
||||
if echo "$word" | grep -Eq ^https?:; then
|
||||
${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" | tr -d '\r'
|
||||
echo "$line" | sed 's|https\?://\S*|\n&\n|g' | while read word; do
|
||||
if echo "$word" | grep -q '^https\?:'; then
|
||||
${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" \
|
||||
| tr -d '\r'
|
||||
else
|
||||
echo "$word";
|
||||
fi;
|
||||
done | sed '/^$/d' | tr '\n' ' '; echo;
|
||||
echo "$word"
|
||||
fi
|
||||
done | grep . | tr '\n' ' '; echo
|
||||
done
|
||||
''
|
||||
|
|
|
|||
18
krebs/5pkgs/haskell-overrides/kirk.nix
Normal file
18
krebs/5pkgs/haskell-overrides/kirk.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ mkDerivation, async, base, bytestring, fetchgit, network
|
||||
, optparse-applicative, stdenv, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "kirk";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "http://cgit.krebsco.de/kirk";
|
||||
sha256 = "0w4drg2lyyw45abfn3g55zd6m7pl7yqxql5rpyy6qqdbvnyak94w";
|
||||
rev = "c78f3c62c0ba76465e39d1570073f867aa2d4240";
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
async base bytestring network optparse-applicative text
|
||||
];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}
|
||||
18
krebs/5pkgs/haskell-overrides/news.nix
Normal file
18
krebs/5pkgs/haskell-overrides/news.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ mkDerivation, base, bloomfilter, bytestring, feed, fetchgit, lens
|
||||
, stdenv, wreq
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "news";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "http://cgit.lassul.us/news";
|
||||
sha256 = "1n3ffr2a5irr5aly0y7qsafag3kxvyyh077ayk0vdwbd0s9hvnjs";
|
||||
rev = "c3eb2c0a1a34fc41e18d0bc99b1c4dc73aa6eb20";
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
base bloomfilter bytestring feed lens wreq
|
||||
];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ with import <stockholm/lib>;
|
|||
maven
|
||||
arandr
|
||||
libreoffice
|
||||
mpv
|
||||
];
|
||||
}
|
||||
#{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ with import <stockholm/lib>;
|
|||
../../krebs
|
||||
../3modules
|
||||
../5pkgs
|
||||
../2configs/binary-cache/client.nix
|
||||
../2configs/mc.nix
|
||||
../2configs/nixpkgs.nix
|
||||
../2configs/vim.nix
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ in {
|
|||
{
|
||||
krebs.Reaktor.coders = {
|
||||
nickname = "Reaktor|lass";
|
||||
channels = [ "#coders" ];
|
||||
channels = [ "#coders" "#germany" ];
|
||||
extraEnviron = {
|
||||
REAKTOR_HOST = "irc.hackint.org";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ with import <stockholm/lib>;
|
|||
untilport
|
||||
usbutils
|
||||
logify
|
||||
goify
|
||||
|
||||
#unpack stuff
|
||||
p7zip
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ let
|
|||
rules = concatMap make-rules (attrValues repos);
|
||||
|
||||
public-repos = mapAttrs make-public-repo {
|
||||
news = {
|
||||
cgit.desc = "take a rss feed and a timeout and print it to stdout";
|
||||
cgit.section = "software";
|
||||
};
|
||||
stockholm = {
|
||||
cgit.desc = "take all the computers hostage, they'll love you!";
|
||||
cgit.section = "configuration";
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@
|
|||
general {
|
||||
#maybe we want ident someday?
|
||||
disable_auth = yes;
|
||||
throttle_duration = 1;
|
||||
throttle_count = 1000;
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,19 +3,17 @@
|
|||
let
|
||||
newsfile = pkgs.writeText "feeds" ''
|
||||
aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#news
|
||||
aktuelle_themen|http://bundestag.de/service/rss/Bundestag_Aktuelle_Themen.rss|#news #bundestag
|
||||
allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#news
|
||||
anon|http://anoninsiders.net/feed/|#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://bundestag.de/service/rss/Bundestag_Presse.rss|#news #bundestag
|
||||
bdt_wd|http://bundestag.de/service/rss/Bundestag_WD.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
|
||||
c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news
|
||||
cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news
|
||||
|
|
@ -30,9 +28,7 @@ let
|
|||
chan_b|https://boards.4chan.org/b/index.rss|#brainfuck
|
||||
chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck
|
||||
chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck
|
||||
cna|http://www.channelnewsasia.com/starterkit/servlet/cna/rss/home.xml|#news
|
||||
coinspotting|http://coinspotting.com/rss|#news #financial
|
||||
cryptanalysis|https://cryptanalys.is/rss.php|#news
|
||||
cryptocoinsnews|http://www.cryptocoinsnews.com/feed/|#news #financial
|
||||
cryptogon|http://www.cryptogon.com/?feed=rss2|#news
|
||||
csm|http://rss.csmonitor.com/feeds/csm|#news
|
||||
|
|
@ -52,12 +48,9 @@ let
|
|||
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 #financial
|
||||
fbi|http://www.fbi.gov/homepage/RSS|#news #bullerei
|
||||
fbi_news|http://www.fbi.gov/news/news_blog/rss.xml|#news
|
||||
fbi_press|http://www.fbi.gov/news/current/rss.xml|#news #bullerei
|
||||
fbi_stories|http://www.fbi.gov/news/stories/all-stories/rss.xml|#news #bullerei
|
||||
fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news #financial
|
||||
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
|
||||
|
|
@ -65,18 +58,18 @@ let
|
|||
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|http://www.golem.de/rss.php?feed=RSS1.0|#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
|
||||
handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial
|
||||
heise|http://heise.de.feedsportal.com/c/35207/f/653902/index.rss|#news
|
||||
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|http://de.indymedia.org/RSS/newswire.xml|#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
|
||||
|
|
@ -123,11 +116,11 @@ let
|
|||
sec-db|http://feeds.security-database.com/SecurityDatabaseToolsWatch|#news
|
||||
shackspace|http://shackspace.de/?feed=rss2|#news
|
||||
shz_news|http://www.shz.de/nachrichten/newsticker/rss|#news
|
||||
sky_busi|http://news.sky.com/feeds/rss/business.xml|#news
|
||||
sky_pol|http://news.sky.com/feeds/rss/politics.xml|#news
|
||||
sky_strange|http://news.sky.com/feeds/rss/strange.xml|#news
|
||||
sky_tech|http://news.sky.com/feeds/rss/technology.xml|#news
|
||||
sky_world|http://news.sky.com/feeds/rss/world.xml|#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
|
||||
|
|
@ -138,7 +131,7 @@ let
|
|||
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://suche.sueddeutsche.de/rss/Wissen|#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
|
||||
telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
{
|
||||
krebs.build.source.nixpkgs.git = {
|
||||
url = https://cgit.lassul.us/nixpkgs;
|
||||
ref = "aa03833";
|
||||
ref = "11b82a9";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,6 +145,12 @@ in {
|
|||
script = "${print_current}/bin/print_current";
|
||||
pattern = "^current$";
|
||||
})
|
||||
(buildSimpleReaktorPlugin "suggest" {
|
||||
script = "${pkgs.writeDash "suggest" ''
|
||||
echo "$@" >> $HOME/playlist_suggest
|
||||
''}";
|
||||
pattern = "^suggest: (?P<args>.*)$";
|
||||
})
|
||||
];
|
||||
};
|
||||
services.nginx.virtualHosts."lassul.us".locations."/the_playlist".extraConfig = let
|
||||
|
|
|
|||
|
|
@ -80,6 +80,9 @@ in {
|
|||
locations."= /retiolum-hosts.tar.bz2".extraConfig = ''
|
||||
alias ${config.krebs.tinc.retiolum.hostsArchive};
|
||||
'';
|
||||
locations."= /retiolum.hosts".extraConfig = ''
|
||||
alias /etc/hosts;
|
||||
'';
|
||||
locations."/tinc".extraConfig = ''
|
||||
alias ${config.krebs.tinc_graphs.workingDir}/external;
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ let
|
|||
mainUser = config.users.extraUsers.mainUser;
|
||||
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [
|
||||
krebs.per-user.wine.packages = with pkgs; [
|
||||
wineUnstable
|
||||
];
|
||||
users.extraUsers = {
|
||||
users.users= {
|
||||
wine = {
|
||||
name = "wine";
|
||||
description = "user for running wine";
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ let {
|
|||
htgen = {
|
||||
cgit.desc = "toy HTTP server";
|
||||
};
|
||||
irc = {
|
||||
cgit.desc = "toy IRC client";
|
||||
kirk = {
|
||||
cgit.desc = "IRC tools";
|
||||
};
|
||||
load-env = {};
|
||||
loldns = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user