Merge remote-tracking branch 'mors/master' into morse-merge
This commit is contained in:
commit
e56f2179cb
|
@ -12,7 +12,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
inherit (import ../../lib { inherit pkgs; }) shell-escape;
|
||||
inherit (import ../../lib { inherit pkgs; inherit lib; }) shell-escape;
|
||||
inherit (pkgs) writeScript;
|
||||
|
||||
in
|
||||
|
@ -43,7 +43,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config =
|
||||
config =
|
||||
let
|
||||
cfg = config.services.xresources;
|
||||
xres = concatStringsSep "\n" (attrValues cfg.resources);
|
||||
|
@ -53,6 +53,5 @@ in
|
|||
echo ${shell-escape xres} | xrdb -merge
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -25,11 +25,13 @@
|
|||
../lass/ircd.nix
|
||||
../../secrets/mors-pw.nix
|
||||
./repos.nix
|
||||
../lass/chromium-patched.nix
|
||||
./git.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
url = "https://github.com/Lassulus/nixpkgs";
|
||||
rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
|
||||
rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530";
|
||||
};
|
||||
|
||||
networking.hostName = "mors";
|
||||
|
|
71
modules/mors/git.nix
Normal file
71
modules/mors/git.nix
Normal file
|
@ -0,0 +1,71 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../tv/git
|
||||
];
|
||||
|
||||
services.git =
|
||||
let
|
||||
inherit (builtins) readFile;
|
||||
# TODO lib should already include our stuff
|
||||
inherit (import ../../lib { inherit lib pkgs; }) addNames git;
|
||||
|
||||
krebs-private = name: desc:
|
||||
{
|
||||
inherit desc;
|
||||
hooks = {
|
||||
post-receive = git.irc-announce {
|
||||
nick = config.networking.hostName; # TODO make this the default
|
||||
channel = "#retiolum";
|
||||
server = "ire.retiolum";
|
||||
};
|
||||
};
|
||||
}
|
||||
in rec {
|
||||
enable = true;
|
||||
|
||||
users = addNames {
|
||||
tv = { pubkey = readFile <pubkeys/tv.ssh.pub>; };
|
||||
lass = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
|
||||
uriel = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
|
||||
makefu = { pubkey = "xxx"; };
|
||||
};
|
||||
|
||||
repos = addNames {
|
||||
shitment = {
|
||||
desc = "shitment repository";
|
||||
hooks = {
|
||||
post-receive = git.irc-announce {
|
||||
nick = config.networking.hostName; # TODO make this the default
|
||||
channel = "#retiolum";
|
||||
server = "ire.retiolum";
|
||||
};
|
||||
};
|
||||
public = true;
|
||||
};
|
||||
testing = {
|
||||
desc = "testing repository";
|
||||
hooks = {
|
||||
post-receive = git.irc-announce {
|
||||
nick = config.networking.hostName; # TODO make this the default
|
||||
channel = "#repository";
|
||||
server = "ire.retiolum";
|
||||
};
|
||||
};
|
||||
public = true;
|
||||
};
|
||||
};
|
||||
|
||||
rules = with git; with users; with repos; [
|
||||
{ user = lass;
|
||||
repo = [ testing shitment ];
|
||||
perm = push master [ non-fast-forward create delete merge ];
|
||||
}
|
||||
{ user = [ tv uriel makefu ];
|
||||
repo = [ testing shitment ];
|
||||
perm = fetch;
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
|
@ -17,11 +17,12 @@
|
|||
../lass/sshkeys.nix
|
||||
../lass/bird.nix
|
||||
./repos.nix
|
||||
../lass/chromium-patched.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
url = "https://github.com/Lassulus/nixpkgs";
|
||||
rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
|
||||
rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530";
|
||||
};
|
||||
|
||||
networking.hostName = "uriel";
|
||||
|
|
1
pubkeys/lass.ssh.pub
Normal file
1
pubkeys/lass.ssh.pub
Normal file
|
@ -0,0 +1 @@
|
|||
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors
|
1
pubkeys/uriel.ssh.pub
Normal file
1
pubkeys/uriel.ssh.pub
Normal file
|
@ -0,0 +1 @@
|
|||
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDExWuRcltGM2FqXO695nm6/QY3wU3r1bDTyCpMrLfUSym7TxcXDSmZSWcueexPXV6GENuUfjJPZswOdWqIo5u2AXw9t0aGvwEDmI6uJ7K5nzQOsXIneGMdYuoOaAzWI8pxZ4N+lIP1HsOYttIPDp8RwU6kyG+Ud8mnVHWSTO13C7xC9vePnDP6b+44nHS691Zj3X/Cq35Ls0ISC3EM17jreucdP62L3TKk2R4NCm3Sjqj+OYEv0LAqIpgqSw5FypTYQgNByxRcIcNDlri63Q1yVftUP1338UiUfxtraUu6cqa2CdsHQmtX5mTNWEluVWO3uUKTz9zla3rShC+d3qvr lass@uriel
|
Loading…
Reference in a new issue