From c61d99ccc653c9bee950c9e2d8a3f5bf6f4d8d1c Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Aug 2020 02:26:27 +0200 Subject: tv: privatize gg23 --- tv/2configs/default.nix | 1 + tv/2configs/nets/gg23.nix | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 tv/2configs/nets/gg23.nix (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 4d27b0eac..01f83482e 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -16,6 +16,7 @@ with import ; ./backup.nix ./bash ./htop.nix + ./nets/gg23.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/gg23.nix new file mode 100644 index 000000000..fc5d239d5 --- /dev/null +++ b/tv/2configs/nets/gg23.nix @@ -0,0 +1,69 @@ +{ + krebs = { + dns.providers.gg23 = "hosts"; + hosts = { + nomic = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.110"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "nomic.gg23" + ]; + ssh.port = 11423; + }; + }; + ok = { + external = true; + nets.gg23 = { + ip4 = { + addr = "10.23.1.1"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "ok.gg23" + ]; + }; + }; + wu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.37"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "wu.gg23" + "cache.wu.gg23" + ]; + ssh.port = 11423; + }; + }; + xu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.38"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "xu.gg23" + "cache.xu.gg23" + ]; + ssh.port = 11423; + }; + }; + zu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.39"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "zu.gg23" + ]; + ssh.port = 11423; + }; + }; + }; + }; +} -- cgit v1.2.3 From 358633f9737c8327d6028ebfadf72cbb51df70fb Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Aug 2020 02:30:51 +0200 Subject: tv nets: gg23 -> hkw --- tv/2configs/binary-cache/default.nix | 2 +- tv/2configs/default.nix | 2 +- tv/2configs/nets/gg23.nix | 69 ------------------------------------ tv/2configs/nets/hkw.nix | 69 ++++++++++++++++++++++++++++++++++++ tv/2configs/nginx/public_html.nix | 2 +- 5 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 tv/2configs/nets/gg23.nix create mode 100644 tv/2configs/nets/hkw.nix (limited to 'tv') diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index 866434cb5..f6eaba36f 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -27,7 +27,7 @@ enable = true; virtualHosts.nix-serve = { serverAliases = [ - "cache.${config.krebs.build.host.name}.gg23" + "cache.${config.krebs.build.host.name}.hkw" ]; locations."/".extraConfig = '' proxy_pass http://localhost:${toString config.services.nix-serve.port}; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 01f83482e..9db35184a 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -16,7 +16,7 @@ with import ; ./backup.nix ./bash ./htop.nix - ./nets/gg23.nix + ./nets/hkw.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/gg23.nix deleted file mode 100644 index fc5d239d5..000000000 --- a/tv/2configs/nets/gg23.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - krebs = { - dns.providers.gg23 = "hosts"; - hosts = { - nomic = { - nets.gg23 = { - ip4 = { - addr = "10.23.1.110"; - prefix = "10.23.1.0/24"; - }; - aliases = [ - "nomic.gg23" - ]; - ssh.port = 11423; - }; - }; - ok = { - external = true; - nets.gg23 = { - ip4 = { - addr = "10.23.1.1"; - prefix = "10.23.1.0/24"; - }; - aliases = [ - "ok.gg23" - ]; - }; - }; - wu = { - nets.gg23 = { - ip4 = { - addr = "10.23.1.37"; - prefix = "10.23.1.0/24"; - }; - aliases = [ - "wu.gg23" - "cache.wu.gg23" - ]; - ssh.port = 11423; - }; - }; - xu = { - nets.gg23 = { - ip4 = { - addr = "10.23.1.38"; - prefix = "10.23.1.0/24"; - }; - aliases = [ - "xu.gg23" - "cache.xu.gg23" - ]; - ssh.port = 11423; - }; - }; - zu = { - nets.gg23 = { - ip4 = { - addr = "10.23.1.39"; - prefix = "10.23.1.0/24"; - }; - aliases = [ - "zu.gg23" - ]; - ssh.port = 11423; - }; - }; - }; - }; -} diff --git a/tv/2configs/nets/hkw.nix b/tv/2configs/nets/hkw.nix new file mode 100644 index 000000000..725e63b13 --- /dev/null +++ b/tv/2configs/nets/hkw.nix @@ -0,0 +1,69 @@ +{ + krebs = { + dns.providers.hkw = "hosts"; + hosts = { + nomic = { + nets.hkw = { + ip4 = { + addr = "10.23.1.110"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "nomic.hkw" + ]; + ssh.port = 11423; + }; + }; + ok = { + external = true; + nets.hkw = { + ip4 = { + addr = "10.23.1.1"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "ok.hkw" + ]; + }; + }; + wu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.37"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "wu.hkw" + "cache.wu.hkw" + ]; + ssh.port = 11423; + }; + }; + xu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.38"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "xu.hkw" + "cache.xu.hkw" + ]; + ssh.port = 11423; + }; + }; + zu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.39"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "zu.hkw" + ]; + ssh.port = 11423; + }; + }; + }; + }; +} diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix index cc7a39891..a37498ba3 100644 --- a/tv/2configs/nginx/public_html.nix +++ b/tv/2configs/nginx/public_html.nix @@ -9,7 +9,7 @@ with import ; serverAliases = [ "localhost" "${config.krebs.build.host.name}" - "${config.krebs.build.host.name}.gg23" + "${config.krebs.build.host.name}.hkw" "${config.krebs.build.host.name}.r" ]; locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' -- cgit v1.2.3 From 0ba7da55339efd015ce131a90585891b777ee892 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 26 Aug 2020 17:32:32 +0200 Subject: tv alnus: btrfs -> ext4 --- tv/1systems/alnus/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 66bd52ab2..4669ac614 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -31,12 +31,12 @@ with import ; }; "/" = { device = "/dev/mapper/main-root"; - fsType = "btrfs"; + fsType = "ext4"; options = [ "defaults" "noatime" ]; }; "/home" = { device = "/dev/mapper/main-home"; - fsType = "btrfs"; + fsType = "ext4"; options = [ "defaults" "noatime" ]; }; }; -- cgit v1.2.3 From f81eff7d672e53ca62ab4918c6f4f1befb17a742 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 26 Aug 2020 17:52:19 +0200 Subject: tv alnus: remove chromium --- tv/1systems/alnus/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 4669ac614..d7589bc1f 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -17,7 +17,6 @@ with import ; }; environment.systemPackages = with pkgs; [ - chromium firefoxWrapper networkmanagerapplet (pkgs.pidgin-with-plugins.override { -- cgit v1.2.3 From 92874c19bfef708134633fe7ee6fc997deb7252e Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 26 Aug 2020 17:50:24 +0200 Subject: tv alnus: enable earlyoom; prefer firefox tabs --- tv/1systems/alnus/config.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index d7589bc1f..f8f1b24fa 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -58,6 +58,12 @@ with import ; allowUnfree = true; }; + services.earlyoom.enable = true; + services.earlyoom.freeMemThreshold = 5; + systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ + "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs + ]; + services.xserver = { enable = true; layout = "de"; -- cgit v1.2.3 From 69c052b7d354c60d71b8f0150022ad4840032de6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 26 Aug 2020 18:22:37 +0200 Subject: tv alnus: don't allow unfree --- tv/1systems/alnus/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index f8f1b24fa..ed5fb671c 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -54,10 +54,6 @@ with import ; networking.networkmanager.enable = true; - nixpkgs.config = { - allowUnfree = true; - }; - services.earlyoom.enable = true; services.earlyoom.freeMemThreshold = 5; systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ -- cgit v1.2.3 From a5d4acd92b2eae8c8886103f1e5c3d122acf01cc Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 5 Sep 2020 01:24:43 +0200 Subject: tv au: init --- tv/1systems/au/config.nix | 18 ++++++++++++++++++ tv/1systems/au/disks.nix | 19 +++++++++++++++++++ tv/2configs/nets/hkw.nix | 14 +++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 tv/1systems/au/config.nix create mode 100644 tv/1systems/au/disks.nix (limited to 'tv') diff --git a/tv/1systems/au/config.nix b/tv/1systems/au/config.nix new file mode 100644 index 000000000..fc4b216f5 --- /dev/null +++ b/tv/1systems/au/config.nix @@ -0,0 +1,18 @@ +{ config, ... }: { + imports = [ + ./disks.nix + + + + ]; + + krebs.build.host = config.krebs.hosts.au; + + networking.wireless.enable = true; + networking.useDHCP = false; + networking.interfaces.enp0s25.useDHCP = true; + networking.interfaces.wlp3s0.useDHCP = true; + networking.interfaces.wwp0s29u1u4i6.useDHCP = true; + + system.stateVersion = "20.03"; +} diff --git a/tv/1systems/au/disks.nix b/tv/1systems/au/disks.nix new file mode 100644 index 000000000..434de1740 --- /dev/null +++ b/tv/1systems/au/disks.nix @@ -0,0 +1,19 @@ +{ + boot.initrd.luks.devices.main.device = "/dev/sda2"; + fileSystems."/" = { + device = "/dev/main/root"; + options = ["defaults" "noatime" "commit=60"]; + }; + fileSystems."/boot" = { + device = "/dev/sda1"; + options = ["defaults" "noatime"]; + }; + fileSystems."/bku" = { + device = "/dev/main/bku"; + options = ["defaults" "noatime"]; + }; + fileSystems."/home" = { + device = "/dev/main/home"; + options = ["defaults" "noatime" "commit=60"]; + }; +} diff --git a/tv/2configs/nets/hkw.nix b/tv/2configs/nets/hkw.nix index 725e63b13..c3acde1fb 100644 --- a/tv/2configs/nets/hkw.nix +++ b/tv/2configs/nets/hkw.nix @@ -2,6 +2,18 @@ krebs = { dns.providers.hkw = "hosts"; hosts = { + au = { + nets.hkw = { + ip4 = { + addr = "10.23.1.39"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "au.hkw" + ]; + ssh.port = 11423; + }; + }; nomic = { nets.hkw = { ip4 = { @@ -55,7 +67,7 @@ zu = { nets.hkw = { ip4 = { - addr = "10.23.1.39"; + addr = "10.23.1.40"; prefix = "10.23.1.0/24"; }; aliases = [ -- cgit v1.2.3