Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2017-01-09 17:14:51 +01:00
commit 2e72ce8367
5 changed files with 15 additions and 28 deletions

View File

@ -339,9 +339,11 @@ let
description = "Git repository hosting user";
shell = "/bin/sh";
openssh.authorizedKeys.keys =
mapAttrsToList (_: makeAuthorizedKey git-ssh-command)
(filterAttrs (_: user: isString user.pubkey)
config.krebs.users);
unique
(sort lessThan
(map (makeAuthorizedKey git-ssh-command)
(filter (user: isString user.pubkey)
(concatMap (getAttr "user") cfg.rules))));
};
};

View File

@ -22,10 +22,6 @@ with import <stockholm/lib>;
devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
};
};
loader = {
efi.canTouchEfiVariables = true;
gummiboot.enable = true;
};
};
environment.systemPackages = with pkgs; [
@ -62,7 +58,7 @@ with import <stockholm/lib>;
krebs.build = {
host = config.krebs.hosts.alnus;
user = mkForce config.krebs.users.dv;
source.nixpkgs.git.ref = mkForce "d7450443c42228832c68fba203a7c15cfcfb264e";
source.nixpkgs.git.ref = mkForce "e924319cb6c74aa2a9c943eddeb0caef79db01bc";
};
networking.networkmanager.enable = true;

View File

@ -2,9 +2,9 @@
with import <stockholm/lib>;
let
let {
out = {
body = {
krebs.git = {
enable = true;
cgit = {
@ -123,4 +123,4 @@ let
perm = fetch;
};
in out
}

View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>;
let
out = {
let {
body = {
environment.systemPackages = [
vim
];
@ -411,5 +411,4 @@ let
catch /^Vim\%((\a\+)\)\=:E484/
endtry
'';
in
out
}

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>;
let
let {
cfg = config.tv.iptables;
out = {
body = {
options.tv.iptables = api;
config = lib.mkIf cfg.enable imp;
};
@ -146,14 +146,4 @@ let
)}
COMMIT
'';
in out
#let
# cfg = config.tv.iptables;
# arg' = arg // { inherit cfg; };
#in
#
#{
# options.tv.iptables = import ./options.nix arg';
# config = lib.mkIf cfg.enable (import ./config.nix arg');
#}
}