From ecbfc932794aa5f1301e121876f244be7edcd133 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 18 Jul 2018 00:29:07 +0200 Subject: onebutton.r: use the latest unstable tarball as source this avoids cache misses and super expensive rebuilds on the raspi2 itself --- krebs/1systems/onebutton/source.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'krebs') diff --git a/krebs/1systems/onebutton/source.nix b/krebs/1systems/onebutton/source.nix index 6842bfaab..91a998de7 100644 --- a/krebs/1systems/onebutton/source.nix +++ b/krebs/1systems/onebutton/source.nix @@ -1,11 +1,8 @@ with import ; let pkgs = import {}; - nixpkgs = pkgs.fetchFromGitHub { - owner = "nixos"; - repo = "nixpkgs-channels"; - rev = "nixos-unstable"; # only binary cache for unstable arm6 - sha256 = "1rqzh475xn43phagrr30lb0fd292c1s8as53irihsnd5wcksnbyd"; + nixpkgs = builtins.fetchTarball { + url = https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz; }; in import { name = "onebutton"; -- cgit v1.2.3 From b699a206dd28ce81c32401b36cae9219b1efd425 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 Jul 2018 10:16:50 +0200 Subject: nixpkgs: 56fad14 -> d6c6c7f --- krebs/krops.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/krops.nix b/krebs/krops.nix index 861f2d323..91b27f17d 100644 --- a/krebs/krops.nix +++ b/krebs/krops.nix @@ -12,7 +12,7 @@ krebs-source = { nixpkgs.git = { - ref = "56fad146a12a6f934d1d5ef875eb729be1b19129"; + ref = "d6c6c7fcec6dbd2b8ab14f0b35d56c7733872baa"; url = https://github.com/NixOS/nixpkgs; }; stockholm.file = toString ../.; -- cgit v1.2.3 From 2adea5b2cc789a2dd86a417cc47e0cc6adc80b5f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 4 Aug 2018 08:04:00 +0200 Subject: news: kill some broken feeds --- krebs/2configs/news-spam.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'krebs') diff --git a/krebs/2configs/news-spam.nix b/krebs/2configs/news-spam.nix index a3f39b40e..88b7e1072 100644 --- a/krebs/2configs/news-spam.nix +++ b/krebs/2configs/news-spam.nix @@ -7,7 +7,6 @@ [SPAM]aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#snews [SPAM]allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#snews [SPAM]antirez|http://antirez.com/rss|#snews - [SPAM]arbor|http://feeds2.feedburner.com/asert/|#snews [SPAM]archlinux|http://www.archlinux.org/feeds/news/|#snews [SPAM]ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#snews [SPAM]augustl|http://augustl.com/atom.xml|#snews @@ -131,7 +130,6 @@ [SPAM]slashdot|http://rss.slashdot.org/Slashdot/slashdot|#snews [SPAM]slate|http://feeds.slate.com/slate|#snews [SPAM]spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#snews - [SPAM]spiegelfechter|http://feeds.feedburner.com/DerSpiegelfechter?format=xml|#snews [SPAM]spiegel_top|http://www.spiegel.de/schlagzeilen/tops/index.rss|#snews [SPAM]standardmedia_ke|http://www.standardmedia.co.ke/rss/headlines.php|#snews [SPAM]stern|http://www.stern.de/feed/standard/all/|#snews @@ -146,7 +144,6 @@ [SPAM]the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#snews [SPAM]tigsource|http://www.tigsource.com/feed/|#snews [SPAM]tinc|http://tinc-vpn.org/news/index.rss|#snews - [SPAM]topix_b|http://www.topix.com/rss/wire/de/berlin|#snews [SPAM]torr_bits|http://feeds.feedburner.com/TorrentfreakBits|#snews [SPAM]torrentfreak|http://feeds.feedburner.com/Torrentfreak|#snews [SPAM]torr_news|http://feed.torrentfreak.com/Torrentfreak/|#snews @@ -160,7 +157,6 @@ [SPAM]us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#snews [SPAM]vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#snews [SPAM]weechat|http://dev.weechat.org/feed/atom|#snews - [SPAM]wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#snews [SPAM]xkcd|https://xkcd.com/rss.xml|#snews [SPAM]zdnet|http://www.zdnet.com/news/rss.xml|#snews ''; -- cgit v1.2.3 From 809ded98e77eca001576ffdec4b4b1d85209e715 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 4 Aug 2018 11:42:33 +0200 Subject: nixpkgs: d6c6c7f -> d0c868e --- krebs/krops.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/krops.nix b/krebs/krops.nix index 91b27f17d..0e80aec0e 100644 --- a/krebs/krops.nix +++ b/krebs/krops.nix @@ -12,7 +12,7 @@ krebs-source = { nixpkgs.git = { - ref = "d6c6c7fcec6dbd2b8ab14f0b35d56c7733872baa"; + ref = "d0c868ec17c2cb2ca845f33fbfe381e9c7e55516"; url = https://github.com/NixOS/nixpkgs; }; stockholm.file = toString ../.; -- cgit v1.2.3 From f00277e3ecaf322c88b6984df8e8a2849bc3be4a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 4 Aug 2018 11:48:42 +0200 Subject: Revert "krebs git: refactor" This reverts commit dbbf237393468b49f07beaeea614e12bac35a6c2. --- krebs/3modules/git.nix | 60 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 24 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 6311e88ab..5ae24b40b 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -8,21 +8,6 @@ with import ; let - defaultBool = o: mkOption { - type = types.bool; - default = option; - }; - - defaultUint = o: mkOption { - type = types.uint; - default = o; - }; - - defaultAbsolutpath = o: mkOption { - type = types.absolute-pathname; - default = o; - }; - cfg = config.krebs.git; out = { @@ -136,15 +121,42 @@ let cgit-settings = types.submodule { # A setting's value of `null` means cgit's default should be used. options = { - cache-root = defaultAbsolutpath("/tmp/cgit"); - cache-size = defaultUint(1000); - css = defaultAbsolutpath("/static/cgit.css"); - enable-commit-graph = defaultBool(true); - enable-index-links = defaultBool(true); - enable-index-owner = defaultBool(false); - enable-log-filecount = defaultBool(true); - enable-log-linecount = defaultBool(true); - enable-remote-branches = defaultBool(true); + cache-root = mkOption { + type = types.absolute-pathname; + default = "/tmp/cgit"; + }; + cache-size = mkOption { + type = types.uint; + default = 1000; + }; + css = mkOption { + type = types.absolute-pathname; + default = "/static/cgit.css"; + }; + enable-commit-graph = mkOption { + type = types.bool; + default = true; + }; + enable-index-links = mkOption { + type = types.bool; + default = true; + }; + enable-index-owner = mkOption { + type = types.bool; + default = false; + }; + enable-log-filecount = mkOption { + type = types.bool; + default = true; + }; + enable-log-linecount = mkOption { + type = types.bool; + default = true; + }; + enable-remote-branches = mkOption { + type = types.bool; + default = true; + }; logo = mkOption { type = types.absolute-pathname; default = "/static/cgit.png"; -- cgit v1.2.3 From 5c7b8b6d0aa9589f9a6d0c353c0859e34a034488 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 6 Aug 2018 16:31:04 +0200 Subject: nextgum.r: add extra hosts cache.gum, gold --- krebs/3modules/makefu/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c5404f96d..9630d7a7f 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -336,7 +336,6 @@ with import ; "krebsco.de" = '' euer IN MX 1 aspmx.l.google.com. nixos.unstable IN CNAME krebscode.github.io. - gold IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr} ''; }; @@ -522,6 +521,13 @@ with import ; }; nextgum = rec { ci = true; + extraZones = { + "krebsco.de" = '' + cache.euer IN A ${nets.internet.ip4.addr} + cache.gum IN A ${nets.internet.ip4.addr} + gold IN A ${nets.internet.ip4.addr} + ''; + }; cores = 8; nets = rec { internet = { @@ -537,6 +543,7 @@ with import ; ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d3"; aliases = [ "nextgum.r" + "cache.gum.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From d6054035fcddf9e6be555a898db72d0cba6102d5 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 6 Aug 2018 16:31:43 +0200 Subject: k rtorrent: use directory.watch instead of schedule for inotify goodness --- krebs/3modules/rtorrent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index b7ef824b5..09e552010 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -29,7 +29,7 @@ let ''} ${optionalString (cfg.watchDir != null) '' - schedule = watch_directory,5,5,load_start=${cfg.watchDir}/*.torrent + directory.watch.added = "${cfg.watchDir}", load.start_verbose ''} directory = ${cfg.downloadDir} -- cgit v1.2.3 From 136e005e7752fb948fe1c7106996e26dca39b432 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 13 Aug 2018 16:41:17 +0200 Subject: RIP helios.r --- krebs/3modules/lass/default.nix | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index e2322e171..c4a5bbb0d 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -301,37 +301,6 @@ with import ; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEB/MmASvx3i09DY1xFVM5jOhZRZA8rMRqtf8bCIkC+t"; }; - helios = { - cores = 8; - nets = { - retiolum = { - ip4.addr = "10.243.133.117"; - ip6.addr = "42:0:0:0:0:0:3:7105"; - aliases = [ - "helios.r" - "cgit.helios.r" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAp+SRmP5MoCSYInx4Dm5MLZzNyXVgfo/CDoeUlUT35X0yE7WHGWsG - wHPCu+3RWfBUjuqNdb0qiGtRi3Q/LwznwBROPOX8gMXia/DgCLbIjn5Rx081pTIo - 3epbUCFtNgyDWg8IHF87ZnVBXTYAy5g4tz9u8kw82D8mR18o595TuZ9t5pDc/Kvi - fPHZenT6cd6FtL9uankX/jan1PRP9xTrhpE8dAQ6g+7XH7knMK3cno/Ztis5YzHt - Ith0bsIjk5of7hhITj0MXtTikjDqWxkpF5mfOK1cG/rC1goTmB9AfcENUBnu9iAM - I/alzqk3CEczznLyaOckfx2fRuar912LAdiJ5v7VPztfvN1p3gIxq5M0Rgkq+98B - H/s32xNRBPvqoIleKnhwE9gfrCLaAVqpaMkgKRvgsTkSDNYNhh4smQ3eAKKwwDH/ - QG3sfP8xyNyDFhBtCiDGkf9hNqBBMaKjZoh8DasZNtcfOop3fGw7jmUUbB6cG8cp - +EfYbcb5mVpmrIyXgOTwwYcp7tn+zkd4Wa8C9Q98eFTs0HGVGxGX9Hj6PM/kXK4C - aIqIQVNpnJ/9cOwT8JFIriG1MWTOXbamUusKTLs8SRp3ZkyM7XUEcLL5HMh09rUw - rzEAmE7TywXVhd7j2IaEy+bx2dfGQH2bFoh6Drm6Olo+ySi1utB5dGkCAwEAAQ== - -----END RSA PUBLIC KEY----- - ''; - }; - }; - secure = true; - ssh.privkey.path = ; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqpx9jJnn4QMGO8BOrGOLRN1rgpIkR14sQb8S+otWEL"; - }; littleT = { cores = 2; nets = { -- cgit v1.2.3 From c0525f667f7614cb084e66c16daadc4451da6f47 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 14 Aug 2018 15:55:17 +0200 Subject: xmonad-stockholm: add X11-xft dependency --- krebs/5pkgs/haskell/xmonad-stockholm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix index 954cfd76a..de426a02c 100644 --- a/krebs/5pkgs/haskell/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xshape +{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xft, X11-xshape , xmonad, xmonad-contrib }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "05nnfg6q35z3qgf507qa80bz32jl4k719dl5phlmchplp3769585"; }; libraryHaskellDepends = [ - base containers X11 X11-xshape xmonad xmonad-contrib + base containers X11 X11-xft X11-xshape xmonad xmonad-contrib ]; license = stdenv.lib.licenses.mit; } -- cgit v1.2.3 From 89951ebd816248bc4e62b2dad78b5db906c3cefe Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 14 Aug 2018 21:52:56 +0200 Subject: xmonad-stockholm: 1.1.1 -> 1.2.0 --- krebs/5pkgs/haskell/xmonad-stockholm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix index de426a02c..7f6bb299d 100644 --- a/krebs/5pkgs/haskell/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix @@ -3,11 +3,11 @@ }: mkDerivation rec { pname = "xmonad-stockholm"; - version = "1.1.1"; + version = "1.2.0"; src = fetchgit { url = http://cgit.ni.krebsco.de/xmonad-stockholm; rev = "refs/tags/v${version}"; - sha256 = "05nnfg6q35z3qgf507qa80bz32jl4k719dl5phlmchplp3769585"; + sha256 = "13mvmh3kk9a79l1nii028p0n7l95pb78wz9c4j42l90m02mg6cis"; }; libraryHaskellDepends = [ base containers X11 X11-xft X11-xshape xmonad xmonad-contrib -- cgit v1.2.3