From bed32d5be8ee93743247c2b1b2beedc2f8fc95a6 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 22 Oct 2018 08:38:18 +0200 Subject: tv x220: add tp_smapi --- tv/2configs/hw/x220.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index e0a04e214..d04cf50f2 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -5,6 +5,12 @@ ../smartd.nix ]; + boot.extraModulePackages = [ + config.boot.kernelPackages.tp_smapi + ]; + + boot.kernelModules = [ "tp_smapi" ]; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; -- cgit v1.2.3 From 77be9b677d0be4222ad385a6508ff66dbcdf71c4 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 22 Oct 2018 08:49:26 +0200 Subject: tv x220: add tpacpi-bat --- tv/2configs/hw/x220.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index d04cf50f2..e91fd82c8 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -3,6 +3,19 @@ { imports = [ ../smartd.nix + { + boot.extraModulePackages = [ + config.boot.kernelPackages.acpi_call + ]; + + boot.kernelModules = [ + "acpi_call" + ]; + + environment.systemPackages = [ + pkgs.tpacpi-bat + ]; + } ]; boot.extraModulePackages = [ -- cgit v1.2.3 From 960e66201e35768e4439e59c8fe78b1976b914c4 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 23 Oct 2018 18:27:45 +0200 Subject: tv x220: add config argument --- tv/2configs/hw/x220.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index e91fd82c8..38a89cfc3 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: - +{ config, pkgs, ... }: { imports = [ ../smartd.nix -- cgit v1.2.3 From 2751c1c3adf1d3140ae9b63bc399f998bb45cd1b Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 23 Oct 2018 19:26:37 +0200 Subject: git-preview: add GIT_PREVIEW_MERGE_STRATEGY --- krebs/5pkgs/simple/git-preview/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix index 77826f34b..da1525072 100644 --- a/krebs/5pkgs/simple/git-preview/default.nix +++ b/krebs/5pkgs/simple/git-preview/default.nix @@ -9,7 +9,11 @@ writeDashBin "git-preview" '' preview_name=$(${coreutils}/bin/basename "$preview_dir") ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit" - ${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit" + ${git}/bin/git -C "$preview_dir" merge \ + ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \ + -m "$merge_message" \ + -q \ + "$merge_commit" ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" ${coreutils}/bin/rm -fR "$preview_dir" ${coreutils}/bin/rm -R .git/worktrees/"$preview_name" -- cgit v1.2.3 From 34e1f09bf5e233bee78ee63166d2a1d9944a51f9 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 27 Oct 2018 14:50:28 +0200 Subject: nix-writers: 3.0.0 -> 3.2.0 --- submodules/nix-writers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/nix-writers b/submodules/nix-writers index c27a9416e..fc8a3802a 160000 --- a/submodules/nix-writers +++ b/submodules/nix-writers @@ -1 +1 @@ -Subproject commit c27a9416e8ee04d708b11b48f8cf1a055c0cc079 +Subproject commit fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1 -- cgit v1.2.3 From 228d4acd7b17afb245627f62f8943f418fb1dd8d Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 30 Oct 2018 19:26:02 +0100 Subject: l: adopt kruck.r (palo) --- krebs/3modules/lass/default.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 6b4dc3f17..4d382cfd3 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -338,6 +338,35 @@ with import ; }; }; }; + kruck = { + monitoring = false; + ci = false; + external = true; + nets = { + retiolum = { + ip4.addr = "10.243.29.201"; + ip6.addr = "42:4234:6a6d:600::1"; + aliases = [ + "kruck.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAxcui2sirT5YY9HrSauj9nSF3AxUnfd2CCEGyzmzbi5+qw8T9jdNh + QcIG3s+eC3uEy6leL/eeR4NjVtQRt8CDmhGul95Vs3I1jx9gdvYR+HOatPgK0YQA + EFwk0jv8Z8tOc87X1qwA00Gb+25+kAzsf+8+4HQuh/szSGje3RBmBFkUyNHh8R0U + uzs8NSTRdN+edvYtzjnYcE1sq59HFBPkVcJNp5I3qYTp6m9SxGHMvsq6vRpNnjq/ + /RZVBhnPDBlgxia/aVfVQKeEOHZV3svLvsJzGDrUWsJCEvF0YwW4bvohY19myTNR + 9lXo/VFx86qAkY09il2OloE7iu5cA2RV+FWwLeajE9vIDA06AD7nECVgthNoZd1s + qsDfuu3WqlpyBmr6XhRkYOFFE4xVLrZ0vItGYlgR2UPp9TjHrzfsedoyJoJAbhMH + gDlFgiHlAy1fhG1sCX5883XmSjWn0eJwmZ2O9sZNBP5dxfGUXg/x8NWfQj7E1lqj + jQ59UC6yiz7bFtObKvpdn1D4tPbqBvndZzn19U/3wKo+cCBRjtLmUD7HQHC65dCs + fAiCFvUTVMM3SNDvYChm0U/KGjZZFwQ+cCLj1JNVPet2C+CJ0qI2muXOnCuv/0o5 + TBZrrHMpj6Th8AiOgeMVuxzjX1FsmAThWj9Qp/jQu6O0qvnkUNaU7I8CAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; turingmachine = { monitoring = false; ci = false; -- cgit v1.2.3