Mic92
/
stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 2: base -> default, rm base-sources

This commit is contained in:
makefu 2015-11-06 23:54:27 +01:00
parent 9a0e67cf65
commit 288324507c
10 changed files with 47 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefu/1systems/filepimp.nix
View File

@ -7,15 +7,12 @@
{
imports =
[ # Include the results of the hardware scan.
../2configs/base.nix
../2configs/default.nix
../2configs/fs/vm-single-partition.nix
../2configs/fs/single-partition-ext4.nix
../2configs/tinc-basic-retiolum.nix
../2configs/base-sources.nix
];
krebs.build.host = config.krebs.hosts.filepimp;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@filepimp";
# AMD N54L
boot = {

8
makefu/1systems/gum.nix
View File

@ -7,8 +7,6 @@ let
in {
imports = [
# TODO: copy this config or move to krebs
../2configs/base.nix
../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
# ../2configs/iodined.nix
@ -17,11 +15,7 @@ in {
../2configs/Reaktor/simpleExtend.nix
];
krebs.build = {
user = config.krebs.users.makefu;
target = "root@gum.krebsco.de";
host = config.krebs.hosts.gum;
};
krebs.build.host = config.krebs.hosts.gum;
krebs.Reaktor.enable = true;

4
makefu/1systems/pnp.nix
View File

@ -8,8 +8,6 @@
imports =
[ # Include the results of the hardware scan.
# Base
../2configs/base.nix
../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
@ -45,8 +43,6 @@
};
krebs.build.host = config.krebs.hosts.pnp;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pnp";
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };

22
makefu/1systems/pornocauster.nix
View File

@ -6,12 +6,8 @@
{
imports =
[ # Include the results of the hardware scan.
../2configs/base.nix
../2configs/main-laptop.nix #< base-gui
# configures sources
../2configs/base-sources.nix
# Krebs
../2configs/tinc-basic-retiolum.nix
#../2configs/disable_v6.nix
@ -23,7 +19,8 @@
../2configs/exim-retiolum.nix
../2configs/mail-client.nix
#../2configs/virtualization.nix
../2configs/virtualization-virtualbox.nix
../2configs/virtualization.nix
#../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix
# services
@ -34,16 +31,19 @@
../2configs/hw/tp-x220.nix
# mount points
../2configs/fs/sda-crypto-root-home.nix
# ../2configs/mediawiki.nix
#../2configs/wordpress.nix
];
krebs.Reaktor.enable = true;
krebs.Reaktor.debug = true;
krebs.Reaktor.nickname = "makefu|r";
#krebs.Reaktor.enable = true;
#krebs.Reaktor.nickname = "makefu|r";
krebs.build.host = config.krebs.hosts.pornocauster;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pornocauster";
environment.systemPackages = with pkgs;[ get ];
environment.systemPackages = with pkgs;[
get
virtmanager
gnome3.dconf
];
services.logind.extraConfig = "HandleLidSwitch=ignore";
# configure pulseAudio to provide a HDMI sink as well

4
makefu/1systems/repunit.nix
View File

@ -8,13 +8,9 @@
imports =
[ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/base.nix
../2configs/base-sources.nix
../2configs/cgit-retiolum.nix
];
krebs.build.host = config.krebs.hosts.repunit;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@repunit";
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;

11
makefu/1systems/tsp.nix
View File

@ -6,7 +6,6 @@
{
imports =
[ # Include the results of the hardware scan.
../2configs/base.nix
../2configs/base-gui.nix
../2configs/tinc-basic-retiolum.nix
../2configs/fs/sda-crypto-root.nix
@ -21,19 +20,9 @@
];
# not working in vm
krebs.build.host = config.krebs.hosts.tsp;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@tsp";
networking.firewall.allowedTCPPorts = [
25
];
krebs.build.deps = {
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
#url = https://github.com/makefu/nixpkgs;
rev = "13576925552b1d0751498fdda22e91a055a1ff6c";
};
};
}

8
makefu/1systems/wry.nix
View File

@ -10,7 +10,6 @@ in {
# TODO: copy this config or move to krebs
../../tv/2configs/hw/CAC.nix
../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/unstable-sources.nix
../2configs/headless.nix
../2configs/tinc-basic-retiolum.nix
@ -30,11 +29,7 @@ in {
../2configs/collectd/collectd-base.nix
];
krebs.build = {
user = config.krebs.users.makefu;
target = "root@wry";
host = config.krebs.hosts.wry;
};
krebs.build.host = config.krebs.hosts.wry;
krebs.Reaktor.enable = true;
@ -62,6 +57,7 @@ in {
};
};
};
networking = {
firewall.allowPing = true;
firewall.allowedTCPPorts = [ 53 80 443 ];

21
makefu/2configs/base-sources.nix
View File

@ -1,21 +0,0 @@
{ config, lib, pkgs, ... }:
{
system.stateVersion = "15.09";
krebs.build.source = {
git.nixpkgs = {
#url = https://github.com/NixOS/nixpkgs;
url = https://github.com/makefu/nixpkgs;
rev = "78340b042463fd35caa587b0db2e400e5666dbe1"; # nixos-15.09 + cherry-picked iodine
};
dir.secrets = {
host = config.krebs.hosts.pornocauster;
path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
};
dir.stockholm = {
host = config.krebs.hosts.pornocauster;
path = toString ../.. ;
};
};
}

33
makefu/2configs/base.nix → makefu/2configs/default.nix
View File

@ -2,6 +2,8 @@
with lib;
{
system.stateVersion = "15.09";
imports = [
{
users.extraUsers =
@ -10,10 +12,36 @@ with lib;
}
./vim.nix
];
krebs.enable = true;
krebs.search-domain = "retiolum";
krebs = {
enable = true;
search-domain = "retiolum";
build = {
target = mkDefault "root@${config.krebs.build.host.name}";
user = config.krebs.users.makefu;
source = {
git.nixpkgs = {
#url = https://github.com/NixOS/nixpkgs;
url = mkDefault https://github.com/makefu/nixpkgs;
rev = mkDefault "78340b042463fd35caa587b0db2e400e5666dbe1"; # nixos-15.09 + cherry-picking
target-path = "/var/src/nixpkgs";
};
dir.secrets = {
host = config.krebs.hosts.pornocauster;
path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
};
dir.stockholm = {
host = config.krebs.hosts.pornocauster;
path = "/home/makefu/stockholm" ;
target-path = "/var/src/stockholm";
};
};
};
};
users.extraUsers = {
root = {
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
@ -56,7 +84,6 @@ with lib;
environment.systemPackages = with pkgs; [
jq
git
vim
gnumake
rxvt_unicode.terminfo
htop

16
makefu/2configs/unstable-sources.nix
View File

@ -1,20 +1,8 @@
{ config, lib, pkgs, ... }:
_:
{
system.stateVersion = "15.09";
krebs.build.source = {
git.nixpkgs = {
krebs.build.source.git.nixpkgs = {
url = https://github.com/makefu/nixpkgs;
rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd
};
dir.secrets = {
host = config.krebs.hosts.pornocauster;
path = "/home/makefu/secrets/${config.krebs.build.host.name}/";
};
dir.stockholm = {
host = config.krebs.hosts.pornocauster;
path = toString ../.. ;
};
};
}