diff options
| author | makefu <github@syntax-fehler.de> | 2020-07-13 11:43:34 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-07-13 11:43:34 +0200 |
| commit | cf87c49f2cc5fc36f5b011d627df38443fe419f7 (patch) | |
| tree | 5f6d721b5fee6f29d2155a4d922f1e2b9dda1c9e /tv | |
| parent | 48b953d8118c0d4dbe214e4ef6e3d923b356accf (diff) | |
| parent | 2e26408bfecf27bc70f7b4955c499029bccfa9f4 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/gitrepos.nix | 24 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 9 |
2 files changed, 33 insertions, 0 deletions
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 95ab75b3d..59090c8e3 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -5,6 +5,29 @@ with import <stockholm/lib>; let { body = { + + nixpkgs.config.packageOverrides = super: { + cgit = pkgs.symlinkJoin { + name = "${super.cgit.name}-tv"; + paths = [ + (pkgs.runCommand "${super.cgit.name}-tv-overrides" { + } /* sh */ '' + mkdir -p $out/lib/cgit/filters + cd $out/lib/cgit/filters + cp \ + ${super.cgit}/lib/cgit/filters/syntax-highlighting.py \ + ${super.cgit}/lib/cgit/filters/.syntax-highlighting.py-wrapped \ + . + sed -i "s:${super.cgit}:$out:" syntax-highlighting.py + sed -i ' + s:^\(formatter =\).*:\1 HtmlFormatter(style="algol_nu"): + ' .syntax-highlighting.py-wrapped + '') + super.cgit + ]; + }; + }; + krebs.git = { enable = true; cgit = { @@ -22,6 +45,7 @@ let { ]; root-desc = "mostly krebs"; root-title = "repositories at ${config.krebs.build.host.name}"; + source-filter = "${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; }; }; repos = repos; diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index 699b4a87e..61b475537 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -15,6 +15,15 @@ pkgs.tpacpi-bat ]; } + + # fix jumpy touchpad + # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X220#X220_Touchpad_cursor_jump/imprecise + { + services.udev.extraHwdb = /* sh */ '' + touchpad:i8042:* + LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81=1 + ''; + } ]; boot.extraModulePackages = [ |