Merge branch 'main' into main

This commit is contained in:
dmitriiStepanidenko 2025-04-18 07:41:55 +03:00 committed by GitHub
commit ff0b8c0a79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 10 deletions

View file

@ -37,7 +37,7 @@ jobs:
uses: DeterminateSystems/nix-installer-action@main uses: DeterminateSystems/nix-installer-action@main
- name: Check formatting via Alejandra - name: Check formatting via Alejandra
run: nix run nixpkgs#alejandra -- -c . run: nix run nixpkgs#alejandra -- --check . --exclude npins
check-typos: check-typos:
name: "Check source tree for typos" name: "Check source tree for typos"

View file

@ -329,6 +329,12 @@
- Fix namespace of python-lsp-server by changing it to python3Packages - Fix namespace of python-lsp-server by changing it to python3Packages
[dmitriiStepanidenko](https://github.com/dmitriiStepanidenko): [dmitriiStepanidenko](https://github.com/dmitriiStepanidenko):
- Add graphql LSP and formatter suport via prettier. - Add graphql LSP and formatter suport via prettier.
[Noah765](https://github.com/Noah765):
- Add missing `flutter-tools.nvim` dependency `plenary.nvim`.

6
flake.lock generated
View file

@ -38,11 +38,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1744497692, "lastModified": 1744592022,
"narHash": "sha256-ikWRNR/P/aKCCySZnUfF1W0u0t6rSoJgQgKeDdCBAK8=", "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "c5322a2bf74c0066fd15ca35721561397a2e7eab", "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -9,7 +9,6 @@
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
startPlugins = ["gitlinker-nvim"];
lazy.plugins = { lazy.plugins = {
"gitlinker-nvim" = { "gitlinker-nvim" = {
package = "gitlinker-nvim"; package = "gitlinker-nvim";

View file

@ -134,10 +134,14 @@ in {
}) })
(mkIf ftcfg.enable { (mkIf ftcfg.enable {
vim.startPlugins = vim.startPlugins = [
(
if ftcfg.enableNoResolvePatch if ftcfg.enableNoResolvePatch
then ["flutter-tools-patched"] then "flutter-tools-patched"
else ["flutter-tools-nvim"]; else "flutter-tools-nvim"
)
"plenary-nvim"
];
vim.pluginRC.flutter-tools = entryAnywhere '' vim.pluginRC.flutter-tools = entryAnywhere ''
require('flutter-tools').setup { require('flutter-tools').setup {

View file

@ -98,7 +98,9 @@ builtins.mapAttrs
Channel = getZip; Channel = getZip;
Tarball = getUrl; Tarball = getUrl;
} }
.${spec.type} .${
spec.type
}
or (builtins.throw "Unknown source type ${spec.type}"); or (builtins.throw "Unknown source type ${spec.type}");
in in
spec // {outPath = mayOverride (func spec);} spec // {outPath = mayOverride (func spec);}