mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-02-19 14:30:58 -05:00
remove conflicting vim alias
This commit is contained in:
parent
a142394bc8
commit
43c6cb3fcd
6 changed files with 21 additions and 19 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,2 +1,4 @@
|
|||
.DS_Store
|
||||
.direnv
|
||||
*.R
|
||||
.Rlibs
|
||||
|
|
|
|||
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -97,11 +97,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769731670,
|
||||
"narHash": "sha256-iHq0bwOsDI5IkJuxVsljdztZdVKIBb8yO0RBRMrco68=",
|
||||
"lastModified": 1769745458,
|
||||
"narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nix-wrapper-modules",
|
||||
"rev": "4622dd5ef8e152475fce48307d3bc77211249c6a",
|
||||
"rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
nix = true;
|
||||
optional = false;
|
||||
python = false;
|
||||
r = true;
|
||||
r = false;
|
||||
};
|
||||
|
||||
settings = {
|
||||
|
|
@ -132,8 +132,8 @@
|
|||
in {
|
||||
default = nvimPkg;
|
||||
vv = nvimPkg;
|
||||
vim = nvimPkg;
|
||||
nvim = nvimPkg;
|
||||
#vim = nvimPkg;
|
||||
#nvim = nvimPkg;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
config.settings.dont_link = false;
|
||||
|
||||
# Create additional aliases for the binary
|
||||
config.settings.aliases = [ "vim" ];
|
||||
config.settings.aliases = [ "vvim" ];
|
||||
|
||||
# Enable wrapper handling of spec runtimeDeps (template pattern).
|
||||
config.settings.autowrapRuntimeDeps = true;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
# Standard R packages used by default in rWrapper and quarto
|
||||
reqPkgs = with rpkgs.rPackages; [
|
||||
languageserver
|
||||
# languageserver
|
||||
];
|
||||
in {
|
||||
inherit rpkgs;
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@ now_if_args(function()
|
|||
marksman = {
|
||||
filetypes = { "markdown", "markdown_inline", "codecompanion" },
|
||||
},
|
||||
r_language_server = {
|
||||
filetypes = { 'r', 'rmd', 'rmarkdown' },
|
||||
settings = {
|
||||
['r_language_server'] = {
|
||||
lsp = {
|
||||
rich_documentation = true,
|
||||
enable = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
-- r_language_server = {
|
||||
-- filetypes = { 'r', 'rmd', 'rmarkdown' },
|
||||
-- settings = {
|
||||
-- ['r_language_server'] = {
|
||||
-- lsp = {
|
||||
-- rich_documentation = true,
|
||||
-- enable = true,
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
-- },
|
||||
julials = {
|
||||
settings = {
|
||||
julia = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue