mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-08-22 17:43:13 -04:00
Compare commits
4 changed files with 11 additions and 46 deletions
|
|
@ -5,10 +5,10 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# Include packages from a category only if that category is enabled.
|
-- Include packages from a category only if that category is enabled.
|
||||||
# NOTE: Package list expressions are lazily evaluated, and derivations are
|
-- NOTE: The package list expression is still evaluated (packages in Nix are
|
||||||
# not built until needed, so keep side-effecting expressions out of these
|
-- lazy by default, so derivations are not built), so keep side-effecting
|
||||||
# lists.
|
-- expressions out of these lists.
|
||||||
maybe = cat: pkgsList:
|
maybe = cat: pkgsList:
|
||||||
lib.optionals (config.cats.${cat} or false) pkgsList;
|
lib.optionals (config.cats.${cat} or false) pkgsList;
|
||||||
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
|
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
|
||||||
|
|
@ -25,9 +25,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config.catPkgs = {
|
config.catPkgs = {
|
||||||
always = maybe "always" (with pkgs; [
|
always = maybe "always" (with pkgs; [ ]);
|
||||||
ripgrep
|
|
||||||
]);
|
|
||||||
|
|
||||||
clickhouse = maybe "clickhouse" (with pkgs; [ clickhouse-lts ]);
|
clickhouse = maybe "clickhouse" (with pkgs; [ clickhouse-lts ]);
|
||||||
|
|
||||||
|
|
@ -53,7 +51,7 @@ in
|
||||||
marksman
|
marksman
|
||||||
texlab
|
texlab
|
||||||
imagemagick
|
imagemagick
|
||||||
harper
|
luaPackages.magick
|
||||||
]);
|
]);
|
||||||
|
|
||||||
nix = maybe "nix" (with pkgs; [
|
nix = maybe "nix" (with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,7 @@
|
||||||
data_table
|
data_table
|
||||||
janitor
|
janitor
|
||||||
styler
|
styler
|
||||||
# vscDebugger is not on CRAN/Bioconductor, so it is not available in
|
vscDebugger
|
||||||
# pkgs.rpkgs.rPackages. Install it manually in your R library if you
|
|
||||||
# want to use the nvim-dap R adapter (see plugin/26_dap.lua).
|
|
||||||
# vscDebugger
|
|
||||||
lintr
|
lintr
|
||||||
])
|
])
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ let
|
||||||
"rnoweb"
|
"rnoweb"
|
||||||
"regex"
|
"regex"
|
||||||
"sql"
|
"sql"
|
||||||
|
"stata"
|
||||||
"toml"
|
"toml"
|
||||||
"vim"
|
"vim"
|
||||||
"vimdoc"
|
"vimdoc"
|
||||||
|
|
@ -189,9 +190,9 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Lazy-loaded plugins needed when the `r` cat is on. Kept separate from
|
-- Lazy-loaded plugins needed when the `r` cat is on. Kept separate from
|
||||||
# `utils-lazy` so users with `r=true` and `utils=false` still get the
|
-- `utils-lazy` so users with `r=true` and `utils=false` still get the
|
||||||
# nvim-dap R adapter and in-buffer image rendering for plots.
|
-- R debugger (via vscDebugger) and in-buffer image rendering for plots.
|
||||||
config.specs.r-lazy = lib.mkIf (config.cats.r or false) {
|
config.specs.r-lazy = lib.mkIf (config.cats.r or false) {
|
||||||
lazy = true;
|
lazy = true;
|
||||||
data = with pkgs.vimPlugins; [
|
data = with pkgs.vimPlugins; [
|
||||||
|
|
|
||||||
|
|
@ -17,37 +17,6 @@ now_if_args(function()
|
||||||
marksman = {
|
marksman = {
|
||||||
filetypes = { "markdown", "markdown_inline", "codecompanion" },
|
filetypes = { "markdown", "markdown_inline", "codecompanion" },
|
||||||
},
|
},
|
||||||
harper_ls = {
|
|
||||||
cmd = { "harper-ls", "--stdio" },
|
|
||||||
filetypes = { "markdown", "quarto", "text", "tex", "typst" },
|
|
||||||
root_markers = { ".git", ".harper" },
|
|
||||||
settings = {
|
|
||||||
["harper-ls"] = {
|
|
||||||
linters = {
|
|
||||||
SpellCheck = true,
|
|
||||||
SpelledNumbers = false,
|
|
||||||
AnA = true,
|
|
||||||
SentenceCapitalization = true,
|
|
||||||
UnclosedQuotes = true,
|
|
||||||
WrongApostrophe = false,
|
|
||||||
LongSentences = true,
|
|
||||||
RepeatedWords = true,
|
|
||||||
Spaces = true,
|
|
||||||
CorrectNumberSuffix = true,
|
|
||||||
},
|
|
||||||
codeActions = {
|
|
||||||
ForceStable = false,
|
|
||||||
},
|
|
||||||
markdown = {
|
|
||||||
IgnoreLinkTitle = false,
|
|
||||||
},
|
|
||||||
diagnosticSeverity = "hint",
|
|
||||||
isolateEnglish = false,
|
|
||||||
dialect = "American",
|
|
||||||
maxFileLength = 120000,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
nil_ls = {
|
nil_ls = {
|
||||||
settings = {
|
settings = {
|
||||||
["nil"] = {
|
["nil"] = {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue