diff options
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/hw/AO753.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/ppp.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/repo-sync/wiki.nix | 41 | ||||
| -rw-r--r-- | tv/2configs/vim.nix | 5 |
4 files changed, 52 insertions, 4 deletions
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 <stockholm/lib>; "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 ]; 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" '' 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 <stockholm/lib>; +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}; +} diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index f8d599f7e..c0125ecfa 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -72,7 +72,7 @@ let { set mouse=a set noruler set pastetoggle=<INS> - set runtimepath=$VIMRUNTIME,${extra-runtimepath} + set runtimepath=${extra-runtimepath},$VIMRUNTIME set shortmess+=I set showcmd set showmatch @@ -133,7 +133,8 @@ let { vnoremap u <nop> " fzf - nnoremap <esc>q :Files<cr> + nnoremap <esc>q :Buffers<cr> + nnoremap <esc>f :Files<cr> nnoremap <esc>w :Rg<cr> " edit alternate buffer |