jana/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lix/cachix

Browse source
This commit is contained in:
Jana Dönszelmann 2025-02-09 13:34:47 +01:00
parent 9fe35e28a4
commit 3c758d5346
No known key found for this signature in database
8 changed files with 732 additions and 1040 deletions
Download patch file Download diff file Expand all files Collapse all files

39
programs/nvim/default.nix
View file

@ -130,26 +130,27 @@ in
require("render-markdown").setup {
latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text',
}
local lspconfig = require 'lspconfig'
local configs = require 'lspconfig.configs'
if not configs.foo_lsp then
configs.noteslsp = {
default_config = {
-- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'},
cmd = {'./noteslsp/target/debug/noteslsp'},
filetypes = {'markdown'},
root_dir = function(fname)
return lspconfig.util.find_git_ancestor(fname)
end,
settings = {}
,
},
}
end
lspconfig.noteslsp.setup{}
''
# local lspconfig = require 'lspconfig'
# local configs = require 'lspconfig.configs'
# if not configs.foo_lsp then
# configs.noteslsp = {
# default_config = {
# -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'},
# cmd = {'./noteslsp/target/debug/noteslsp'},
# filetypes = {'markdown'},
# root_dir = function(fname)
# return lspconfig.util.find_git_ancestor(fname)
# end,
# settings = {}
# ,
# },
# }
# end
#
# lspconfig.noteslsp.setup{}
# ''
+ (builtins.readFile ./config.lua);
};

78
programs/nvim/plugins.nix
View file

@ -163,7 +163,7 @@ in
lsp-format.enable = true;
fugitive.enable = false;
lspkind.enable = true;
crates-nvim.enable = true;
crates.enable = true;
fidget.enable = true;
cmp.enable = true;
nvim-autopairs.enable = true;
@ -257,36 +257,36 @@ in
};
};
# git-conflict = {
# enable = true;
# settings = {
# default_mappings = {
# both = "<leader>cb";
# none = "<leader>c0";
# ours = "<leader>co";
# prev = "]x";
# next = "[x";
# theirs = "<leader>ct";
# };
# disable_diagnostics = false;
# highlights = {
# current = "DiffText";
# incoming = "DiffAdd";
# };
# list_opener = "conflicts";
# };
# };
# gitsigns = {
# enable = true;
#
# settings = {
# current_line_blame = true;
# current_line_blame_opts = {
# virt_text = true;
# virt_text_pos = "eol";
# };
# };
# };
git-conflict = {
enable = true;
settings = {
default_mappings = {
both = "<leader>cb";
none = "<leader>c0";
ours = "<leader>co";
prev = "]x";
next = "[x";
theirs = "<leader>ct";
};
disable_diagnostics = false;
highlights = {
current = "DiffText";
incoming = "DiffAdd";
};
list_opener = "conflicts";
};
};
gitsigns = {
enable = true;
settings = {
current_line_blame = true;
current_line_blame_opts = {
virt_text = true;
virt_text_pos = "eol";
};
};
};
lspsaga = {
enable = true;
@ -322,10 +322,10 @@ in
rust-analyzer = {
inlayHints = {
lifetimeElisionHints.enable = "always";
expressionAdjustmentHints = {
enable = "always";
mode = "prefer_postfix";
};
# expressionAdjustmentHints = {
# enable = "always";
# mode = "prefer_postfix";
# };
discriminantHints.enable = "always";
};
# check = {
@ -567,9 +567,11 @@ in
floaterm = {
enable = true;
opener = "edit";
width = 0.8;
height = 0.8;
settings = {
opener = "edit";
width = 0.8;
height = 0.8;
};
};
telescope = {
enable = true;