1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00

Use zls master

This commit is contained in:
RGBCube 2023-12-09 00:12:18 +03:00
parent ca93914ab0
commit c5233152cf
No known key found for this signature in database
3 changed files with 154 additions and 4 deletions

147
flake.lock generated
View file

@ -85,6 +85,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656065134, "lastModified": 1656065134,
@ -148,6 +164,39 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": { "ghostty": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -209,6 +258,27 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": {
"inputs": {
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1694102001,
"narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"homeManager": { "homeManager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -306,6 +376,18 @@
"url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in"
} }
}, },
"langref_2": {
"flake": false,
"locked": {
"narHash": "sha256-mYdDCBdNEIeMbavdhSo8qXqW+3fqPC8BAich7W3umrI=",
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in"
}
},
"libgit2": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -531,7 +613,8 @@
"nixSuper": "nixSuper", "nixSuper": "nixSuper",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"themes": "themes", "themes": "themes",
"tools": "tools" "tools": "tools",
"zls": "zls"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -581,6 +664,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"themes": { "themes": {
"locked": { "locked": {
"lastModified": 1701927129, "lastModified": 1701927129,
@ -708,6 +806,53 @@
"type": "github" "type": "github"
} }
}, },
"zig-overlay_2": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1701390337,
"narHash": "sha256-C+Lyio+GPl3B2IAZ6Nk5hAAE2g6a8bO9vMACUfOLC/g=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "1815ef2d0451b1121a6a91051da84906fcb06f99",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_5",
"gitignore": "gitignore_2",
"langref": "langref_2",
"nixpkgs": [
"nixpkgs"
],
"zig-overlay": "zig-overlay_2"
},
"locked": {
"lastModified": 1701900945,
"narHash": "sha256-2pzwA0N2FRaWvApuNd32asa9UCaUY7N3MU1WLj9wZ3Q=",
"owner": "zigtools",
"repo": "zls",
"rev": "287156eb15f468d6880169b61bbf89c8ae586df6",
"type": "github"
},
"original": {
"owner": "zigtools",
"repo": "zls",
"type": "github"
}
},
"zls-master": { "zls-master": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",

View file

@ -81,6 +81,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zls = {
url = "github:zigtools/zls";
inputs.nixpkgs.follows = "nixpkgs";
};
tools = { tools = {
url = "github:RGBCube/FlakeTools"; url = "github:RGBCube/FlakeTools";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -106,7 +111,7 @@
upkgs = tools.recursiveUpdateMap (name: { upkgs = tools.recursiveUpdateMap (name: {
${name} = inputs.${name}.packages.${system}.default; ${name} = inputs.${name}.packages.${system}.default;
}) [ "nixSuper" "hyprland" "hyprpicker" "ghostty" ]; }) [ "nixSuper" "hyprland" "hyprpicker" "ghostty" "zls" ];
lib = nixpkgs.lib; lib = nixpkgs.lib;

View file

@ -1,4 +1,4 @@
{ lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate { lib, pkgs, upkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate
(homeConfiguration [ "nixos" "root" ] { (homeConfiguration [ "nixos" "root" ] {
programs.nushell.environmentVariables.EDITOR = "hx"; programs.nushell.environmentVariables.EDITOR = "hx";
@ -75,5 +75,5 @@
rust-analyzer rust-analyzer
# ZIG # ZIG
zls upkgs.zls
]) ])