From 0c3c8154123ba9a17bc7e6bec00ab990e5dade70 Mon Sep 17 00:00:00 2001 From: ElKowar Date: Mon, 19 May 2025 18:13:39 +0200 Subject: [PATCH] Stuff --- eggs/gtk/.gitignore | 1 + eggs/niri/config.kdl | 2 - eggs/zed/keymap.json | 29 ++++++----- eggs/zed/settings.json | 51 ++++++++++---------- eggs/zed/settings_backup.json | 90 +++++++++++++++++++++++++++++++---- 5 files changed, 121 insertions(+), 52 deletions(-) create mode 100644 eggs/gtk/.gitignore diff --git a/eggs/gtk/.gitignore b/eggs/gtk/.gitignore new file mode 100644 index 0000000..9807e96 --- /dev/null +++ b/eggs/gtk/.gitignore @@ -0,0 +1 @@ +**/bookmarks diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl index c9483cd..5123fdd 100644 --- a/eggs/niri/config.kdl +++ b/eggs/niri/config.kdl @@ -451,8 +451,6 @@ binds { Mod+Ctrl+Alt+Shift+Y { spawn "niri" "msg" "action" "set-dynamic-cast-monitor"; } Mod+Ctrl+Y { spawn "niri" "msg" "action" "clear-dynamic-cast-target"; } - Mod+Escape { spawn "niri" "msg" "action" "toggle-overview"; } - Mod+Shift+E { quit; } Mod+Escape { toggle-overview; } } diff --git a/eggs/zed/keymap.json b/eggs/zed/keymap.json index 9fd3dca..cdb8119 100644 --- a/eggs/zed/keymap.json +++ b/eggs/zed/keymap.json @@ -33,13 +33,15 @@ } }, { - "context": "EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu", + "context": "Welcome || EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu", "bindings": { "space b c": "pane::CloseActiveItem", "space p": "file_finder::Toggle", "space o": "pane::DeploySearch", - "space h": "pane::ActivatePrevItem", - "space l": "pane::ActivateNextItem" + "space h": "pane::ActivatePreviousItem", + "space l": "pane::ActivateNextItem", + "space e w": "diagnostics::ToggleWarnings", + "alt-j": "workspace::ToggleBottomDock" } }, { @@ -54,7 +56,7 @@ "space p": "file_finder::Toggle", "space o": "pane::DeploySearch", - "space h": "pane::ActivatePrevItem", + "space h": "pane::ActivatePreviousItem", "space l": "pane::ActivateNextItem", "space c space": "editor::ToggleComments", @@ -69,7 +71,7 @@ "ctrl-j": "editor::AddSelectionBelow", "ctrl-k": "editor::AddSelectionAbove", "alt-d": "editor::SelectNext", - "alt-j": "editor::SelectAllMatches", + "alt-shift-d": "editor::SelectAllMatches", // lsp "space m f": "editor::Format", "space m s": "project_symbols::Toggle", @@ -79,7 +81,7 @@ "space m r": "editor::FindAllReferences", "space m t": "editor::GoToTypeDefinition", "space m e": "editor::GoToDiagnostic", - "space m E": "editor::GoToPrevDiagnostic", + "space m E": "editor::GoToPreviousDiagnostic", "space m v": "editor::ToggleCodeActions", "space m o": "outline::Toggle", "space m h": "editor::ShowSignatureHelp", @@ -90,7 +92,7 @@ "space v n": "editor::ToggleLineNumbers", "space v i": "editor::ToggleInlayHints", // Git - "space g b": "editor::ToggleGitBlame" + "space g b": "git::Blame" } }, { @@ -114,7 +116,7 @@ "ctrl-t ctrl-t": "terminal_panel::ToggleFocus", "ctrl-t ctrl-n": "workspace::NewTerminal", "ctrl-t ctrl-shift-n": "workspace::NewCenterTerminal", - "ctrl-t ctrl-h": "pane::ActivatePrevItem", + "ctrl-t ctrl-h": "pane::ActivatePreviousItem", "ctrl-t ctrl-l": "pane::ActivateNextItem", "ctrl-x ctrl-c": "pane::CloseActiveItem", "ctrl-t ctrl-c": "pane::CloseActiveItem", @@ -128,7 +130,7 @@ "cmd-t cmd-t": "terminal_panel::ToggleFocus", "cmd-t cmd-n": "workspace::NewTerminal", "cmd-t cmd-shift-n": "workspace::NewCenterTerminal", - "cmd-t cmd-h": "pane::ActivatePrevItem", + "cmd-t cmd-h": "pane::ActivatePreviousItem", "cmd-t cmd-l": "pane::ActivateNextItem", "cmd-x cmd-c": "pane::CloseActiveItem" } @@ -140,7 +142,7 @@ "alt-t alt-t": "terminal_panel::ToggleFocus", "alt-t alt-n": "workspace::NewTerminal", "alt-t alt-shift-n": "workspace::NewCenterTerminal", - "alt-t alt-h": "pane::ActivatePrevItem", + "alt-t alt-h": "pane::ActivatePreviousItem", "alt-t alt-l": "pane::ActivateNextItem", "alt-x alt-c": "pane::CloseActiveItem" } @@ -166,14 +168,15 @@ // Panel stuff { - "context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant || EmptyPane", + "context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant || EmptyPane || Welcome", "bindings": { "space v h": "workspace::ToggleLeftDock", "space v l": "workspace::ToggleRightDock", "space v o": "outline_panel::ToggleFocus", "space v p": "project_panel::ToggleFocus", - "space v a": "assistant::ToggleFocus" + "space v a": "agent::ToggleFocus", + "alt-j": "workspace::ToggleBottomDock" } }, { @@ -191,7 +194,7 @@ { "context": "Assistant", "bindings": { - "space h": "assistant::ToggleFocus" + "space h": "agent::ToggleFocus" } } ] diff --git a/eggs/zed/settings.json b/eggs/zed/settings.json index 85a65b7..6717381 100644 --- a/eggs/zed/settings.json +++ b/eggs/zed/settings.json @@ -21,32 +21,32 @@ // "use_autoclose": true, // "always_treat_brackets_as_autoclosed": false, // "unstable.ui_density": "compact", - "assistant": { + /* Duplicated key auto-commented: "agent": { "always_allow_tool_actions": true, "default_profile": "code", "profiles": { "code": { "name": "Code", "tools": { - "rename": false, - "thinking": true, - "terminal": true, - "symbol_info": true, - "read_file": true, - "open": true, - "now": true, - "list_directory": true, - "grep": true, - "find_path": true, - "fetch": true, - "edit_file": true, - "diagnostics": true, - "create_file": true, - "contents": true, - "code_symbols": true, - "code_actions": true, - "batch_tool": true - }, + "rename": false, + "thinking": true, + "terminal": true, + "symbol_info": true, + "read_file": true, + "open": true, + "now": true, + "list_directory": true, + "grep": true, + "find_path": true, + "fetch": true, + "edit_file": true, + "diagnostics": true, + "create_file": true, + "contents": true, + "code_symbols": true, + "code_actions": true, + "batch_tool": true + }, "enable_all_context_servers": false, "context_servers": {} }, @@ -79,12 +79,13 @@ "enable_all_context_servers": true, "context_servers": {} } - }, + } + }, */ + "agent": { "default_model": { "provider": "copilot_chat", - "model": "claude-3-7-sonnet" + "model": "claude-3.7-sonnet" }, - "enable_experimental_live_diffs": true, "version": "2" }, "theme": "Gruvbox Dark Hard", @@ -96,7 +97,6 @@ // "buffer_line_height": { "custom": 1.55 }, // "ui_font_family": "Noto Sans", // "buffer_font_family": "Zed Mono", - // "active_pane_magnification": 1.3, "tab_bar": { "show_nav_history_buttons": false @@ -124,11 +124,9 @@ "enable_preview_from_file_finder": true, "enable_preview_from_code_navigation": true }, - "message_editor": { "auto_replace_emoji_shortcode": true }, - "terminal": { "font_family": "FiraCode Nerd Font", "font_size": 14 @@ -173,7 +171,6 @@ "panel.indent_guide": "#ffffff08", "panel.indent_guide_active": "#ffffff11", "panel.indent_guide_hover": "#ffffff13", - "panel.background": "#282828", "tab_bar.background": "#282828", // "border": "#3c3836", diff --git a/eggs/zed/settings_backup.json b/eggs/zed/settings_backup.json index c18c56b..f32fbd7 100644 --- a/eggs/zed/settings_backup.json +++ b/eggs/zed/settings_backup.json @@ -1,10 +1,14 @@ { + "git_panel": { + "status_style": "label_color" + }, "edit_predictions": { "disabled_globs": [], - "mode": "eager_preview" + "mode": "eager" }, "features": { - "inline_completion_provider": "zed" + "edit_prediction_provider": "copilot" + // "edit_prediction_provider": "zed" }, "icon_theme": "Material Icon Theme", "telemetry": { @@ -18,23 +22,81 @@ // "always_treat_brackets_as_autoclosed": false, // "unstable.ui_density": "compact", "assistant": { + "always_allow_tool_actions": true, + "default_profile": "code", + "profiles": { + "code": { + "name": "Code", + "tools": { + "rename": false, + "thinking": true, + "terminal": true, + "symbol_info": true, + "read_file": true, + "open": true, + "now": true, + "list_directory": true, + "grep": true, + "find_path": true, + "fetch": true, + "edit_file": true, + "diagnostics": true, + "create_file": true, + "contents": true, + "code_symbols": true, + "code_actions": true, + "batch_tool": true + }, + "enable_all_context_servers": false, + "context_servers": {} + }, + "write": { + "name": "Write", + "tools": { + "open": true, + "batch_tool": true, + "code_actions": true, + "code_symbols": true, + "contents": false, + "copy_path": false, + "create_file": true, + "delete_path": false, + "diagnostics": true, + "edit_file": true, + "fetch": true, + "list_directory": true, + "move_path": false, + "now": true, + "find_path": true, + "read_file": true, + "grep": true, + "rename": false, + "symbol_info": true, + "terminal": true, + "thinking": true, + "web_search": true + }, + "enable_all_context_servers": true, + "context_servers": {} + } + } + }, + "agent": { "default_model": { "provider": "copilot_chat", - "model": "claude-3-5-sonnet" + "model": "claude-3.7-sonnet" }, - "enable_experimental_live_diffs": true, "version": "2" }, "theme": "Gruvbox Dark Hard", "buffer_font_size": 14.0, - "buffer_font_family": "Input", + // "buffer_font_family": "Input", // "buffer_font_family": "Input", // "buffer_font_family": "FiraCode Nerd Font", - // "buffer_font_family": "JetBrainsMono Nerd Font Mono", + "buffer_font_family": "JetBrains Mono", // "buffer_line_height": { "custom": 1.55 }, // "ui_font_family": "Noto Sans", // "buffer_font_family": "Zed Mono", - // "active_pane_magnification": 1.3, "tab_bar": { "show_nav_history_buttons": false @@ -62,11 +124,9 @@ "enable_preview_from_file_finder": true, "enable_preview_from_code_navigation": true }, - "message_editor": { "auto_replace_emoji_shortcode": true }, - "terminal": { "font_family": "FiraCode Nerd Font", "font_size": 14 @@ -83,7 +143,18 @@ }, "lsp": { "rust-analyzer": { + "cargo": { + "features": "all" + }, "initialization_options": { + // "diagnostics": { + // "experimental": { + // "enable": true + // } + // }, + // "cargo": { + // "features": "all" + // }, "typing": { // Temporary workaround around round rust-analzyer wrongly inserting `|` twice "excludeChars": "|<" @@ -100,7 +171,6 @@ "panel.indent_guide": "#ffffff08", "panel.indent_guide_active": "#ffffff11", "panel.indent_guide_hover": "#ffffff13", - "panel.background": "#282828", "tab_bar.background": "#282828", // "border": "#3c3836",