From e2ed72a7802b0620bb1388a901b34e5a5fdc8a26 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 19 Jan 2021 01:19:51 +0100 Subject: tv repo-sync wiki: init --- tv/2configs/repo-sync/wiki.nix | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tv/2configs/repo-sync/wiki.nix (limited to 'tv') diff --git a/tv/2configs/repo-sync/wiki.nix b/tv/2configs/repo-sync/wiki.nix new file mode 100644 index 000000000..913439906 --- /dev/null +++ b/tv/2configs/repo-sync/wiki.nix @@ -0,0 +1,41 @@ +{ config, pkgs, ... }: let + lib = import ; +in { + krebs.repo-sync.enable = true; + krebs.repo-sync.repos.wiki.branches.hotdog = { + origin.url = "http://cgit.hotdog.r/wiki"; + mirror.url = "git@${config.krebs.build.host.name}.r:wiki"; + }; + krebs.git.repos.wiki = { + public = true; + name = "wiki"; + cgit.desc = toString [ + "mirror of" + config.krebs.repo-sync.repos.wiki.branches.hotdog.origin.url + ]; + cgit.section = "7. mirrors"; + hooks.post-receive = /* sh */ '' + ${pkgs.git-hooks.irc-announce { + channel = "#xxx"; + nick = config.krebs.build.host.name; + server = "irc.r"; + }} + ${pkgs.cgit-clear-cache.override { + inherit (config.krebs.git.cgit.settings) cache-root; + }}/bin/cgit-clear-cache + ''; + }; + krebs.git.rules = lib.singleton { + user = lib.singleton config.krebs.users.repo-sync; + repo = lib.singleton config.krebs.git.repos.wiki; + perm = lib.git.push "refs/*" [ + lib.git.create + lib.git.delete + lib.git.merge + lib.git.non-fast-forward + ]; + }; + krebs.users.${config.krebs.repo-sync.user.name}.pubkey = { + ni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINK9U0Ob9/O0kxg3trhZY/vDnbqfN+R5cASGiClRr4IM"; + }.${config.krebs.build.host.name}; +} -- cgit v1.2.3 From 88c6558935373fa7caf8730497d63894daef436d Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 22 Jan 2021 01:02:45 +0100 Subject: tv ppp: allow networkd --- tv/2configs/ppp.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix index ff61f943f..c801401b2 100644 --- a/tv/2configs/ppp.nix +++ b/tv/2configs/ppp.nix @@ -8,8 +8,10 @@ in { assertions = [ { - assertion = config.networking.resolvconf.enable; - message = "ppp configuration needs resolvconf"; + assertion = + config.networking.resolvconf.enable || + config.networking.useNetworkd; + message = "ppp configuration needs resolvconf or networkd"; } ]; environment.etc."ppp/ip-up".source = pkgs.writeDash "ppp.ip-up" '' -- cgit v1.2.3 From 429f25630b7bffe6ff0dca87f12ec783a135517a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 22 Jan 2021 20:39:25 +0100 Subject: tv vim: remap fzf keys --- tv/2configs/vim.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index f8d599f7e..4f961cd46 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -133,7 +133,8 @@ let { vnoremap u " fzf - nnoremap q :Files + nnoremap q :Buffers + nnoremap f :Files nnoremap w :Rg " edit alternate buffer -- cgit v1.2.3 From 6b68a4f5d8b61e91585b422a7b42f98ac6ec007f Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 24 Jan 2021 01:24:19 +0100 Subject: tv cr: use XDG_RUNTIME_DIR --- tv/5pkgs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index fd3d2f32a..cae5da112 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -13,13 +13,17 @@ foldl' mergeAttrs {} // { - # TODO use XDG_RUNTIME_DIR? cr = self.writeDashBin "cr" '' set -efu + if test -n "''${XDG_RUNTIME_DIR-}"; then + cache_dir=$XDG_RUNTIME_DIR/chromium-disk-cache + else + cache_dir=/tmp/chromium-disk-cache_$LOGNAME + fi export LC_TIME=de_DE.utf8 exec ${self.chromium}/bin/chromium \ --ssl-version-min=tls1 \ - --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \ + --disk-cache-dir="$cache_dir" \ --disk-cache-size=50000000 \ "$@" ''; -- cgit v1.2.3 From f6993b98450a703da75642ba2ca8cf05caf0c363 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 25 Jan 2021 03:09:50 +0100 Subject: tv AO753: use linux <5.9 because broadcom-sta --- tv/2configs/hw/AO753.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tv') diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index d5b755cef..a91a5e518 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -21,6 +21,10 @@ with import ; "wl" ]; + # broadcom_sta is marked as broken for 5.9+ + # pkgs.linuxPackages_latest ist 5.9 + boot.kernelPackages = pkgs.linuxPackages_5_8; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; -- cgit v1.2.3 From 0bee76d9092022d6dbb082516e8bdb42f7fcc8c8 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 26 Jan 2021 02:52:31 +0100 Subject: tv vim: prefer plugins to vim's own support files --- tv/2configs/vim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 4f961cd46..c0125ecfa 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -72,7 +72,7 @@ let { set mouse=a set noruler set pastetoggle= - set runtimepath=$VIMRUNTIME,${extra-runtimepath} + set runtimepath=${extra-runtimepath},$VIMRUNTIME set shortmess+=I set showcmd set showmatch -- cgit v1.2.3