Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2021-12-21 16:45:56 +01:00
commit 8f94e0bc4b
3 changed files with 2 additions and 1 deletions

View File

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

View File

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

View File

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