drop config.krebs.lib

This commit is contained in:
tv 2016-10-20 20:54:38 +02:00
parent 4a6fbbbe50
commit f47bab7f71
165 changed files with 166 additions and 182 deletions

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
ReaktorConfig = pkgs.writeText "config.py" ''

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
acng-config = pkgs.writeTextFile {
name = "acng-configuration";

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
out = {
options.krebs.backup = api;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
gunicorn = pkgs.pythonPackages.gunicorn;
bepasty = pkgs.pythonPackages.bepasty-server;

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
options.krebs.build = {

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
# https://github.com/NixOS/nixpkgs/issues/14026

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
import os

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.current;

View File

@ -1,6 +1,6 @@
{ config, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs;
@ -21,7 +21,6 @@ let
./git.nix
./go.nix
./iptables.nix
./lib.nix
./newsbot-js.nix
./nginx.nix
./nixpkgs.nix

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.exim-retiolum;

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
indent = replaceChars ["\n"] ["\n "];
cfg = config.krebs.exim-smarthost;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: with config.krebs.lib; let
{ config, lib, pkgs, ... }: with import <stockholm/lib>; let
cfg = config.krebs.exim;
in {
options.krebs.exim = {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.fetchWallpaper;

View File

@ -6,7 +6,7 @@
# TODO when authorized_keys changes, then restart ssh
# (or kill already connected users somehow)
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.git;
@ -97,7 +97,7 @@ let
singleton {
user = [ config.krebs.users.tv ];
repo = [ testing ]; # see literal example of repos
perm = push "refs/*" (with config.krebs.lib.git; [
perm = push "refs/*" (with git; [
non-fast-forward create delete merge
]);
}

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.github-hosts-sync;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.go;

View File

@ -1,6 +1,6 @@
{ config, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.lass) {

View File

@ -1,15 +0,0 @@
{ config, pkgs, lib, ... }:
with lib;
let
out = {
options.krebs.lib = api;
config = imp;
};
api = mkOption {
default = {};
type = types.attrs;
};
imp = {
krebs.lib = import <stockholm/lib>;
};
in out

View File

@ -1,6 +1,6 @@
{ config, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.nginx;

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.nixpkgs;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: with config.krebs.lib; let
{ config, lib, pkgs, ... }: with import <stockholm/lib>; let
out = {
options.krebs.on-failure = api;
config = lib.mkIf cfg.enable imp;

View File

@ -1,5 +1,5 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
nixos-version-id = "${config.system.nixosVersion}";
nixos-version = "${nixos-version-id} (${config.system.nixosCodeName})";

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.per-user;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.power-action;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.realwallpaper;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.repo-sync;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.retiolum-bootstrap;

View File

@ -1,5 +1,5 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
out = {
options.krebs.tinc = api;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.rtorrent;
webcfg = config.krebs.rtorrent.web;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }@args: with config.krebs.lib; let
{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
cfg = config.krebs.secret;
in {
options.krebs.secret = {

View File

@ -1,5 +1,5 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.setuid;

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
testHosts = genAttrs [
"test-arch"

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.tinc_graphs;
internal_dir = "${cfg.workingDir}/internal";

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
dns.providers = {

View File

@ -4,7 +4,7 @@
# TODO inform about unused caches
# cache = url: "${cfg.dataDir}/.urlwatch/cache/${hashString "sha1" url}"
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.krebs.urlwatch;

View File

@ -1,5 +1,5 @@
{ config, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
rec {
execve = name: { filename, argv ? null, envp ? {}, destination ? "" }: let
in writeC name { inherit destination; } /* c */ ''

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }@args:
with config.krebs.lib;
with import <stockholm/lib>;
{
nixpkgs.config.packageOverrides = pkgs: let

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
./3modules

View File

@ -1,7 +1,7 @@
{ config, pkgs, ... }:
with builtins;
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [

View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
../.

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
ip = config.krebs.build.host.nets.internet.ip4.addr;

View File

@ -1,7 +1,7 @@
{ config, pkgs, ... }:
with builtins;
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
../.

View File

@ -1,5 +1,5 @@
{ config, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
krebs.backup.plans = {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
mainUser = config.users.extraUsers.mainUser;

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
sshHostConfig = pkgs.writeText "ssh-config" ''

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
inherit (config.krebs.lib) genid;
inherit (import <stockholm/lib>) genid;
in {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
../2configs/audit.nix

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
users.extraUsers = {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
krebs.exim-retiolum.enable = true;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
krebs.exim-smarthost = {

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
nix.gc = {
automatic = ! elem config.krebs.build.host.name [ "prism" "mors" ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
environment.systemPackages = [
pkgs.go

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
networking.wireless.enable = lib.mkDefault true;

View File

@ -2,7 +2,7 @@
let
mainUser = config.users.extraUsers.mainUser;
inherit (config.krebs.lib) genid;
inherit (import <stockholm/lib>) genid;
in {
virtualisation.libvirtd.enable = true;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
pkg = pkgs.pulseaudioLight;
runDir = "/run/pulse";

View File

@ -1,11 +1,11 @@
{ config, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
name = "radio";
mainUser = config.users.extraUsers.mainUser;
inherit (config.krebs.lib) genid;
inherit (import <stockholm/lib>) genid;
admin-password = import <secrets/icecast-admin-pw>;
source-password = import <secrets/icecast-source-pw>;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
mirror = "git@${config.networking.hostName}:";

View File

@ -2,7 +2,7 @@
let
mainUser = config.users.extraUsers.mainUser;
inherit (config.krebs.lib) genid;
inherit (import <stockholm/lib>) genid;
in {
users.extraUsers = {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
services.teamviewer.enable = true;
}

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
out = {
environment.systemPackages = [

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
inherit (config.krebs.lib) genid;
inherit (import <stockholm/lib>) genid;
in {
krebs.per-user.chat.packages = with pkgs; [
mosh

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
pkgs.writeText "Xresources" ''
URxvt*scrollBar: false

View File

@ -1,5 +1,5 @@
{ config, pkgs, ... }@args:
with config.krebs.lib;
with import <stockholm/lib>;
let
user = config.krebs.build.user;
in {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.services.xserver;

View File

@ -1,4 +1,4 @@
{ config, ... }: with config.krebs.lib; let
{ config, ... }: with import <stockholm/lib>; let
cfg = config.lass.ejabberd;
# XXX this is a placeholder that happens to work the default strings.

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }@args: with config.krebs.lib; let
{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
cfg = config.lass.ejabberd;
in {
options.lass.ejabberd = {

View File

@ -1,6 +1,6 @@
{ config, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
options.lass.hosts = mkOption {

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.lass.owncloud;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.lass.staticPage;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.lass.umts;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }@args: with config.krebs.lib; let
{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
cfg = config.lass.usershadow;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
cfg = config.lass.wordpress;

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
byid = dev: "/dev/disk/by-id/" + dev;
rootDisk = byid "ata-ADATA_SSD_S599_64GB_10460000000000000039";

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
external-ip = config.krebs.build.host.nets.internet.ip4.addr;
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;

View File

@ -66,7 +66,7 @@ in {
'';
};
users.groups.share = {
gid = config.krebs.lib.genid "share";
gid = (import <stockholm/lib>).genid "share";
members = [ "makefu" "misa" ];
};
networking.firewall.trustedInterfaces = [ primaryInterface ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
external-ip = config.krebs.build.host.nets.internet.ip4.addr;

View File

@ -1,5 +1,5 @@
{ config, lib, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
# preparation:
# mkdir -p defaultBackupDir/host.name/src

View File

@ -11,7 +11,7 @@
# if this is not enough, check out main-laptop.nix
with config.krebs.lib;
with import <stockholm/lib>;
let
mainUser = config.krebs.build.user.name;
in

View File

@ -10,7 +10,7 @@
# wildcard.krebsco.de.key
# bepasty-secret.nix <- contains single string
with config.krebs.lib;
with import <stockholm/lib>;
let
sec = toString <secrets>;
# secKey is nothing worth protecting on a local machine

View File

@ -2,7 +2,7 @@
# graphite-web on port 8080
# carbon cache on port 2003 (tcp/udp)
with config.krebs.lib;
with import <stockholm/lib>;
let
connect-time-cfg = with pkgs; writeText "collectd-connect-time.cfg" ''
LoadPlugin python

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
{

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
# more than just nginx config but not enough to become a module
with config.krebs.lib;
with import <stockholm/lib>;
let
hostname = config.krebs.build.host.name;
external-ip = config.krebs.build.host.nets.internet.ip4.addr;

View File

@ -2,7 +2,7 @@
# graphite-web on port 8080
# carbon cache on port 2003 (tcp/udp)
with config.krebs.lib;
with import <stockholm/lib>;
let
sec = toString <secrets>;
acmepath = "/var/lib/acme/";

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
networking.firewall.allowedTCPPorts = [ 25 ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
let
hostname = config.krebs.build.host.name;
in {

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
# vda1 ext4 (label nixos) -> only root partition
with config.krebs.lib;
with import <stockholm/lib>;
{
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;

View File

@ -8,7 +8,7 @@
# / (main-root)
# /home (main-home)
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [

View File

@ -4,7 +4,7 @@
# sda1: boot ext4 (label nixboot) - must be unlocked on boot if required:
# boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
# sda2: cryptoluks -> ext4
with config.krebs.lib;
with import <stockholm/lib>;
{
boot = {
loader.grub.enable = true;

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
# vda1 ext4 (label nixos) -> only root partition
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [
./single-partition-ext4.nix

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
# TODO: remove tv lib :)
with config.krebs.lib;
with import <stockholm/lib>;
let
repos = priv-repos // krebs-repos ;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
# TODO: remove tv lib :)
with config.krebs.lib;
with import <stockholm/lib>;
let
repos = priv-repos // krebs-repos // connector-repos ;

View File

@ -2,7 +2,7 @@
# graphite-web on port 8080
# carbon cache on port 2003 (tcp/udp)
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [ ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [ ./tp-x2x0.nix ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
imports = [ ./tp-x2x0.nix ];

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
networking.wireless.enable = lib.mkDefault true;

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
abook

View File

@ -5,7 +5,7 @@
# not fit into base-gui
# TODO split generic desktop stuff and laptop-specifics like lidswitching
with config.krebs.lib;
with import <stockholm/lib>;
let
window-manager = "awesome";
user = config.krebs.build.user.name;

Some files were not shown because too many files have changed in this diff Show More