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

s: always import 2configs (formerly base.nix)

Browse Source
This commit is contained in:
lassulus 2016-08-04 22:58:59 +02:00
parent 7e55508eaf
commit ad00352682
6 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shared/1systems/test-arch.nix
View File

@ -3,7 +3,6 @@
{ {
imports = [ imports = [
../. ../.
../2configs/base.nix
{ {
boot.loader.grub = { boot.loader.grub = {
device = "/dev/sda"; device = "/dev/sda";

1
shared/1systems/test-centos6.nix
View File

@ -8,7 +8,6 @@ let
in { in {
imports = [ imports = [
../. ../.
../2configs/base.nix
../2configs/os-templates/CAC-CentOS-6.5-64bit.nix ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix
{ {
networking.interfaces.enp11s0.ip4 = [ networking.interfaces.enp11s0.ip4 = [

1
shared/1systems/test-centos7.nix
View File

@ -6,7 +6,6 @@ let
in { in {
imports = [ imports = [
../. ../.
../2configs/base.nix
../2configs/os-templates/CAC-CentOS-7-64bit.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/temp/networking.nix ../2configs/temp/networking.nix
../2configs/temp/dirs.nix ../2configs/temp/dirs.nix

1
shared/1systems/wolf.nix
View File

@ -7,7 +7,6 @@ in
{ {
imports = [ imports = [
../. ../.
../2configs/base.nix
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/collectd-base.nix ../2configs/collectd-base.nix
../2configs/shack-nix-cacher.nix ../2configs/shack-nix-cacher.nix

0
shared/2configs/base.nix → shared/2configs/default.nix
View File

1
shared/default.nix
View File

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