From 9f66fcc63a2d1dba5598e17d7b25ba4df53988cf Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 6 Oct 2018 19:32:25 +0200
Subject: force xserver values

---
 tv/2configs/xserver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 6ef8a8768..e33b431da 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -42,8 +42,8 @@ in {
     desktopManager.session = mkForce [];
 
     enable = true;
-    display = 11;
-    tty = 11;
+    display = mkForce 11;
+    tty = mkForce 11;
 
     synaptics = {
       enable = true;
-- 
cgit v1.2.3


From dee4da76caf04cc80ba7b60d75451c581bc053f1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Oct 2018 16:37:06 +0200
Subject: tv: systemPackages += git-crypt

---
 tv/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 2ccab3d09..d9ddc90d0 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -143,6 +143,7 @@ with import <stockholm/lib>;
       environment.systemPackages = [
         pkgs.get
         pkgs.git
+        pkgs.git-crypt
         pkgs.git-preview
         pkgs.hashPassword
         pkgs.htop
-- 
cgit v1.2.3


From ebf3fe9e21dcdbb03fb7e739c10ff087f7646cad Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 9 Oct 2018 09:35:35 +0200
Subject: tv vim: add vim-elixir

---
 tv/2configs/vim.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 400d179d0..2ac7f7518 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -15,6 +15,7 @@ let {
 
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
     pkgs.vimPlugins.undotree
+    pkgs.vimPlugins.vim-elixir
     (pkgs.vimUtils.buildVimPlugin {
       name = "vim-syntax-jq";
       src = pkgs.fetchgit {
-- 
cgit v1.2.3


From 84e8732832fb21e248b100b53c0d5d7df45d0d91 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Tue, 9 Oct 2018 13:48:52 +0200
Subject: force test in krops.nix

---
 tv/krops.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/krops.nix b/tv/krops.nix
index 231486ab7..e922630f7 100644
--- a/tv/krops.nix
+++ b/tv/krops.nix
@@ -16,6 +16,7 @@
 
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
   test = { target }: pkgs.krops.writeTest "tv-krops-${name}-ci" {
+    force = true;
     inherit source target;
   };
 
-- 
cgit v1.2.3


From 58200bf7075eeef5ab1979f1da6729fa7bbf41dd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Oct 2018 11:33:03 +0200
Subject: tv gitrepos: use proper post-receive default

---
 tv/2configs/gitrepos.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index a8cbe0f1c..62c90d4e9 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -153,7 +153,7 @@ let {
     public = false;
     hooks = hooks // {
       post-receive = /* sh */ ''
-        (${hooks.post-receive or ""})
+        (${hooks.post-receive or ":"})
         ${cgit-clear-cache}/bin/cgit-clear-cache
       '';
     };
-- 
cgit v1.2.3


From bed32d5be8ee93743247c2b1b2beedc2f8fc95a6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
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(+)

(limited to 'tv')

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 <tv@krebsco.de>
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(+)

(limited to 'tv')

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 <tv@krebsco.de>
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(-)

(limited to 'tv')

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