From 957e06bc0910dc4d9824e9578c076f8a81c8b30d Mon Sep 17 00:00:00 2001 From: elkowar Date: Wed, 4 Dec 2024 22:34:30 +0100 Subject: [PATCH] Yolk stuff --- .../yolk/eggs/bar/yolktest/bar/bar.toml | 1 + eggs/bar/yolk_templates | 1 + eggs/bar/yolktest/bar | 1 + eggs/foo/yolktest/foo.toml | 4 +- eggs/zed/.config/zed/keymap.json | 3 +- eggs/zed/.config/zed/settings.json | 13 +- eggs/zed/.config/zed/themes/phine.json | 344 ++++++++++++++++++ yolk.lua | 6 + yolk.rhai | 6 - 9 files changed, 361 insertions(+), 18 deletions(-) create mode 100644 eggs/bar/.config/yolk/eggs/bar/yolktest/bar/bar.toml create mode 100644 eggs/bar/yolk_templates create mode 120000 eggs/bar/yolktest/bar create mode 100644 eggs/zed/.config/zed/themes/phine.json create mode 100644 yolk.lua delete mode 100644 yolk.rhai diff --git a/eggs/bar/.config/yolk/eggs/bar/yolktest/bar/bar.toml b/eggs/bar/.config/yolk/eggs/bar/yolktest/bar/bar.toml new file mode 100644 index 0000000..b258b89 --- /dev/null +++ b/eggs/bar/.config/yolk/eggs/bar/yolktest/bar/bar.toml @@ -0,0 +1 @@ +hostname = "fedora.fritz.box" # {< replace_in(`"`, SYSTEM.hostname) >} diff --git a/eggs/bar/yolk_templates b/eggs/bar/yolk_templates new file mode 100644 index 0000000..4716938 --- /dev/null +++ b/eggs/bar/yolk_templates @@ -0,0 +1 @@ +.config/yolk/eggs/bar/yolktest/bar/bar.toml \ No newline at end of file diff --git a/eggs/bar/yolktest/bar b/eggs/bar/yolktest/bar new file mode 120000 index 0000000..a28301f --- /dev/null +++ b/eggs/bar/yolktest/bar @@ -0,0 +1 @@ +/home/elk/.config/yolk/eggs/bar/.config/yolk/eggs/bar/yolktest/bar \ No newline at end of file diff --git a/eggs/foo/yolktest/foo.toml b/eggs/foo/yolktest/foo.toml index 24609eb..d8cdcf1 100644 --- a/eggs/foo/yolktest/foo.toml +++ b/eggs/foo/yolktest/foo.toml @@ -1,2 +1,2 @@ -# {% replace /".*"/ `"${system.username}"` %} -hostname = "canonical-username" +# {# if true #} +hostname = "elk" diff --git a/eggs/zed/.config/zed/keymap.json b/eggs/zed/.config/zed/keymap.json index 6b7d8bb..b442837 100644 --- a/eggs/zed/.config/zed/keymap.json +++ b/eggs/zed/.config/zed/keymap.json @@ -40,7 +40,7 @@ } }, { - "context": "EmptyPane || Editor && VimControl && !VimWaiting && !menu", + "context": "MarkdownPreview || EmptyPane || Editor && VimControl && !VimWaiting && !menu", "bindings": { "space b c": "pane::CloseActiveItem", ":": "command_palette::Toggle", @@ -75,6 +75,7 @@ "space m E": "editor::GoToPrevDiagnostic", "space m v": "editor::ToggleCodeActions", "space m o": "outline::Toggle", + "space m s": "editor::ShowSignatureHelp", // diagnostics "space e e": "diagnostics::Deploy", "space e w": "diagnostics::ToggleWarnings", diff --git a/eggs/zed/.config/zed/settings.json b/eggs/zed/.config/zed/settings.json index 37eb0c8..b7bf586 100644 --- a/eggs/zed/.config/zed/settings.json +++ b/eggs/zed/.config/zed/settings.json @@ -1,16 +1,12 @@ { + "auto_signature_help": false, "assistant": { "default_model": { - "provider": "anthropic", - "model": "claude-3-sonnet-latest" + "provider": "copilot_chat", + "model": "gpt-4o" }, "version": "2" }, - "language_models": { - "openai": { - "version": "1" - } - }, "theme": "Gruvbox Dark Hard", "buffer_font_size": 14, "buffer_font_family": "FiraCode Nerd Font", @@ -23,7 +19,6 @@ "tab_bar": { "show_nav_history_buttons": false }, - "calls": { "mute_on_join": true }, @@ -35,7 +30,7 @@ "tabs": { "git_status": true }, "terminal": { - "font_family": "JetBrainsMono Nerd Font Mono", + "font_family": "JetBrainsMono Nerd Font", "font_size": 14 }, "vim_mode": true, diff --git a/eggs/zed/.config/zed/themes/phine.json b/eggs/zed/.config/zed/themes/phine.json new file mode 100644 index 0000000..27b06aa --- /dev/null +++ b/eggs/zed/.config/zed/themes/phine.json @@ -0,0 +1,344 @@ +{ + "$schema": "https://zed.dev/schema/themes/v0.1.0.json", + "name": "Phine", + "author": "Philipp Schaffrath", + "themes": [ + { + "name": "Phine", + "appearance": "dark", + + "style": { + "border": "#1A1A1A", + "border.variant": "#1A1A1A", + "border.focused": "#293b5bff", + "border.selected": "#293b5bff", + "border.transparent": "#00000000", + "border.disabled": "#414754ff", + "elevated_surface.background": "#222222", + "surface.background": "#121212", + "background": "#282828", + //"background": "#090909", + "element.background": "#ffffff02", + "element.hover": "#222222", + "element.active": "#454a56ff", + "element.selected": "#454a56ff", + "element.disabled": "#2e343eff", + "drop_target.background": "#482FB808", + "ghost_element.background": "#00000000", + "ghost_element.hover": "#ffffff02", + "ghost_element.active": "#ffffff07", + "ghost_element.selected": "#ffffff02", + "ghost_element.disabled": "#ff0000", + "text": "#CCCCCC", + "text.muted": "#ffffff30", + "text.placeholder": "#343434", + "text.disabled": "#2c2c2c", + "text.accent": "#F5DE89", + "icon": "#CCCCCC", + "icon.muted": "#838994ff", + "icon.disabled": "#696B77ff", + "icon.placeholder": "#838994ff", + "icon.accent": "#74ade8ff", + "status_bar.background": "#090909", + "title_bar.background": "#090909", + "title_bar.inactive_background": "#090909", + "toolbar.background": "#090909", + "tab_bar.background": "#121212", + "tab.inactive_background": "#090909", + "tab.active_background": "#090909", + "search.match_background": "#74ade866", + "panel.background": "#121212", + "panel.focused_border": null, + "pane.focused_border": null, + "scrollbar.thumb.background": "#ffffff07", + "scrollbar.thumb.hover_background": "#ff00ff", // TODO: this color is ignored by zed + "scrollbar.thumb.border": "#00000000", + "editor.indent_guide": "#202020", + "editor.indent_guide_active": "#333333", + "scrollbar.track.background": "#00000000", + "scrollbar.track.border": "#ffffff02", + "editor.foreground": "#ffffff", + "editor.background": "#121212", + "editor.gutter.background": "#0D0D0D", + "editor.subheader.background": "#1A1A1A", + "editor.active_line.background": "#ffffff02", + "editor.highlighted_line.background": "#2f343eff", + "editor.line_number": "#ffffff08", + "editor.active_line_number": "#ffffff", + "editor.invisible": "#696B77ff", + "editor.wrap_guide": "#202020", + "editor.active_wrap_guide": "#ff00ff", + "editor.document_highlight.read_background": "#74ade81a", + "editor.document_highlight.write_background": "#555a6366", + "terminal.background": "#090909", + "terminal.foreground": "#c8ccd4ff", + "terminal.bright_foreground": "#c8ccd4ff", + "terminal.dim_foreground": "#282c33ff", + "terminal.ansi.black": "#282c33ff", + "terminal.ansi.bright_black": "#525561ff", + "terminal.ansi.dim_black": "#c8ccd4ff", + "terminal.ansi.red": "#d07277ff", + "terminal.ansi.bright_red": "#673a3cff", + "terminal.ansi.dim_red": "#eab7b9ff", + "terminal.ansi.green": "#a1c181ff", + "terminal.ansi.bright_green": "#4d6140ff", + "terminal.ansi.dim_green": "#d1e0bfff", + "terminal.ansi.yellow": "#dec184ff", + "terminal.ansi.bright_yellow": "#786441ff", + "terminal.ansi.dim_yellow": "#f1dfc1ff", + "terminal.ansi.blue": "#74ade8ff", + "terminal.ansi.bright_blue": "#385378ff", + "terminal.ansi.dim_blue": "#bed5f4ff", + "terminal.ansi.magenta": "#be5046ff", + "terminal.ansi.bright_magenta": "#5e2b26ff", + "terminal.ansi.dim_magenta": "#e6a79eff", + "terminal.ansi.cyan": "#6eb4bfff", + "terminal.ansi.bright_cyan": "#3a565bff", + "terminal.ansi.dim_cyan": "#b9d9dfff", + "terminal.ansi.white": "#c8ccd4ff", + "terminal.ansi.bright_white": "#c8ccd4ff", + "terminal.ansi.dim_white": "#575d65ff", + "link_text.hover": "#74ade8ff", + "conflict": "#dec184ff", + "conflict.background": "#dec1841a", + "conflict.border": "#5d4c2fff", + "created": "#a1c181ff", + "created.background": "#a1c1811a", + "created.border": "#38482fff", + "deleted": "#d07277ff", + "deleted.background": "#d072771a", + "deleted.border": "#4c2b2cff", + "error": "#d07277ff", + "error.background": "#d072771a", + "error.border": "#4c2b2cff", + "hidden": "#696B77ff", + "hidden.background": "#696B771a", + "hidden.border": "#414754ff", + "hint": "#5a6f89ff", + "hint.background": "#5a6f891a", + "hint.border": "#293b5bff", + "ignored": "#696B77ff", + "ignored.background": "#696B771a", + "ignored.border": "#464b57ff", + "info": "#74ade8ff", + "info.background": "#74ade81a", + "info.border": "#293b5bff", + "modified": "#dec184ff", + "modified.background": "#dec1841a", + "modified.border": "#5d4c2fff", + "predictive": "#5a6a87ff", + "predictive.background": "#5a6a871a", + "predictive.border": "#38482fff", + "renamed": "#74ade8ff", + "renamed.background": "#74ade81a", + "renamed.border": "#293b5bff", + "success": "#a1c181ff", + "success.background": "#a1c1811a", + "success.border": "#38482fff", + "unreachable": "#838994ff", + "unreachable.background": "#8389941a", + "unreachable.border": "#464b57ff", + "warning": "#dec184ff", + "warning.background": "#dec1841a", + "warning.border": "#5d4c2fff", + "syntax": { + "attribute": { + "color": "#74ade8ff", + "font_style": null, + "font_weight": null + }, + "boolean": { + "color": "#F0A875", + "font_style": null, + "font_weight": null + }, + "comment": { + "color": "#454545", + "font_style": null, + "font_weight": null + }, + "comment.doc": { + "color": "#446850", + "font_style": null, + "font_weight": null + }, + "constant": { + "color": "#dfc184ff", + "font_style": null, + "font_weight": null + }, + "constructor": { + "color": "#73ade9ff", + "font_style": null, + "font_weight": null + }, + "embedded": { + "color": "#c8ccd4ff", + "font_style": null, + "font_weight": null + }, + "emphasis": { + "color": "#74ade8ff", + "font_style": null, + "font_weight": null + }, + "emphasis.strong": { + "color": "#bf956aff", + "font_style": null, + "font_weight": 700 + }, + "enum": { + "color": "#d07277ff", + "font_style": null, + "font_weight": null + }, + "function": { + "color": "#5D8DEE", + "font_style": null, + "font_weight": null + }, + "hint": { + "color": "#5a6f89ff", + "font_style": null, + "font_weight": 700 + }, + "keyword": { + "color": "#F997E8", + "font_style": null, + "font_weight": null + }, + "label": { + "color": "#74ade8ff", + "font_style": null, + "font_weight": null + }, + "link_text": { + "color": "#73ade9ff", + "font_style": "normal", + "font_weight": null + }, + "link_uri": { + "color": "#6eb4bfff", + "font_style": null, + "font_weight": null + }, + "number": { + "color": "#F0A875", + "font_style": null, + "font_weight": null + }, + "operator": { + "color": "#6eb4bfff", + "font_style": null, + "font_weight": null + }, + "predictive": { + "color": "#5a6a87ff", + "font_style": "italic", + "font_weight": null + }, + "preproc": { + "color": "#c8ccd4ff", + "font_style": null, + "font_weight": null + }, + "primary": { + "color": "#acb2beff", + "font_style": null, + "font_weight": null + }, + "property": { + "color": "#ffffff", + "font_style": null, + "font_weight": null + }, + "punctuation": { + "color": "#acb2beff", + "font_style": null, + "font_weight": null + }, + "punctuation.bracket": { + "color": "#b2b9c6ff", + "font_style": null, + "font_weight": null + }, + "punctuation.delimiter": { + "color": "#b2b9c6ff", + "font_style": null, + "font_weight": null + }, + "punctuation.list_marker": { + "color": "#d07277ff", + "font_style": null, + "font_weight": null + }, + "punctuation.special": { + "color": "#b1574bff", + "font_style": null, + "font_weight": null + }, + "string": { + "color": "#7DE898", + "font_style": null, + "font_weight": null + }, + "string.escape": { + "color": "#878e98ff", + "font_style": null, + "font_weight": null + }, + "string.regex": { + "color": "#bf956aff", + "font_style": null, + "font_weight": null + }, + "string.special": { + "color": "#bf956aff", + "font_style": null, + "font_weight": null + }, + "string.special.symbol": { + "color": "#bf956aff", + "font_style": null, + "font_weight": null + }, + "tag": { + "color": "#74ade8ff", + "font_style": null, + "font_weight": null + }, + "text.literal": { + "color": "#a1c181ff", + "font_style": null, + "font_weight": null + }, + "title": { + "color": "#d07277ff", + "font_style": null, + "font_weight": 400 + }, + "type": { + "color": "#F5DE89", + "font_style": null, + "font_weight": null + }, + "variable": { + "color": "#ffffff", + "font_style": null, + "font_weight": null + }, + "variable.special": { + "color": "#FF8787", + "font_style": null, + "font_weight": null + }, + "variant": { + "color": "#73ade9ff", + "font_style": null, + "font_weight": null + } + } + } + } + ] +} diff --git a/yolk.lua b/yolk.lua new file mode 100644 index 0000000..e64b3a5 --- /dev/null +++ b/yolk.lua @@ -0,0 +1,6 @@ +function canonical_data() + return {} +end +function local_data(system) + return canonical_data() +end diff --git a/yolk.rhai b/yolk.rhai deleted file mode 100644 index 776dec5..0000000 --- a/yolk.rhai +++ /dev/null @@ -1,6 +0,0 @@ -fn canonical_data() { - #{} -} -fn local_data(system) { - canonical_data() -}