diff options
| author | lassulus <lass@aidsballs.de> | 2015-07-23 02:26:42 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-07-23 02:26:42 +0200 |
| commit | 0db3f4ee695148b60238861384b86f0fdc880459 (patch) | |
| tree | 8249b4e2713aeabdf4a9d1aeee4c38e1a527e487 /1systems | |
| parent | b590d9e21d8c99a91fd419c3e0bea949a9ac6849 (diff) | |
| parent | 791a7e79977de76908ab9e33eb64cbd2b02da3ed (diff) | |
Merge branch 'tv' into master
Diffstat (limited to '1systems')
| -rw-r--r-- | 1systems/tv/cd.nix | 7 | ||||
| -rw-r--r-- | 1systems/tv/mkdir.nix | 9 | ||||
| -rw-r--r-- | 1systems/tv/nomic.nix | 7 | ||||
| -rw-r--r-- | 1systems/tv/rmdir.nix | 7 | ||||
| -rw-r--r-- | 1systems/tv/wu.nix | 7 |
5 files changed, 11 insertions, 26 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 42e4ecf1a..d3cae6f4a 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -35,11 +35,8 @@ in singleton config.tv.github-hosts-sync.port; } { - imports = [ ../../3modules/tv/identity.nix ]; - tv.identity = { - enable = true; - self = config.tv.identity.hosts.cd; - }; + imports = [ ../../2configs/tv/identity.nix ]; + tv.identity.self = config.tv.identity.hosts.cd; } { imports = [ ../../3modules/tv/iptables.nix ]; diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix index e4e89872e..e0e057d63 100644 --- a/1systems/tv/mkdir.nix +++ b/1systems/tv/mkdir.nix @@ -11,11 +11,8 @@ with lib; ../../2configs/tv/exim-smarthost.nix ../../2configs/tv/git-public.nix { - imports = [ ../../3modules/tv/identity.nix ]; - tv.identity = { - enable = true; - self = config.tv.identity.hosts.mkdir; - }; + imports = [ ../../2configs/tv/identity.nix ]; + tv.identity.self = config.tv.identity.hosts.mkdir; } { imports = [ ../../3modules/tv/iptables.nix ]; @@ -49,7 +46,7 @@ with lib; networking.hostName = "mkdir"; networking.interfaces.enp2s1.ip4 = [ { - address = "162.248.167.241"; + address = "162.248.167.241"; # TODO prefixLength = 24; } ]; diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index b6235297f..6f984c44d 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -10,11 +10,8 @@ with lib; ../../2configs/tv/exim-retiolum.nix ../../2configs/tv/git-public.nix { - imports = [ ../../3modules/tv/identity.nix ]; - tv.identity = { - enable = true; - self = config.tv.identity.hosts.nomic; - }; + imports = [ ../../2configs/tv/identity.nix ]; + tv.identity.self = config.tv.identity.hosts.nomic; } { imports = [ ../../3modules/tv/iptables.nix ]; diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index 14817c9bc..b77a1c39e 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -11,11 +11,8 @@ with lib; ../../2configs/tv/exim-smarthost.nix ../../2configs/tv/git-public.nix { - imports = [ ../../3modules/tv/identity.nix ]; - tv.identity = { - enable = true; - self = config.tv.identity.hosts.rmdir; - }; + imports = [ ../../2configs/tv/identity.nix ]; + tv.identity.self = config.tv.identity.hosts.rmdir; } { imports = [ ../../3modules/tv/iptables.nix ]; diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix index 866386698..400005cb7 100644 --- a/1systems/tv/wu.nix +++ b/1systems/tv/wu.nix @@ -18,11 +18,8 @@ in ../../2configs/tv/xserver.nix ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled { - imports = [ ../../3modules/tv/identity.nix ]; - tv.identity = { - enable = true; - self = config.tv.identity.hosts.wu; - }; + imports = [ ../../2configs/tv/identity.nix ]; + tv.identity.self = config.tv.identity.hosts.wu; } { environment.systemPackages = with pkgs; [ |