dwinkl/nvimConfig
1
0
Fork 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-05-22 20:13:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: dwinkl:ad9473a9166fc7e220449c9fd7625f8c52e05423
Branches Tags
dwinkl:main
dwinkl:copilot/fix-quarto-functionality-with-r
..
compare: dwinkl:8811591fe0eabed342283e897bc25536a67fdca4
Branches Tags
dwinkl:main
dwinkl:copilot/fix-quarto-functionality-with-r

No commits in common. "ad9473a9166fc7e220449c9fd7625f8c52e05423" and "8811591fe0eabed342283e897bc25536a67fdca4" have entirely different histories.
ad9473a916 ... 8811591fe0

4 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1778443072,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778684156, "lastModified": 1778683425,
"narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=", "narHash": "sha256-bY44RR+7q+8R8PDNWbavFEcpSKiBvWyoWHI7iSLvsQc=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "r_nvim_nix", "repo": "r_nvim_nix",
"rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82", "rev": "e54fb57802fa9eca81024762f397ec7caa446842",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779145538, "lastModified": 1778662548,
"narHash": "sha256-j2RQqBLYhPuddU6C8n5hGKboXq1tDLCZ7bWe5/LgTHM=", "narHash": "sha256-e6XKnrzKr48r1UdCr+5bekibSqe2L1/Sgi46IODHtGQ=",
"owner": "BirdeeHub", "owner": "BirdeeHub",
"repo": "nix-wrapper-modules", "repo": "nix-wrapper-modules",
"rev": "597b35c93dd0ab0ae38758e3193582b2fd259aa1", "rev": "46e7c1e3f0e149b28f539eb8601152db8a67ad0c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -105,7 +105,7 @@
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs systems;
extra_pkg_config = { extra_pkg_config = {
allowUnfree = true; # allowUnfree = true;
}; };
overlayDefs = import ./overlays inputs; overlayDefs = import ./overlays inputs;

7
modules/module/specs/plugins.nix
View file

@ -3,7 +3,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
config.specs.gitPlugins = { config.specs.gitPlugins = {
data = [ ]; data = [ ];
}; };
@ -111,9 +112,7 @@
nvim-treesitter-context nvim-treesitter-context
nvim-treesitter-textobjects nvim-treesitter-textobjects
{ {
data = pkgs.codecompanion-nvim.overrideAttrs (old: { data = pkgs.codecompanion-nvim;
doCheck = false;
});
pname = "codecompanion"; pname = "codecompanion";
} }
]; ];

4
plugin/25_lsp.lua
View file

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