Compare commits

..

4 Commits

Author SHA1 Message Date
Noah Masur
c7de16b14c
add prom scraping to victoriametrics
allows us to not run vmagent when running victoriametrics
2024-06-29 01:22:59 +00:00
Noah Masur
1d405e1828
format comments on lua file 2024-06-28 20:36:31 -04:00
Noah Masur
97f99a149e
revert toggleterm float opts
they stuck to the height of the terminal window at initial open, which
looked bad whenever it changed, especially if it increased.
2024-06-28 20:36:08 -04:00
Noah Masur
bc794f89bc
play with markview-nvim
neovim markdown plugin
2024-06-28 20:34:35 -04:00
7 changed files with 32 additions and 11 deletions

View File

@ -304,6 +304,22 @@
"type": "github" "type": "github"
} }
}, },
"markview-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1719592662,
"narHash": "sha256-E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ=",
"owner": "OXY2DEV",
"repo": "markview.nvim",
"rev": "f60219dce7283192d549f21847fcf8537bf6d260",
"type": "github"
},
"original": {
"owner": "OXY2DEV",
"repo": "markview.nvim",
"type": "github"
}
},
"nextcloud-cookbook": { "nextcloud-cookbook": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -570,6 +586,7 @@
"hmts-nvim-src": "hmts-nvim-src", "hmts-nvim-src": "hmts-nvim-src",
"home-manager": "home-manager", "home-manager": "home-manager",
"mac-app-util": "mac-app-util", "mac-app-util": "mac-app-util",
"markview-nvim-src": "markview-nvim-src",
"nextcloud-cookbook": "nextcloud-cookbook", "nextcloud-cookbook": "nextcloud-cookbook",
"nextcloud-external": "nextcloud-external", "nextcloud-external": "nextcloud-external",
"nextcloud-news": "nextcloud-news", "nextcloud-news": "nextcloud-news",

View File

@ -127,6 +127,10 @@
url = "github:mfussenegger/nvim-lint"; url = "github:mfussenegger/nvim-lint";
flake = false; flake = false;
}; };
markview-nvim-src = {
url = "github:OXY2DEV/markview.nvim";
flake = false;
};
# Tree-Sitter Grammars # Tree-Sitter Grammars
tree-sitter-bash = { tree-sitter-bash = {

View File

@ -10,7 +10,7 @@
pkgs.vimPlugins.vim-eunuch # File manipulation commands pkgs.vimPlugins.vim-eunuch # File manipulation commands
pkgs.vimPlugins.vim-fugitive # Git commands pkgs.vimPlugins.vim-fugitive # Git commands
pkgs.vimPlugins.vim-repeat # Better repeat using . pkgs.vimPlugins.vim-repeat # Better repeat using .
pkgs.vimPlugins.glow-nvim # Markdown preview popup pkgs.vimPlugins.markview-nvim # Markdown preview
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
pkgs.vimPlugins.which-key-nvim # Keybind helper pkgs.vimPlugins.which-key-nvim # Keybind helper
]; ];
@ -21,7 +21,7 @@
names = false; names = false;
}; };
}; };
setup.glow = { }; setup.markview = { };
setup.which-key = { }; setup.which-key = { };
vim.o = { vim.o = {

View File

@ -14,11 +14,6 @@
open_mapping = dsl.rawLua "[[<c-\\>]]"; open_mapping = dsl.rawLua "[[<c-\\>]]";
hide_numbers = true; hide_numbers = true;
direction = "float"; direction = "float";
float_opts = {
width = dsl.rawLua "vim.o.columns - 4";
height = dsl.rawLua "vim.o.lines - 4";
row = 0;
};
}; };
lua = '' lua = ''

View File

@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
key("n", "cq", ":cclose<CR>") key("n", "cq", ":cclose<CR>")
-- Other -- Other
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
key("n", "Y", "y$") --- Copy to end of line key("n", "Y", "y$") --- Copy to end of line
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
key("v", "D", "y'>gp") --- Duplicate selected key("v", "D", "y'>gp") --- Duplicate selected
key("x", "<Leader>p", '"_dP') --- Paste but keep register key("x", "<Leader>p", '"_dP') --- Paste but keep register

View File

@ -38,6 +38,10 @@ in
config = { config = {
services.victoriametrics.extraOptions = [
"-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
];
systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable { systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
description = "VictoriaMetrics basic auth proxy"; description = "VictoriaMetrics basic auth proxy";
after = [ "network.target" ]; after = [ "network.target" ];

View File

@ -38,5 +38,6 @@ in
base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src; base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src; baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src; hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
}; };
} }