demenik/dots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix string escaption for external editor exec args

Browse Source
This commit is contained in:
demenik
2025-12-15 16:23:55 +01:00
parent 4dae59d8ec
commit 9afb160372
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
home/editors/godot.nix
View File

@@ -15,7 +15,7 @@
activation.configureGodot = let activation.configureGodot = let
configDir = "${config.xdg.configHome}/godot"; configDir = "${config.xdg.configHome}/godot";
execFlags = "--server ./.godothost --remote-send \\\"<C-\\\\><C-N>:n {file}<CR>{line}G{col}|\\\""; execFlags = pkgs.lib.escapeShellArg ''"--server ./.godothost --remote-send \":e {file} | call cursor({line},{col})<CR>\""'';
in in
lib.hm.dag.entryAfter ["writeBoundary"] lib.hm.dag.entryAfter ["writeBoundary"]
# bash # bash
@@ -36,8 +36,11 @@
local key="$1" local key="$1"
local value="$2" local value="$2"
local sed_value="''${value//\\/\\\\}"
sed_value="''${sed_value//&/\\&}"
if grep -q "^$key =" "$SETTINGS_FILE"; then if grep -q "^$key =" "$SETTINGS_FILE"; then
sed "s#^$key =.*#$key = $value#" "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp" && mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE" sed "s#^$key =.*#$key = $sed_value#" "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp" && mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE"
else else
if grep -q '\[resource\]' "$SETTINGS_FILE"; then if grep -q '\[resource\]' "$SETTINGS_FILE"; then
echo "$key = $value" >> "$SETTINGS_FILE" echo "$key = $value" >> "$SETTINGS_FILE"
@@ -48,7 +51,7 @@
# External editor (nvim) # External editor (nvim)
update_setting "text_editor/external/use_external_editor" "true" update_setting "text_editor/external/use_external_editor" "true"
update_setting "text_editor/external/exec_path" "\"${pkgs.neovim}/bin/nvim\"" update_setting "text_editor/external/exec_path" "\"${pkgs.neovim}/bin/nvim\""
update_setting "text_editor/external/exec_flags" "\"${execFlags}\"" update_setting "text_editor/external/exec_flags" ${execFlags}
# Catppuccin Mocha interface theme # Catppuccin Mocha interface theme
update_setting "interface/theme/preset" "\"Custom\"" update_setting "interface/theme/preset" "\"Custom\""