Merge remote-tracking branch 'lass/master'
This commit is contained in:
commit
f1b266e05c
@ -358,6 +358,7 @@ with import <stockholm/lib>;
|
|||||||
ip6.addr = "42::1338";
|
ip6.addr = "42::1338";
|
||||||
aliases = [
|
aliases = [
|
||||||
"xu.r"
|
"xu.r"
|
||||||
|
"cgit.xu.r"
|
||||||
];
|
];
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
|
17
krebs/5pkgs/goify/default.nix
Normal file
17
krebs/5pkgs/goify/default.nix
Normal file
@ -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
|
||||||
|
''
|
28
krebs/5pkgs/much/cabal.nix
Normal file
28
krebs/5pkgs/much/cabal.nix
Normal file
@ -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;
|
||||||
|
}
|
@ -1,30 +1,3 @@
|
|||||||
{ pkgs, ... }:
|
{ haskellPackages, ... }:
|
||||||
|
|
||||||
pkgs.haskellPackages.callPackage (
|
haskellPackages.callPackage ./cabal.nix {}
|
||||||
{ 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;
|
|
||||||
}
|
|
||||||
) {}
|
|
||||||
|
@ -26,7 +26,6 @@ in {
|
|||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM=="net", ATTR{address}=="54:04:a6:7e:f4:06", NAME="et0"
|
SUBSYSTEM=="net", ATTR{address}=="54:04:a6:7e:f4:06", NAME="et0"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
../2configs/retiolum.nix
|
../2configs/retiolum.nix
|
||||||
../2configs/exim-smarthost.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;
|
krebs.build.host = config.krebs.hosts.prism;
|
||||||
|
@ -34,11 +34,11 @@ let
|
|||||||
cgit.desc = "take all the computers hostage, they'll love you!";
|
cgit.desc = "take all the computers hostage, they'll love you!";
|
||||||
cgit.section = "configuration";
|
cgit.section = "configuration";
|
||||||
};
|
};
|
||||||
} // mapAttrs make-public-repo-silent {
|
|
||||||
the_playlist = {
|
the_playlist = {
|
||||||
cgit.desc = "Good Music collection + tools";
|
cgit.desc = "Good Music collection + tools";
|
||||||
cgit.section = "art";
|
cgit.section = "art";
|
||||||
};
|
};
|
||||||
|
} // mapAttrs make-public-repo-silent {
|
||||||
};
|
};
|
||||||
|
|
||||||
restricted-repos = mapAttrs make-restricted-repo (
|
restricted-repos = mapAttrs make-restricted-repo (
|
||||||
|
@ -40,7 +40,7 @@ with import <stockholm/lib>;
|
|||||||
systemd.services.libvirtd.serviceConfig.ExecStartPost = let
|
systemd.services.libvirtd.serviceConfig.ExecStartPost = let
|
||||||
restart-iptables = pkgs.writeDash "restart-iptables" ''
|
restart-iptables = pkgs.writeDash "restart-iptables" ''
|
||||||
#soo hacky
|
#soo hacky
|
||||||
${pkgs.coreutils}/bin/sleep 1s
|
${pkgs.coreutils}/bin/sleep 5s
|
||||||
${pkgs.systemd}/bin/systemctl restart krebs-iptables.service
|
${pkgs.systemd}/bin/systemctl restart krebs-iptables.service
|
||||||
'';
|
'';
|
||||||
in restart-iptables;
|
in restart-iptables;
|
||||||
|
@ -33,6 +33,8 @@ let
|
|||||||
URxvt*.pointerBlankDelay: 987654321
|
URxvt*.pointerBlankDelay: 987654321
|
||||||
URxvt*.pointerColor: #f042b0
|
URxvt*.pointerColor: #f042b0
|
||||||
URxvt*.pointerColor2: #050505
|
URxvt*.pointerColor2: #050505
|
||||||
|
|
||||||
|
URxvt*color0: #232342
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -284,8 +284,8 @@ rec {
|
|||||||
default = "/home/${config.name}";
|
default = "/home/${config.name}";
|
||||||
};
|
};
|
||||||
mail = mkOption {
|
mail = mkOption {
|
||||||
type = str; # TODO retiolum mail address
|
type = nullOr str;
|
||||||
default = "${config._module.args.name}@${config.networking.hostName}.r";
|
default = null;
|
||||||
};
|
};
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
type = username;
|
type = username;
|
||||||
|
@ -43,7 +43,7 @@ with import <stockholm/lib>;
|
|||||||
pass
|
pass
|
||||||
q
|
q
|
||||||
qrencode
|
qrencode
|
||||||
#texLive
|
texlive.combined.scheme-full
|
||||||
tmux
|
tmux
|
||||||
|
|
||||||
#ack
|
#ack
|
||||||
|
@ -14,7 +14,7 @@ with import <stockholm/lib>;
|
|||||||
stockholm.file = "/home/tv/stockholm";
|
stockholm.file = "/home/tv/stockholm";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03
|
ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03
|
||||||
};
|
};
|
||||||
} // optionalAttrs host.secure {
|
} // optionalAttrs host.secure {
|
||||||
secrets-master.file = "/home/tv/secrets/master";
|
secrets-master.file = "/home/tv/secrets/master";
|
||||||
|
Loading…
Reference in New Issue
Block a user