summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus.nix6
-rw-r--r--tv/1systems/cd.nix4
-rw-r--r--tv/2configs/backup.nix12
-rw-r--r--tv/2configs/git.nix6
-rw-r--r--tv/2configs/vim.nix7
-rw-r--r--tv/3modules/iptables.nix16
6 files changed, 12 insertions, 39 deletions
diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix
index bc6e3a6d8..4bc0318e8 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus.nix
@@ -22,10 +22,6 @@ with import <stockholm/lib>;
devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
};
};
- loader = {
- efi.canTouchEfiVariables = true;
- gummiboot.enable = true;
- };
};
environment.systemPackages = with pkgs; [
@@ -62,7 +58,7 @@ with import <stockholm/lib>;
krebs.build = {
host = config.krebs.hosts.alnus;
user = mkForce config.krebs.users.dv;
- source.nixpkgs.git.ref = mkForce "d7450443c42228832c68fba203a7c15cfcfb264e";
+ source.nixpkgs.git.ref = mkForce "e924319cb6c74aa2a9c943eddeb0caef79db01bc";
};
networking.networkmanager.enable = true;
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 108006f34..b718d19b8 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -16,11 +16,11 @@ with import <stockholm/lib>;
networking = {
interfaces.enp2s1.ip4 = singleton {
address = let
- addr = "45.62.237.203";
+ addr = "64.137.177.226";
in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr;
prefixLength = 24;
};
- defaultGateway = "45.62.237.1";
+ defaultGateway = "64.137.177.1";
nameservers = ["8.8.8.8"];
};
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index 7c91b1cf1..5cc86cfdd 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -46,12 +46,6 @@ with import <stockholm/lib>;
dst = { host = config.krebs.hosts.zu; path = "/bku/xu-home"; };
startAt = "06:20";
};
- xu-pull-cd-ejabberd = {
- method = "pull";
- src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; };
- dst = { host = config.krebs.hosts.xu; path = "/bku/cd-ejabberd"; };
- startAt = "07:00";
- };
xu-pull-cd-home = {
method = "pull";
src = { host = config.krebs.hosts.cd; path = "/home"; };
@@ -76,12 +70,6 @@ with import <stockholm/lib>;
dst = { host = config.krebs.hosts.xu; path = "/bku/zu-home"; };
startAt = "05:00";
};
- zu-pull-cd-ejabberd = {
- method = "pull";
- src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; };
- dst = { host = config.krebs.hosts.zu; path = "/bku/cd-ejabberd"; };
- startAt = "06:00";
- };
zu-pull-cd-home = {
method = "pull";
src = { host = config.krebs.hosts.cd; path = "/home"; };
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 48d738365..9ccb0a057 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -2,9 +2,9 @@
with import <stockholm/lib>;
-let
+let {
- out = {
+ body = {
krebs.git = {
enable = true;
cgit = {
@@ -123,4 +123,4 @@ let
perm = fetch;
};
-in out
+}
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index cc59a95a5..1ffafe9c9 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>;
-let
- out = {
+let {
+ body = {
environment.systemPackages = [
vim
];
@@ -411,5 +411,4 @@ let
catch /^Vim\%((\a\+)\)\=:E484/
endtry
'';
-in
-out
+}
diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 7276726ca..803ed6fbf 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
with import <stockholm/lib>;
-let
+let {
cfg = config.tv.iptables;
- out = {
+ body = {
options.tv.iptables = api;
config = lib.mkIf cfg.enable imp;
};
@@ -146,14 +146,4 @@ let
)}
COMMIT
'';
-in out
-
-#let
-# cfg = config.tv.iptables;
-# arg' = arg // { inherit cfg; };
-#in
-#
-#{
-# options.tv.iptables = import ./options.nix arg';
-# config = lib.mkIf cfg.enable (import ./config.nix arg');
-#}
+}