Merge remote-tracking branch 'lassul.us/master'

5 files changed, 25 insertions, 5 deletions

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
       '';
     };
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index e0a04e214..38a89cfc3 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -1,10 +1,28 @@
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
 {
   imports = [
     ../smartd.nix
+    {
+      boot.extraModulePackages = [
+        config.boot.kernelPackages.acpi_call
+      ];
+
+      boot.kernelModules = [
+        "acpi_call"
+      ];
+
+      environment.systemPackages = [
+        pkgs.tpacpi-bat
+      ];
+    }
   ];
 
+  boot.extraModulePackages = [
+    config.boot.kernelPackages.tp_smapi
+  ];
+
+  boot.kernelModules = [ "tp_smapi" ];
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
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 {
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 892b7e3b8..dbfa804d2 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -45,8 +45,8 @@ in {
     displayManager.job.execCmd = mkForce "derp";
 
     enable = true;
-    display = 11;
-    tty = 11;
+    display = mkForce 11;
+    tty = mkForce 11;
 
     synaptics = {
       enable = true;
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;
   };