From d6449ffa63a41e1818b4db77b582f56d5aefe61c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 25 Apr 2017 15:23:09 +0200 Subject: [PATCH 01/10] tv nixpkgs: 67c6638 -> 99dfb6d --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index fd8bafe05..d16ff4eb5 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03 + ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; From 5cee2f8c89c537cbba0f1a53e3a21aa9836ba13b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Apr 2017 19:33:44 +0200 Subject: [PATCH 02/10] xu: add cgit alias --- krebs/3modules/tv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 2da38e08d..e387fabc5 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -358,6 +358,7 @@ with import ; ip6.addr = "42::1338"; aliases = [ "xu.r" + "cgit.xu.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- From f374b704b0e6a9900633af58e5e6def644a916a5 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Apr 2017 19:43:12 +0200 Subject: [PATCH 03/10] types.user.mail: str -> nullOr str --- lib/types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index f511541bd..30de5e177 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -284,8 +284,8 @@ rec { default = "/home/${config.name}"; }; mail = mkOption { - type = str; # TODO retiolum mail address - default = "${config._module.args.name}@${config.networking.hostName}.r"; + type = nullOr str; + default = null; }; name = mkOption { type = username; From 7fb107a30384bbdf3693dd5d709ec534187d4e9d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Apr 2017 21:40:48 +0200 Subject: [PATCH 04/10] xu: +texlive.combined.scheme-full --- tv/1systems/xu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 8cf6146b5..60d1af23e 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -43,7 +43,7 @@ with import ; pass q qrencode - #texLive + texlive.combined.scheme-full tmux #ack From ca2c22601fcfc0e618bb3cc73fb6c67ac03087ea Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 30 Apr 2017 14:42:15 +0200 Subject: [PATCH 05/10] much: 1.0.0 -> 1.1.0 --- krebs/5pkgs/much/cabal.nix | 28 ++++++++++++++++++++++++++++ krebs/5pkgs/much/default.nix | 31 ++----------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 krebs/5pkgs/much/cabal.nix diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/much/cabal.nix new file mode 100644 index 000000000..09bc7b5df --- /dev/null +++ b/krebs/5pkgs/much/cabal.nix @@ -0,0 +1,28 @@ +{ mkDerivation, aeson, attoparsec, base, base64-bytestring +, blaze-builder, blessings, bytestring, case-insensitive +, containers, deepseq, directory, docopt, email-header, fetchgit +, filepath, friendly-time, hyphenation, linebreak, old-locale +, process, random, rosezipper, safe, scanner, split, stdenv +, terminal-size, text, time, transformers, transformers-compat +, unix, vector +}: +mkDerivation { + pname = "much"; + version = "1.1.0"; + src = fetchgit { + url = "http://cgit.ni.krebsco.de/much"; + sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl"; + rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder blessings + bytestring case-insensitive containers deepseq directory docopt + email-header filepath friendly-time hyphenation linebreak + old-locale process random rosezipper safe scanner split + terminal-size text time transformers transformers-compat unix + vector + ]; + license = stdenv.lib.licenses.mit; +} diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix index aa3c56fe0..cf55eb537 100644 --- a/krebs/5pkgs/much/default.nix +++ b/krebs/5pkgs/much/default.nix @@ -1,30 +1,3 @@ -{ pkgs, ... }: +{ haskellPackages, ... }: -pkgs.haskellPackages.callPackage ( -{ mkDerivation, aeson, attoparsec, base, base64-bytestring -, blaze-builder, blessings, bytestring, case-insensitive, containers, deepseq -, directory, docopt, email-header, fetchgit, filepath -, friendly-time, hyphenation, linebreak, old-locale, process -, random, rosezipper, safe, scanner, split, stdenv, terminal-size, text -, time, transformers, transformers-compat, unix, vector -}: -mkDerivation { - pname = "much"; - version = "1.0.0"; - src = fetchgit { - url = "http://cgit.ni.krebsco.de/much"; - rev = "045dc986b4de225a927175f81c8ccfdab450202c"; - sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766"; - }; - isLibrary = false; - isExecutable = true; - buildDepends = [ - aeson attoparsec base base64-bytestring blaze-builder blessings bytestring - case-insensitive containers deepseq directory docopt email-header filepath - friendly-time hyphenation linebreak old-locale process random rosezipper - safe scanner split terminal-size text time transformers transformers-compat - unix vector - ]; - license = stdenv.lib.licenses.mit; -} -) {} +haskellPackages.callPackage ./cabal.nix {} From b3948e24f50341b1a36677209a565f8bbd154465 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Apr 2017 18:48:22 +0200 Subject: [PATCH 06/10] l 2 hfos: raise iptables restart delay --- lass/2configs/hfos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/hfos.nix b/lass/2configs/hfos.nix index f63e5ea53..f8dd2f0d2 100644 --- a/lass/2configs/hfos.nix +++ b/lass/2configs/hfos.nix @@ -40,7 +40,7 @@ with import ; systemd.services.libvirtd.serviceConfig.ExecStartPost = let restart-iptables = pkgs.writeDash "restart-iptables" '' #soo hacky - ${pkgs.coreutils}/bin/sleep 1s + ${pkgs.coreutils}/bin/sleep 5s ${pkgs.systemd}/bin/systemctl restart krebs-iptables.service ''; in restart-iptables; From e349150eff314466c50738557bef04e65286668d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Apr 2017 18:48:54 +0200 Subject: [PATCH 07/10] l 1 prism: add stuff for dritter --- lass/1systems/prism.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 41a909f16..c897ab655 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -26,7 +26,6 @@ in { services.udev.extraRules = '' SUBSYSTEM=="net", ATTR{address}=="54:04:a6:7e:f4:06", NAME="et0" ''; - } ../2configs/retiolum.nix ../2configs/exim-smarthost.nix @@ -363,6 +362,23 @@ in { ]; }; } + { + #stuff for dritter + users.extraUsers.dritter = { + name = "dritter"; + uid = genid "dritter"; + home = "/home/dritter"; + group = "users"; + createHome = true; + useDefaultShell = true; + extraGroups = [ + "download" + ]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqOWDDk7QkSAvrSLkEoz7dY22+xPyv5JDn2zlfUndfavmTMfZvPx9REMjgULbcCSM4m3Ncf40yUjciDpVleGoEz82+p/ObHAkVWPQyXRS3ZRM2IJJultBHEFc61+61Pi8k3p5pBhPPaig6VncJ4uUuuNqen9jqLesSTVXNtdntU2IvnC8B8k1Kq6fu9q1T2yEOMxkD31D5hVHlqAly0LdRiYvtsRIoCSmRvlpGl70uvPprhQxhtoiEUeDqmIL7BG9x7gU0Swdl7R0/HtFXlFuOwSlNYDmOf/Zrb1jhOpj4AlCliGUkM0iKIJhgH0tnJna6kfkGKHDwuzITGIh6SpZ dritter@Janeway" + ]; + }; + } ]; krebs.build.host = config.krebs.hosts.prism; From c2c5b04f9daf97d1b6daffd906dde2e0c205cf95 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Apr 2017 18:49:09 +0200 Subject: [PATCH 08/10] l 2 xresources: add better black color --- lass/2configs/xresources.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix index b5e721483..b5ba3df14 100644 --- a/lass/2configs/xresources.nix +++ b/lass/2configs/xresources.nix @@ -33,6 +33,8 @@ let URxvt*.pointerBlankDelay: 987654321 URxvt*.pointerColor: #f042b0 URxvt*.pointerColor2: #050505 + + URxvt*color0: #232342 ''; in { From b528ace23e6540ae9039c95289fe47bd8995756f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Apr 2017 20:04:06 +0200 Subject: [PATCH 09/10] l 2 git: announce the_playlist --- lass/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index be08d0ec1..72866c067 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -34,11 +34,11 @@ let cgit.desc = "take all the computers hostage, they'll love you!"; cgit.section = "configuration"; }; - } // mapAttrs make-public-repo-silent { the_playlist = { cgit.desc = "Good Music collection + tools"; cgit.section = "art"; }; + } // mapAttrs make-public-repo-silent { }; restricted-repos = mapAttrs make-restricted-repo ( From d18c4022d277dd45ffc388b8f3868a42ab9592ad Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 May 2017 12:19:51 +0200 Subject: [PATCH 10/10] goify: init --- krebs/5pkgs/goify/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 krebs/5pkgs/goify/default.nix diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/goify/default.nix new file mode 100644 index 000000000..e2849b5c7 --- /dev/null +++ b/krebs/5pkgs/goify/default.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +pkgs.writeDashBin "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' + else + echo "$word"; + fi; + done | sed '/^$/d' | tr '\n' ' '; echo; + done +''