Compare commits

..

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

4 changed files with 17 additions and 18 deletions

18
flake.lock generated
View file

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

View file

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

View file

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

View file

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