diff options
| author | lassulus <lass@lassul.us> | 2016-12-20 13:47:44 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2016-12-20 13:47:44 +0100 |
| commit | deaef40bdfb1da44c7daf59d2a4b833cb7581730 (patch) | |
| tree | 3f605cf87b6ecbbe7c442a1dec93d8fac0dfe04e | |
| parent | 41517457742ac9425987d9763bc9c38102129fef (diff) | |
| parent | 8661ad89a6ebbee0b3aac34db0aca6fe9d173f2e (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/3modules/tv/default.nix | 12 | ||||
| -rw-r--r-- | tv/1systems/nomic.nix | 12 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 3315dd157..d44c322aa 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -391,11 +391,13 @@ with import <stockholm/lib>; zu = { cores = 4; nets = { - #gg23 = { - # ip4.addr = ""; - # aliases = ["zu.gg23"]; - # ssh.port = 11423; - #}; + gg23 = { + ip4.addr = "10.23.1.39"; + aliases = [ + "zu.gg23" + ]; + ssh.port = 11423; + }; retiolum = { ip4.addr = "10.243.13.40"; ip6.addr = "42:0:0:0:0:0:0:1340"; diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 7d6a1d682..5469fffd5 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -7,7 +7,7 @@ with import <stockholm/lib>; imports = [ ../. - ../2configs/hw/AO753.nix + ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix ../2configs/git.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."/" = { device = "/dev/mapper/nomic1-root"; fsType = "btrfs"; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8852100e2..ea97b1957 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "728a9578e31a0f78f6ad07a3a2ec706ec5290f10"; + ref = "81428dd022c26764e9066d381ece90b1e88bd0d2"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |