Merge remote-tracking branch 'ni/master'

krebs/3modules/secret.nix

@@ -27,7 +27,6 @@ in {
     systemd.services =
       mapAttrs'
         (name: file: nameValuePair "secret-trigger-${systemd.encodeName name}" {
-          wantedBy = ["multi-user.target"];
           serviceConfig = {
             Type = "oneshot";
             ExecStart = "${pkgs.systemd}/bin/systemctl restart ${shell.escape file.service}";

tv/2configs/vim.nix

@@ -25,6 +25,7 @@ let {
     pkgs.tv.vimPlugins.vim
     pkgs.vimPlugins.fzfWrapper
     pkgs.vimPlugins.undotree
+    pkgs.vimPlugins.vim-nftables
   ];
 
   dirs = {

tv/5pkgs/vim/nix.nix

@@ -136,6 +136,7 @@ with import <stockholm/lib>;
       javascript.extraStart = comment "js";
       lua = {};
       markdown.extraStart = writerExt "md";
+      nftables = {};
       #nginx = {};
       python.extraStart = alts [
         (comment "py")