From 32c59103f5315fb6160b1dd38df2c27647aaffdd Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Dec 2016 21:58:43 +0100 Subject: [PATCH 01/10] tv nixpkgs: 728a957 -> e360c72 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8852100e2..bd3633b11 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "728a9578e31a0f78f6ad07a3a2ec706ec5290f10"; + ref = "e360c7205f84be180d80b97f3980fb809a951486"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; From 2c7f303c9779b397085855e41623ba262a15f36b Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 3 Dec 2016 02:39:04 +0100 Subject: [PATCH 02/10] nomic: AO753 -> x220 --- tv/1systems/nomic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 7d6a1d682..fe1e1d68a 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -7,7 +7,7 @@ with import ; imports = [ ../. - ../2configs/hw/AO753.nix + ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix ../2configs/git.nix ../2configs/im.nix From e62dca94080a3475011c18cc2c4323eac2d56aea Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 3 Dec 2016 03:32:44 +0100 Subject: [PATCH 03/10] zu: define gg23 --- krebs/3modules/tv/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 3315dd157..d44c322aa 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -391,11 +391,13 @@ with import ; zu = { cores = 4; nets = { - #gg23 = { - # ip4.addr = ""; - # aliases = ["zu.gg23"]; - # ssh.port = 11423; - #}; + gg23 = { + ip4.addr = "10.23.1.39"; + aliases = [ + "zu.gg23" + ]; + ssh.port = 11423; + }; retiolum = { ip4.addr = "10.243.13.40"; ip6.addr = "42:0:0:0:0:0:0:1340"; From 8d18b86a014b06e3dd2b5d9dbea6dd78cbe056c4 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 3 Dec 2016 04:05:17 +0100 Subject: [PATCH 04/10] nomic: keep using grub --- tv/1systems/nomic.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index fe1e1d68a..5469fffd5 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -25,6 +25,16 @@ with import ; ]; }; + # Don't use UEFI because current disk was partitioned/formatted for AO753. + # TODO remove following bool.loader section after repartitioning/reformatting + boot.loader = { + grub = { + device = "/dev/sda"; + splashImage = null; + }; + systemd-boot.enable = mkForce false; + }; + fileSystems."/" = { device = "/dev/mapper/nomic1-root"; fsType = "btrfs"; From 36494605244b5c731299ad5854e6cde3d21fe3e7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 19:05:00 +0100 Subject: [PATCH 05/10] l 2 websites domsen: add domsen to download group --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 2a6df06ff..76e13412b 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -151,7 +151,7 @@ in { description = "maintenance acc for domsen"; home = "/home/domsen"; useDefaultShell = true; - extraGroups = [ "nginx" ]; + extraGroups = [ "nginx" "download" ]; createHome = true; }; From a4e9999dfe392ec4e447e8cd91b1a8f3a5d72a03 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 21:42:43 +0100 Subject: [PATCH 06/10] l 1 mors: import ircd --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9f2cec9a1..cd32571cf 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -25,6 +25,7 @@ with import ; ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/repo-sync.nix + ../2configs/ircd.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ From f2f62193907e400dd59046f5fb47858f685aa465 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 12 Dec 2016 21:48:10 +0100 Subject: [PATCH 07/10] l 2: remove teamviewer --- lass/1systems/mors.nix | 1 - lass/2configs/teamviewer.nix | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 lass/2configs/teamviewer.nix diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index cd32571cf..594f342db 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -18,7 +18,6 @@ with import ; ../2configs/wine.nix ../2configs/git.nix ../2configs/skype.nix - ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix deleted file mode 100644 index 87b6fbac3..000000000 --- a/lass/2configs/teamviewer.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import ; -{ - services.teamviewer.enable = true; -} From fd7fd72362ba50c8968a1b25f048d5a35c9ea71e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 14 Dec 2016 18:47:53 +0100 Subject: [PATCH 08/10] l 2 nixpkgs: 76f346d -> 953889b --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index fd331e90d..91733d30b 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; + ref = "953889b693dda8507df3677ff808420c3fdd7409"; }; } From 8661ad89a6ebbee0b3aac34db0aca6fe9d173f2e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 16 Dec 2016 17:09:37 +0100 Subject: [PATCH 09/10] tv nixpkgs: e360c72 -> 81428dd --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index bd3633b11..ea97b1957 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "e360c7205f84be180d80b97f3980fb809a951486"; + ref = "81428dd022c26764e9066d381ece90b1e88bd0d2"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; From 41517457742ac9425987d9763bc9c38102129fef Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Dec 2016 13:47:20 +0100 Subject: [PATCH 10/10] l 2 nixpkgs: 953889b -> 2a97e14 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 91733d30b..e2bdd5755 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "953889b693dda8507df3677ff808420c3fdd7409"; + ref = "2a97e149e50e1c701a957c6bd060cc74b7e9a905"; }; }