Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
deaef40bdf
@ -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";
|
||||||
|
@ -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";
|
||||||
|
@ -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";
|
||||||
|
Loading…
Reference in New Issue
Block a user