From 8d7c80aac644558768a689012d7b31d23f559d66 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 25 Jul 2015 01:38:26 +0200
Subject: [PATCH] {1 tv * -> 2 tv base} networking.hostName
---
1systems/tv/cd.nix | 1 -
1systems/tv/mkdir.nix | 1 -
1systems/tv/nomic.nix | 2 --
1systems/tv/rmdir.nix | 1 -
1systems/tv/wu.nix | 2 --
2configs/tv/base.nix | 2 ++
6 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index fcaf19cb5..6913508b5 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -84,7 +84,6 @@ in
}
];
- networking.hostName = "cd";
networking.interfaces.enp2s1.ip4 = [
{
address = "162.219.7.216";
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 938f50118..7542ad0ce 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -38,7 +38,6 @@ with lib;
}
];
- networking.hostName = "mkdir";
networking.interfaces.enp2s1.ip4 = [
{
address = "162.248.167.241"; # TODO
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 1f7f6b188..cd6e02596 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -97,6 +97,4 @@ with lib;
rxvt_unicode.terminfo
tmux
];
-
- networking.hostName = "nomic";
}
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 45e9997e4..9233014ba 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -39,7 +39,6 @@ with lib;
}
];
- networking.hostName = "rmdir";
networking.interfaces.enp2s1.ip4 = [
{
address = "167.88.44.94";
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index ccb2dd141..809f43c8b 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -422,8 +422,6 @@ in
hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.enable = true;
- networking.hostName = "wu";
-
environment.systemPackages = with pkgs; [
xlibs.fontschumachermisc
slock
diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix
index 40fe9ee04..06f83ea9e 100644
--- a/2configs/tv/base.nix
+++ b/2configs/tv/base.nix
@@ -12,6 +12,8 @@ in
krebs.enable = true;
krebs.search-domain = "retiolum";
+ networking.hostName = config.krebs.build.host.name;
+
imports = [
{
users.extraUsers =