* tv -> tv *

tv/configs/AO753.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../2configs/tv/smartd.nix
+    ../configs/smartd.nix
   ];
 
   boot.loader.grub = {

tv/configs/charybdis.nix

@@ -1,5 +1,9 @@
 { config, lib, pkgs, ... }:
 
+let
+  tvpkgs = import ../pkgs { inherit pkgs; };
+in
+
 with builtins;
 with lib;
 let
@@ -59,7 +63,7 @@ let
         ExecStart = pkgs.writeScript "charybdis-service" ''
           #! /bin/sh
           set -euf
-          exec ${Zpkgs.charybdis}/bin/charybdis-ircd \
+          exec ${tvpkgs.charybdis}/bin/charybdis-ircd \
             -foreground \
             -logfile /dev/stderr \
             -configfile ${configFile}
@@ -597,7 +601,5 @@ let
       ip = "10.243.0.0/16";
     };
   '';
-  
-  Zpkgs = import ../../Zpkgs/tv { inherit pkgs; };
 in
 out

tv/configs/git.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import ../../4lib/tv { inherit lib pkgs; };
+with import ../lib { inherit lib pkgs; };
 let
 
   out = {

tv/configs/mail-client.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-with import ../../Zpkgs/tv { inherit pkgs; };
+with import ../pkgs { inherit pkgs; };
 
 {
   environment.systemPackages = [

tv/configs/w110er.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../2configs/tv/smartd.nix
+    ../configs/smartd.nix
   ];
 
   boot.extraModprobeConfig = ''

tv/configs/xserver.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../2configs/tv/urxvt.nix # TODO via xserver
+    ../configs/urxvt.nix # TODO via xserver
   ];
 
   services.xserver.enable = true;

tv/modules/consul.nix

@@ -5,7 +5,7 @@
 # TODO consul-bootstrap HOST  that actually does is
 # TODO tools to inspect state of a cluster in outage state
 
-with import ../../4lib/tv { inherit lib pkgs; };
+with import ../lib { inherit lib pkgs; };
 let
   cfg = config.tv.consul;
 

tv/systems/cd.nix

@@ -3,21 +3,21 @@
 with lib;
 
 let
-  Zpkgs = import ../../Zpkgs/tv { inherit pkgs; };
+  tvpkgs = import ../pkgs { inherit pkgs; };
 in
 
 {
   krebs.build.host = config.krebs.hosts.cd;
 
   imports = [
-    ../../2configs/tv/CAC-Developer-2.nix
+    ../configs/CAC-Developer-2.nix
-    ../../2configs/tv/CAC-CentOS-7-64bit.nix
+    ../configs/CAC-CentOS-7-64bit.nix
-    ../../2configs/tv/base.nix
+    ../configs/base.nix
-    ../../2configs/tv/consul-server.nix
+    ../configs/consul-server.nix
-    ../../2configs/tv/exim-smarthost.nix
+    ../configs/exim-smarthost.nix
-    ../../2configs/tv/git.nix
+    ../configs/git.nix
     {
-      imports = [ ../../2configs/tv/charybdis.nix ];
+      imports = [ ../configs/charybdis.nix ];
       tv.charybdis = {
         enable = true;
         sslCert = ../../Zcerts/charybdis_cd.crt.pem;
@@ -68,7 +68,7 @@ in
         server-names = singleton "viljetic.de";
         # TODO directly set root (instead via location)
         locations = singleton (nameValuePair "/" ''
-          root ${Zpkgs.viljetic-pages};
+          root ${tvpkgs.viljetic-pages};
         '');
       };
     }

tv/systems/mkdir.nix

@@ -6,12 +6,12 @@ with lib;
   krebs.build.host = config.krebs.hosts.mkdir;
 
   imports = [
-    ../../2configs/tv/CAC-Developer-1.nix
+    ../configs/CAC-Developer-1.nix
-    ../../2configs/tv/CAC-CentOS-7-64bit.nix
+    ../configs/CAC-CentOS-7-64bit.nix
-    ../../2configs/tv/base.nix
+    ../configs/base.nix
-    ../../2configs/tv/consul-server.nix
+    ../configs/consul-server.nix
-    ../../2configs/tv/exim-smarthost.nix
+    ../configs/exim-smarthost.nix
-    ../../2configs/tv/git.nix
+    ../configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/systems/nomic.nix

@@ -6,11 +6,11 @@ with lib;
   krebs.build.host = config.krebs.hosts.nomic;
 
   imports = [
-    ../../2configs/tv/AO753.nix
+    ../configs/AO753.nix
-    ../../2configs/tv/base.nix
+    ../configs/base.nix
-    ../../2configs/tv/consul-server.nix
+    ../configs/consul-server.nix
-    ../../2configs/tv/exim-retiolum.nix
+    ../configs/exim-retiolum.nix
-    ../../2configs/tv/git.nix
+    ../configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/systems/rmdir.nix

@@ -6,12 +6,12 @@ with lib;
   krebs.build.host = config.krebs.hosts.rmdir;
 
   imports = [
-    ../../2configs/tv/CAC-Developer-1.nix
+    ../configs/CAC-Developer-1.nix
-    ../../2configs/tv/CAC-CentOS-7-64bit.nix
+    ../configs/CAC-CentOS-7-64bit.nix
-    ../../2configs/tv/base.nix
+    ../configs/base.nix
-    ../../2configs/tv/consul-server.nix
+    ../configs/consul-server.nix
-    ../../2configs/tv/exim-smarthost.nix
+    ../configs/exim-smarthost.nix
-    ../../2configs/tv/git.nix
+    ../configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/systems/wu.nix

@@ -3,22 +3,22 @@
 with lib;
 
 let
-  Zpkgs = import ../../Zpkgs/tv { inherit pkgs; };
+  tvpkgs = import ../pkgs { inherit pkgs; };
 in
 
 {
   krebs.build.host = config.krebs.hosts.wu;
 
   imports = [
-    ../../2configs/tv/w110er.nix
+    ../configs/w110er.nix
-    ../../2configs/tv/base.nix
+    ../configs/base.nix
-    ../../2configs/tv/consul-client.nix
+    ../configs/consul-client.nix
-    ../../2configs/tv/exim-retiolum.nix
+    ../configs/exim-retiolum.nix
-    ../../2configs/tv/git.nix
+    ../configs/git.nix
-    ../../2configs/tv/mail-client.nix
+    ../configs/mail-client.nix
-    ../../2configs/tv/xserver.nix
+    ../configs/xserver.nix
-    ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
+    ../configs/synaptics.nix # TODO w110er if xserver is enabled
-    ../../2configs/tv/urlwatch.nix
+    ../configs/urlwatch.nix
     {
       environment.systemPackages = with pkgs; [
 
@@ -26,9 +26,9 @@ in
         git
         gnumake
         parallel
-        Zpkgs.genid
+        tvpkgs.genid
-        Zpkgs.hashPassword
+        tvpkgs.hashPassword
-        Zpkgs.lentil
+        tvpkgs.lentil
         (pkgs.writeScriptBin "ff" ''
           #! ${pkgs.bash}/bin/bash
           exec sudo -u ff -i <<EOF
@@ -75,8 +75,8 @@ in
         sxiv
         texLive
         tmux
+        tvpkgs.dic
         zathura
-        Zpkgs.dic
 
         #ack
         #apache-httpd