Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
66bcb802f5
19
krebs/3modules/external/mic92.nix
vendored
19
krebs/3modules/external/mic92.nix
vendored
|
@ -675,6 +675,25 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
jarvis = {
|
||||||
|
owner = config.krebs.users.mic92;
|
||||||
|
nets = rec {
|
||||||
|
retiolum = {
|
||||||
|
aliases = [ "jarvis.r" ];
|
||||||
|
tinc.pubkey = ''
|
||||||
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
|
MIIBCgKCAQEA7PtJlYBpBr2TK5CAvAukkGvj+esC+sMPKd3mO9iDwdViBrqKdf+D
|
||||||
|
yEy8SI80Y02dpkL97NjvnzepKpyGQWpG1ZQflJLhCTj7oFyVpWd4XsbIuzYp5ES6
|
||||||
|
r8qKWs2xcItc1pbW0ZmrCBzdWsC1B0VAHlYkiz+7vM6pCTvg6hNQugP4c1TRCtJC
|
||||||
|
Sr+n+EjTXN/NTaKl+f7eoHJGnT5liDO3/xZVxm8AuLnron1xPPDghXClVHfDj5mt
|
||||||
|
f66f+CLwZhq3BrZuptwXp7TerMfrNtPyTx96b+EyuLPjrYxKeKL/+Nbr3VmmiDIV
|
||||||
|
tsraNc+0a8OBpVsYh4MQLp55NYwqxAoetQIDAQAB
|
||||||
|
-----END RSA PUBLIC KEY-----
|
||||||
|
'';
|
||||||
|
tinc.pubkey_ed25519 = "RRkMnGSg+nMkz4L2iqmdFf2fIf4wIfcTM0TlTWLLNCE";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
bernie = {
|
bernie = {
|
||||||
owner = config.krebs.users.mic92;
|
owner = config.krebs.users.mic92;
|
||||||
nets = rec {
|
nets = rec {
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "much";
|
pname = "much";
|
||||||
version = "1.2.0";
|
version = "1.3.1";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://cgit.krebsco.de/much";
|
url = "https://cgit.krebsco.de/much";
|
||||||
sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl";
|
sha256 = "0gwyhqcvg9ywna8fhb9hnx97qh5inglj3l0pcwkgwcvm27mfpcqa";
|
||||||
rev = "29749366052a8f6c05b314f1ff17201717855ad7";
|
rev = "77357335a3a88a4b93f91a46ab939a1a9b192977";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
|
|
|
@ -100,6 +100,7 @@ with stockholm.lib;
|
||||||
add_message "$(
|
add_message "$(
|
||||||
git log \
|
git log \
|
||||||
--format="$(orange %h) %s $(gray '(%ar)')" \
|
--format="$(orange %h) %s $(gray '(%ar)')" \
|
||||||
|
--no-merges \
|
||||||
--reverse \
|
--reverse \
|
||||||
$id2..$id
|
$id2..$id
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user