From 99c04622ff3a9f79fc09fb0fbe2faa0dfe93dd78 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 2 Jul 2020 19:50:00 +0200 Subject: krops: 1.22.1 -> 1.23.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 3e731035e..5ea125514 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 3e731035ed44659624e6d00bbb35570f2b8811fd +Subproject commit 5ea125514e48c630120fbb6a44e9ae0c7932a123 -- cgit v1.2.3 From 495871f182ff27dbd6f00b053f729f7a40c570c9 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 3 Jul 2020 21:36:51 +0200 Subject: tv x220: fix jumpy touchpad --- tv/2configs/hw/x220.nix | 9 +++++++++ 1 file changed, 9 insertions(+) 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 = [ -- cgit v1.2.3 From e26705c2deb776ff00a9963e8834fe26572db1f7 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 7 Jul 2020 22:08:48 +0200 Subject: git: support smart HTTP transport --- krebs/3modules/git.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 895d9b3b6..b2d2ec6cc 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -452,6 +452,16 @@ let fastcgi_param HTTP_HOST $server_name; fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; ''; + # Smart HTTP transport. Regex based on. + # https://github.com/git/git/blob/v2.27.0/http-backend.c#L708-L721 + locations.''~ "^/[0-9A-Za-z._-]+/(HEAD|info/refs|objects/info/(alternates|http-alternates|packs)|[0-9a-f]{2}/([0-9a-f]{38}|[0-9a-f]{62})|pack/pack-([0-9a-f]{40}|[0-9a-f]{64})\.(pack|idx)|git-upload-pack|git-receive-pack)$"''.extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_param GIT_HTTP_EXPORT_ALL ""; + fastcgi_param GIT_PROJECT_ROOT ${cfg.dataDir}; + fastcgi_param PATH_INFO $fastcgi_script_name; + fastcgi_param SCRIPT_FILENAME ${pkgs.git}/bin/git-http-backend; + fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + ''; locations."/static/".extraConfig = '' root ${pkgs.cgit}/cgit; rewrite ^/static(/.*)$ $1 break; -- cgit v1.2.3 From 6d769b73b4954d6bd215b00e5674eb41a034f57c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Jul 2020 09:46:19 +0200 Subject: krebs git: use " instead of '' --- krebs/3modules/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index b2d2ec6cc..3b941b48d 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -454,7 +454,7 @@ let ''; # Smart HTTP transport. Regex based on. # https://github.com/git/git/blob/v2.27.0/http-backend.c#L708-L721 - locations.''~ "^/[0-9A-Za-z._-]+/(HEAD|info/refs|objects/info/(alternates|http-alternates|packs)|[0-9a-f]{2}/([0-9a-f]{38}|[0-9a-f]{62})|pack/pack-([0-9a-f]{40}|[0-9a-f]{64})\.(pack|idx)|git-upload-pack|git-receive-pack)$"''.extraConfig = '' + locations."~ \"^/[0-9A-Za-z._-]+/(HEAD|info/refs|objects/info/(alternates|http-alternates|packs)|[0-9a-f]{2}/([0-9a-f]{38}|[0-9a-f]{62})|pack/pack-([0-9a-f]{40}|[0-9a-f]{64})\\.(pack|idx)|git-upload-pack|git-receive-pack)$\"".extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GIT_HTTP_EXPORT_ALL ""; fastcgi_param GIT_PROJECT_ROOT ${cfg.dataDir}; -- cgit v1.2.3 From edc62dfabc8a55b240fe467ade1bbc650f6df6e0 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Jul 2020 10:51:06 +0200 Subject: krebs.git.cgit.settings += source-filter --- krebs/3modules/git.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 3b941b48d..4eb881341 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -186,6 +186,12 @@ let type = types.nullOr types.str; default = null; }; + source-filter = mkOption { + type = types.nullOr types.absolute-pathname; + default = null; + example = literalExample + "\${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; + }; virtual-root = mkOption { type = types.nullOr types.absolute-pathname; default = "/"; -- cgit v1.2.3 From 53f52bb1b49894e62447f722faaf864b3a819215 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Jul 2020 11:39:02 +0200 Subject: tv cgit: enable syntax highlighting --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 95ab75b3d..10bfb507d 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -22,6 +22,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; -- cgit v1.2.3 From 2e26408bfecf27bc70f7b4955c499029bccfa9f4 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Jul 2020 11:39:42 +0200 Subject: tv cgit: use algol_nu highlighting style --- tv/2configs/gitrepos.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 10bfb507d..59090c8e3 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -5,6 +5,29 @@ with import ; 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 = { -- cgit v1.2.3