don't try to mimic nixpkgs

This commit is contained in:
tv 2016-02-15 16:27:11 +01:00
parent d01679cc63
commit 47567807bb
12 changed files with 19 additions and 3 deletions

View file

@ -11,6 +11,7 @@ let
in {
imports =
[ # Include the results of the hardware scan.
../.
../2configs/fs/single-partition-ext4.nix
../2configs/tinc-basic-retiolum.nix
../2configs/smart-monitor.nix

View file

@ -6,6 +6,7 @@ let
internal-ip = head config.krebs.build.host.nets.retiolum.addrs4;
in {
imports = [
../.
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../2configs/fs/simple-swap.nix

View file

@ -20,6 +20,7 @@ let
in {
imports =
[
../.
# TODO: unlock home partition via ssh
../2configs/fs/single-partition-ext4.nix
../2configs/tinc-basic-retiolum.nix

View file

@ -6,6 +6,7 @@
{
imports =
[
../.
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../../krebs/3modules/Reaktor.nix

View file

@ -6,6 +6,7 @@
{
imports =
[ # Include the results of the hardware scan.
../.
../2configs/main-laptop.nix #< base-gui + zsh
# Krebs

View file

@ -7,6 +7,7 @@
{
imports =
[ # Include the results of the hardware scan.
../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/cgit-retiolum.nix
];

View file

@ -6,6 +6,7 @@
{
imports =
[ # Include the results of the hardware scan.
../.
../2configs/base-gui.nix
../2configs/tinc-basic-retiolum.nix
../2configs/fs/sda-crypto-root.nix

View file

@ -6,6 +6,7 @@
krebs.build.host = config.krebs.hosts.vbob;
imports =
[ # Include the results of the hardware scan.
../.
<nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
../2configs/main-laptop.nix #< base-gui

View file

@ -2,6 +2,7 @@
{
imports =
[ # Include the results of the hardware scan.
../.
../2configs/main-laptop.nix
];
krebs = {

View file

@ -7,6 +7,7 @@ let
internal-ip = head config.krebs.build.host.nets.retiolum.addrs4;
in {
imports = [
../.
# TODO: copy this config or move to krebs
../../tv/2configs/hw/CAC.nix
../../tv/2configs/fs/CAC-CentOS-7-64bit.nix

View file

@ -21,7 +21,7 @@ with config.krebs.lib;
target = mkDefault "root@${config.krebs.build.host.name}";
user = config.krebs.users.makefu;
source = mapAttrs (_: mkDefault) {
upstream-nixpkgs = {
nixpkgs = {
url = https://github.com/nixos/nixpkgs;
rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # unstable @ 2015-01-27, tested on wry
};
@ -30,8 +30,6 @@ with config.krebs.lib;
# Defaults for all stockholm users?
nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
nixpkgs = symlink:stockholm/nixpkgs;
stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}";
};
};
};

8
default.nix Normal file
View file

@ -0,0 +1,8 @@
_:
{
imports = [
../krebs
./2configs
./3modules
];
}