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

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2016-12-20 13:47:44 +01:00
commit deaef40bdf
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
krebs/3modules/tv/default.nix
View File

@ -391,11 +391,13 @@ with import <stockholm/lib>;
zu = { zu = {
cores = 4; cores = 4;
nets = { nets = {
#gg23 = { gg23 = {
# ip4.addr = ""; ip4.addr = "10.23.1.39";
# aliases = ["zu.gg23"]; aliases = [
# ssh.port = 11423; "zu.gg23"
#}; ];
ssh.port = 11423;
};
retiolum = { retiolum = {
ip4.addr = "10.243.13.40"; ip4.addr = "10.243.13.40";
ip6.addr = "42:0:0:0:0:0:0:1340"; ip6.addr = "42:0:0:0:0:0:0:1340";

12
tv/1systems/nomic.nix
View File

@ -7,7 +7,7 @@ with import <stockholm/lib>;
imports = [ imports = [
../. ../.
../2configs/hw/AO753.nix ../2configs/hw/x220.nix
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/git.nix ../2configs/git.nix
../2configs/im.nix ../2configs/im.nix
@ -25,6 +25,16 @@ with import <stockholm/lib>;
]; ];
}; };
# Don't use UEFI because current disk was partitioned/formatted for AO753.
# TODO remove following bool.loader section after repartitioning/reformatting
boot.loader = {
grub = {
device = "/dev/sda";
splashImage = null;
};
systemd-boot.enable = mkForce false;
};
fileSystems."/" = fileSystems."/" =
{ device = "/dev/mapper/nomic1-root"; { device = "/dev/mapper/nomic1-root";
fsType = "btrfs"; fsType = "btrfs";

2
tv/2configs/default.nix
View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm"; stockholm.file = "/home/tv/stockholm";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
ref = "728a9578e31a0f78f6ad07a3a2ec706ec5290f10"; ref = "81428dd022c26764e9066d381ece90b1e88bd0d2";
}; };
} // optionalAttrs host.secure { } // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master"; secrets-master.file = "/home/tv/secrets/master";