fix(zed): support preexisting JSON5 settings (#7317)
Zed uses JSON5 for settings files. JQ doesn't understand that format and fails if found, when merging with preexisting settings. Here I add a conversion step that converts JSON5 to JSON before handling the contents to JQ. Besides, I changed the arguments in the jq function, so instead of using `[0]` and `[1]`, we now use `$dynamic` and `$static` respectively. This should make scripts more readable. Fixes https://github.com/nix-community/home-manager/issues/7247 Fixes https://github.com/nix-community/home-manager/issues/7226
This commit is contained in:
parent
951f0b30c5
commit
ff31a4677c
3 changed files with 14 additions and 5 deletions
|
|
@ -30,6 +30,7 @@
|
|||
let
|
||||
preexistingKeymaps = builtins.toFile "preexisting.json" ''
|
||||
[
|
||||
// Things changed interactively
|
||||
{
|
||||
"bindings": {
|
||||
"down": "menu::SelectNext"
|
||||
|
|
@ -41,12 +42,14 @@
|
|||
},
|
||||
"context": "Terminal"
|
||||
},
|
||||
|
||||
/* Manually changed */
|
||||
{
|
||||
"bindings": {
|
||||
"enter": "newline"
|
||||
},
|
||||
"context": "Editor"
|
||||
}
|
||||
"context": "Editor",
|
||||
},
|
||||
]
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,10 @@
|
|||
let
|
||||
preexistingSettings = builtins.toFile "preexisting.json" ''
|
||||
{
|
||||
// I chose this theme interactively
|
||||
"theme": "Default",
|
||||
|
||||
/* I change AI settings interactively */
|
||||
"features": {
|
||||
"copilot": true,
|
||||
"ai_assist": true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue