update all deps

This commit is contained in:
2025-12-02 11:18:49 -05:00
parent dfd4b364fd
commit b81a57ddb8
27 changed files with 533 additions and 449 deletions

View File

@@ -1,8 +1,14 @@
{ config, lib, inputs, ... }: let
{
config,
lib,
inputs,
...
}: let
utils = inputs.nixCats.utils;
in {
imports = [
inputs.nixCats.homeModule
../zk.nix
];
config = {
@@ -11,12 +17,20 @@ in {
};
nixCats = {
enable = true;
packageNames = [ "nvim" ];
packageNames = ["nvim"];
luaPath = ./.;
# for useage of this section, refer to :h nixCats.flake.outputs.categories
categoryDefinitions.replace = ({ pkgs, settings, categories, extra, name, mkPlugin, ... }@packageDef: {
categoryDefinitions.replace = {
pkgs,
settings,
categories,
extra,
name,
mkPlugin,
...
} @ packageDef: {
# lspsAndRuntimeDeps:
# this section is for dependencies that should be available
# at RUN TIME for plugins. Will be available to PATH within neovim terminal
@@ -27,6 +41,9 @@ in {
ripgrep
fzf
];
notes = with pkgs; [
zk
];
lua = with pkgs; [
lua-language-server
stylua
@@ -45,15 +62,13 @@ in {
go
];
typescript = with pkgs; [
typescript-language-server
vtsls
vscode-langservers-extracted
vue-language-server
stylelint-lsp
tailwindcss-language-server
];
yaml = with pkgs; [
yaml-language-server
gitlab-ci-ls
];
c = with pkgs; [
clang
@@ -90,6 +105,10 @@ in {
# not loaded automatically at startup.
# use with packadd and an autocommand in config to achieve lazy loading
optionalPlugins = {
notes = with pkgs.vimPlugins; [
zk-nvim
render-markdown-nvim
];
go = with pkgs.vimPlugins; [
nvim-dap-go
];
@@ -115,7 +134,7 @@ in {
# shared libraries to be added to LD_LIBRARY_PATH
# variable available to nvim runtime
sharedLibraries = {
general = with pkgs; [ ];
general = with pkgs; [];
};
# environmentVariables:
@@ -140,13 +159,17 @@ in {
# '' --set CATTESTVAR2 "It worked again!"''
# ];
};
});
};
# see :help nixCats.flake.outputs.packageDefinitions
packageDefinitions.replace = {
# These are the names of your packages
# you can include as many as you wish.
nvim = {pkgs, name, ... }: {
nvim = {
pkgs,
name,
...
}: {
# they contain a settings set defined above
# see :help nixCats.flake.outputs.settings
settings = {
@@ -166,6 +189,7 @@ in {
# and a set of categories that you want
categories = {
general = true;
notes = true;
lua = true;
nix = true;
go = true;
@@ -178,7 +202,6 @@ in {
# anything else to pass and grab in lua with `nixCats.extra`
extra = {
nixdExtras.nixpkgs = ''import ${pkgs.path} {}'';
vueExtras.location = "${lib.getBin pkgs.vue-language-server}/lib/node_modules/@vue/language-server";
};
};
};

View File

@@ -582,6 +582,39 @@ require('lze').load {
vim.keymap.set("n", "<leader>k", function() harpoon:list():prev() end)
vim.keymap.set("n", "<leader>j", function() harpoon:list():next() end)
end
},
{
"zk-nvim",
enabled = nixCats('notes') or false,
event = "DeferredUIEnter",
after = function ()
require("zk").setup({
picker = "snacks_picker"
})
local opts = { noremap=true, silent=false }
-- Create a new note after asking for its title.
vim.api.nvim_set_keymap("n", "<leader>zn", "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>", opts)
-- Open notes.
vim.api.nvim_set_keymap("n", "<leader>zf", "<Cmd>ZkNotes { sort = { 'modified' } }<CR>", opts)
-- Open notes associated with the selected tags.
vim.api.nvim_set_keymap("n", "<leader>zt", "<Cmd>ZkTags<CR>", opts)
-- Search for the notes matching a given query.
vim.api.nvim_set_keymap("n", "<leader>zg", "<Cmd>ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }<CR>", opts)
-- Search for the notes matching the current visual selection.
vim.api.nvim_set_keymap("v", "<leader>zm", ":'<,'>ZkMatch<CR>", opts)
end
},
{
"render-markdown.nvim",
enabled = nixCats('notes') or false,
ft = "markdown",
after = function ()
require('render-markdown').setup({})
end
}
}
@@ -687,21 +720,9 @@ require('lze').load {
-- also these are regular specs and you can use before and after and all the other normal fields
},
{
"ts_ls",
"vtsls",
enabled = nixCats('typescript') or false,
lsp = {
on_attach = lsp_on_attach,
filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx", "vue" },
init_options = {
plugins = {
{
name = "@vue/typescript-plugin",
languages = { "vue" },
location = nixCats.extra("vueExtras.location"),
},
},
},
},
lsp = {},
},
{
"eslint",
@@ -723,11 +744,6 @@ require('lze').load {
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"gitlab_ci_ls",
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"clangd",
enabled = nixCats('c') or false,