dwinkl/nvimConfig
1
0
Fork 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-02-19 14:30:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

remove conflicting vim alias

Browse source
This commit is contained in:
Daniel Winkler 2026-01-30 16:57:40 +11:00
commit 43c6cb3fcd
6 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
.DS_Store .DS_Store
.direnv .direnv
*.R
.Rlibs

6
flake.lock generated
View file

@ -97,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769731670, "lastModified": 1769745458,
"narHash": "sha256-iHq0bwOsDI5IkJuxVsljdztZdVKIBb8yO0RBRMrco68=", "narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=",
"owner": "BirdeeHub", "owner": "BirdeeHub",
"repo": "nix-wrapper-modules", "repo": "nix-wrapper-modules",
"rev": "4622dd5ef8e152475fce48307d3bc77211249c6a", "rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -47,7 +47,7 @@
nix = true; nix = true;
optional = false; optional = false;
python = false; python = false;
r = true; r = false;
}; };
settings = { settings = {
@ -132,8 +132,8 @@
in { in {
default = nvimPkg; default = nvimPkg;
vv = nvimPkg; vv = nvimPkg;
vim = nvimPkg; #vim = nvimPkg;
nvim = nvimPkg; #nvim = nvimPkg;
} }
); );

2
modules/module/settings/core.nix
View file

@ -28,7 +28,7 @@
config.settings.dont_link = false; config.settings.dont_link = false;
# Create additional aliases for the binary # Create additional aliases for the binary
config.settings.aliases = [ "vim" ]; config.settings.aliases = [ "vvim" ];
# Enable wrapper handling of spec runtimeDeps (template pattern). # Enable wrapper handling of spec runtimeDeps (template pattern).
config.settings.autowrapRuntimeDeps = true; config.settings.autowrapRuntimeDeps = true;

2
overlays/r.nix
View file

@ -29,7 +29,7 @@
# Standard R packages used by default in rWrapper and quarto # Standard R packages used by default in rWrapper and quarto
reqPkgs = with rpkgs.rPackages; [ reqPkgs = with rpkgs.rPackages; [
languageserver # languageserver
]; ];
in { in {
inherit rpkgs; inherit rpkgs;

22
plugin/25_lsp.lua
View file

@ -15,17 +15,17 @@ now_if_args(function()
marksman = { marksman = {
filetypes = { "markdown", "markdown_inline", "codecompanion" }, filetypes = { "markdown", "markdown_inline", "codecompanion" },
}, },
r_language_server = { -- r_language_server = {
filetypes = { 'r', 'rmd', 'rmarkdown' }, -- filetypes = { 'r', 'rmd', 'rmarkdown' },
settings = { -- settings = {
['r_language_server'] = { -- ['r_language_server'] = {
lsp = { -- lsp = {
rich_documentation = true, -- rich_documentation = true,
enable = true, -- enable = true,
}, -- },
}, -- },
} -- }
}, -- },
julials = { julials = {
settings = { settings = {
julia = { julia = {