summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-12-21 16:45:56 +0100
committerlassulus <lassulus@lassul.us>2021-12-21 16:45:56 +0100
commit8f94e0bc4b38dd7f3ef90e727542c905e7728125 (patch)
tree304fd7b745320de0a169f69c1298fbaa6ea3b554
parent0a7d779cc1823ea0f62813211ac792016cbed81c (diff)
parente888b00a6bd600fedbd58c06934af8d5deeb35a2 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/3modules/secret.nix1
-rw-r--r--tv/2configs/vim.nix1
-rw-r--r--tv/5pkgs/vim/nix.nix1
3 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/secret.nix b/krebs/3modules/secret.nix
index 978939f69..0c5e1cdcd 100644
--- a/krebs/3modules/secret.nix
+++ b/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}";
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index c0125ecfa..fed74c921 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -25,6 +25,7 @@ let {
pkgs.tv.vimPlugins.vim
pkgs.vimPlugins.fzfWrapper
pkgs.vimPlugins.undotree
+ pkgs.vimPlugins.vim-nftables
];
dirs = {
diff --git a/tv/5pkgs/vim/nix.nix b/tv/5pkgs/vim/nix.nix
index c121d815f..6715af737 100644
--- a/tv/5pkgs/vim/nix.nix
+++ b/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")