diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..15448bf --- /dev/null +++ b/.luarc.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json", + "runtime.version": "Lua 5.4", + "format.enable": true, + "workspace.library": ["/usr/share/nvim/runtime"], + "hint": { + "enable": true, + "setType": true + } +} diff --git a/configs/nvim/lua/aleidk/plugins/formatter.lua b/configs/nvim/lua/aleidk/plugins/formatter.lua index 2679748..7c99b57 100644 --- a/configs/nvim/lua/aleidk/plugins/formatter.lua +++ b/configs/nvim/lua/aleidk/plugins/formatter.lua @@ -99,7 +99,7 @@ return { return end - if args.bang then vim.cmd("w") end + if args.bang then vim.cmd('w') end end require("conform").format({ diff --git a/configs/zed/config.json b/configs/zed/config.json index 2a6e27f..a133903 100644 --- a/configs/zed/config.json +++ b/configs/zed/config.json @@ -1,11 +1,3 @@ -// Zed settings -// -// For information on how to configure Zed, see the Zed -// documentation: https://zed.dev/docs/configuring-zed -// -// To see all of Zed's default settings without changing your -// custom settings, run `zed: open default settings` from the -// command palette (cmd-shift-p / ctrl-shift-p) { "git": { "inline_blame": { diff --git a/configs/zed/settings.json b/configs/zed/settings.json index 7a44ad3..fb8ad28 100644 --- a/configs/zed/settings.json +++ b/configs/zed/settings.json @@ -7,247 +7,344 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { - "zoomed_padding": false, - "active_pane_modifiers": { - "border_size": -1.0 - }, - "window_decorations": "client", - "close_on_file_delete": true, - "file_finder": { - "modal_max_width": "medium" - }, - "use_smartcase_search": true, - "colorize_brackets": true, - "show_whitespaces": "selection", - "always_treat_brackets_as_autoclosed": false, - "vim": { - "use_smartcase_find": true - }, - "sticky_scroll": { - "enabled": true - }, - "scroll_beyond_last_line": "vertical_scroll_margin", - "which_key": { - "enabled": true - }, - "rounded_selection": true, - "current_line_highlight": "gutter", - "cursor_shape": "bar", - "session": { - "trust_all_worktrees": true - }, - "lsp_document_colors": "inlay", - "inlay_hints": { - "show_background": false, - "show_other_hints": true, - "show_parameter_hints": true, - "show_type_hints": true, - "show_value_hints": true, - "enabled": true, - }, - "languages": { - "PHP": { - "inlay_hints": { - "enabled": true, - }, - }, - "Markdown": { - "enable_language_server": true, - "language_servers": ["rumdl"], - "formatter": "language_server", - "format_on_save": "on", - }, - }, - "git": { - "inline_blame": { - "enabled": false, - }, - }, - "agent": { - "button": true, - "model_parameters": [], - }, - "collaboration_panel": { - "button": false, - }, - "notification_panel": { - "button": false, - }, - "git_panel": { - "tree_view": true, - "collapse_untracked_diff": false, - "sort_by_path": false, - "status_style": "label_color", - }, - "bottom_dock_layout": "contained", - "preview_tabs": { - "enable_preview_from_file_finder": true, - }, - "tabs": { - "show_diagnostics": "errors", - "file_icons": true, - "git_status": true, - }, - "search": { - "center_on_match": true, - "button": false, - }, - "diagnostics": { - "inline": { - "min_column": 0, - "padding": 4, - "enabled": true, - }, - "button": true, - }, - "debugger": { - "button": true, - }, - "status_bar": { - "cursor_position_button": true, - "active_language_button": true, - }, - "project_panel": { - "sort_mode": "directories_first", - "hide_hidden": false, - "show_diagnostics": "errors", - "hide_root": true, - "starts_open": false, - "entry_spacing": "standard", - "hide_gitignore": false, - "button": true, - }, - "toolbar": { - "breadcrumbs": true, - "selections_menu": true, - "quick_actions": false, - "code_actions": true, - }, - "horizontal_scroll_margin": 25.0, - "vertical_scroll_margin": 15.0, - "use_system_window_tabs": false, - "tab_bar": { - "show_pinned_tabs_in_separate_row": false, - "show_tab_bar_buttons": false, - "show_nav_history_buttons": false, - "show": true, - }, - "title_bar": { - "show_user_menu": false, - "show_branch_icon": true, - "show_branch_name": true, - "show_project_items": true, - "show_onboarding_banner": false, - "show_menus": false, - "show_user_picture": false, - "show_sign_in": false, - }, - "terminal": { - "toolbar": { - "breadcrumbs": false - }, - "button": true, - "font_size": 14.0, - }, - "indent_guides": { - "active_line_width": 1, - "background_coloring": "disabled", - "coloring": "fixed", - }, - "tab_size": 2, - "scrollbar": { - "show": "never", - }, - "auto_signature_help": true, - "ui_font_family": "DejaVu Sans", - "buffer_font_family": "JetBrainsMono Nerd Font", - "icon_theme": { - "mode": "system", - "light": "Catppuccin Macchiato", - "dark": "Catppuccin Macchiato", - }, - "ssh_connections": [ - { - "host": "GetDTE-Prod-App", - "args": [], - "projects": [ - { - "paths": ["/bcn/invoice-chile/scripts"], - }, - { - "paths": ["/bcn/workflow"], - }, - { - "paths": ["/bcn/workflow/piloto/php/./"], - }, - ], - }, - { - "host": "t-800", - "args": [], - "projects": [ - { - "paths": ["/opt/stacks"], - }, - ], - "nickname": "T-800", - }, - { - "host": "getwfr-2-piloto", - "args": [], - "projects": [], - }, - { - "host": "saria", - "args": [], - "projects": [ - { - "paths": ["/opt/stacks"], - }, - ], - "nickname": "Saria", - }, - { - "host": "getwfr-2-prod", - "args": [], - "projects": [ - { - "paths": ["/bcn/workflow/produccion/php/./"], - }, - ], - }, - ], - "disable_ai": false, - "auto_update": false, - "vim_mode": true, - "ui_font_size": 16.0, - "buffer_font_size": 14.0, - "theme": { - "mode": "system", - "light": "Catppuccin Macchiato", - "dark": "Catppuccin Macchiato", - }, - "lsp": { - "rumdl": { - "binary": { - "path": "rumdl", - "arguments": ["server"], - }, - }, - "rust-analyzer": { - "enable_lsp_tasks": true, - "initialization_options": { - "inlayHints": { - "maxLength": null, - "lifetimeElisionHints": { - "enable": "skip_trivial", - "useParameterNames": true, - }, - "closureReturnTypeHints": { - "enable": "always", - }, - }, - }, - }, - }, + "formatter": "language_server", + "zoomed_padding": false, + "active_pane_modifiers": { + "border_size": -1.0 + }, + "window_decorations": "client", + "close_on_file_delete": true, + "file_finder": { + "modal_max_width": "medium" + }, + "use_smartcase_search": true, + "colorize_brackets": true, + "show_whitespaces": "selection", + "always_treat_brackets_as_autoclosed": false, + "vim": { + "use_smartcase_find": true + }, + "sticky_scroll": { + "enabled": true + }, + "scroll_beyond_last_line": "vertical_scroll_margin", + "which_key": { + "enabled": true + }, + "rounded_selection": true, + "current_line_highlight": "gutter", + "cursor_shape": "bar", + "session": { + "trust_all_worktrees": true + }, + "lsp_document_colors": "inlay", + "inlay_hints": { + "show_background": false, + "show_other_hints": true, + "show_parameter_hints": true, + "show_type_hints": true, + "show_value_hints": true, + "enabled": true + }, + "languages": { + "Lua": { + "inlay_hints": { + "enabled": true, + "show_type_hints": true, + "show_parameter_hints": true, + "show_other_hints": true + }, + "format_on_save": "on" + }, + "Kdl": { + "formatter": { + "external": { + "command": "kdlfmt", + "arguments": ["format", "-"] + } + } + }, + "PHP": { + "inlay_hints": { + "enabled": true + } + }, + "Markdown": { + "enable_language_server": true, + "language_servers": ["rumdl"], + "use_on_type_format": true, + "format_on_save": "on", + "formatter": "language_server" + }, + "JavaScript": { + "language_servers": ["biome"], + "formatter": "language_server", + "code_actions_on_format": { + "source.fixAll.biome": true, + "source.organizeImports.biome": true, + "source.action.useSortedKeys.biome": true + } + }, + "TypeScript": { + "language_servers": ["biome"], + "formatter": "language_server", + "code_actions_on_format": { + "source.fixAll.biome": true, + "source.organizeImports.biome": true, + "source.action.useSortedKeys.biome": true + } + }, + "TSX": { + "language_servers": ["biome"], + "formatter": "language_server", + "code_actions_on_format": { + "source.fixAll.biome": true, + "source.organizeImports.biome": true, + "source.action.useSortedKeys.biome": true + } + }, + "CSS": { + "language_servers": ["biome"], + "formatter": "language_server" + }, + "JSON": { + "language_servers": ["biome"], + "formatter": "language_server", + "code_actions_on_format": { + "source.action.useSortedKeys.biome": true, + "source.fixAll.biome": true + } + }, + "JSONC": { + "language_servers": ["biome"], + "formatter": "language_server", + "code_actions_on_format": { + "source.action.useSortedKeys.biome": true, + "source.fixAll.biome": true + } + }, + "HTML": { + "formatter": "language_server" + } + }, + "git": { + "inline_blame": { + "enabled": false + } + }, + "agent": { + "button": true, + "model_parameters": [] + }, + "collaboration_panel": { + "button": false + }, + "notification_panel": { + "button": false + }, + "git_panel": { + "tree_view": true, + "collapse_untracked_diff": false, + "sort_by_path": false, + "status_style": "label_color" + }, + "bottom_dock_layout": "contained", + "preview_tabs": { + "enable_preview_from_file_finder": true + }, + "tabs": { + "show_diagnostics": "errors", + "file_icons": true, + "git_status": true + }, + "search": { + "center_on_match": true, + "button": false + }, + "diagnostics": { + "inline": { + "min_column": 0, + "padding": 4, + "enabled": true + }, + "button": true + }, + "debugger": { + "button": true + }, + "status_bar": { + "cursor_position_button": true, + "active_language_button": true + }, + "project_panel": { + "sort_mode": "directories_first", + "hide_hidden": false, + "show_diagnostics": "errors", + "hide_root": true, + "starts_open": false, + "entry_spacing": "standard", + "hide_gitignore": false, + "button": true + }, + "toolbar": { + "breadcrumbs": true, + "selections_menu": true, + "quick_actions": false, + "code_actions": true + }, + "horizontal_scroll_margin": 25.0, + "vertical_scroll_margin": 15.0, + "use_system_window_tabs": false, + "tab_bar": { + "show_pinned_tabs_in_separate_row": false, + "show_tab_bar_buttons": false, + "show_nav_history_buttons": false, + "show": true + }, + "title_bar": { + "show_user_menu": false, + "show_branch_icon": true, + "show_branch_name": true, + "show_project_items": true, + "show_onboarding_banner": false, + "show_menus": false, + "show_user_picture": false, + "show_sign_in": false + }, + "terminal": { + "toolbar": { + "breadcrumbs": false + }, + "button": true, + "font_size": 14.0 + }, + "indent_guides": { + "active_line_width": 1, + "background_coloring": "disabled", + "coloring": "fixed" + }, + "tab_size": 2, + "scrollbar": { + "show": "never" + }, + "auto_signature_help": true, + "ui_font_family": "DejaVu Sans", + "buffer_font_family": "JetBrainsMono Nerd Font", + "icon_theme": { + "mode": "system", + "light": "Catppuccin Macchiato", + "dark": "Catppuccin Macchiato" + }, + "ssh_connections": [ + { + "host": "GetDTE-Prod-App", + "args": [], + "projects": [ + { + "paths": ["/bcn/invoice-chile/scripts"] + }, + { + "paths": ["/bcn/workflow"] + }, + { + "paths": ["/bcn/workflow/piloto/php/./"] + } + ] + }, + { + "host": "t-800", + "args": [], + "projects": [ + { + "paths": ["/opt/stacks"] + } + ], + "nickname": "T-800" + }, + { + "host": "getwfr-2-piloto", + "args": [], + "projects": [] + }, + { + "host": "saria", + "args": [], + "projects": [ + { + "paths": ["/opt/stacks"] + } + ], + "nickname": "Saria" + }, + { + "host": "getwfr-2-prod", + "args": [], + "projects": [ + { + "paths": ["/bcn/workflow/produccion/php/./"] + } + ] + } + ], + "disable_ai": false, + "auto_update": false, + "vim_mode": true, + "ui_font_size": 16.0, + "buffer_font_size": 14.0, + "theme": { + "mode": "system", + "light": "Catppuccin Macchiato", + "dark": "Catppuccin Macchiato" + }, + "lsp": { + "biome": { + "enable_lsp_tasks": true, + "settings": { + "formatter": { + "attributePosition": "multiline", + "expand": "always" + }, + "assist": { + "actions": { + "source": { "useSortedKeys": "on" } + } + } + } + }, + "rumdl": { + "binary": { + "path": "rumdl", + "arguments": ["server"] + } + }, + "rust-analyzer": { + "enable_lsp_tasks": true, + "initialization_options": { + "inlayHints": { + "maxLength": null, + "lifetimeElisionHints": { + "enable": "skip_trivial", + "useParameterNames": true + }, + "closureReturnTypeHints": { + "enable": "always" + } + } + } + }, + "vscode-html-language-server": { + "settings": { + "html": { + "format": { + // Indent under and (default: false) + "indentInnerHtml": true, + // Disable formatting inside or
and

+ "extraLiners": "div,p" + } + } + } + } + } } diff --git a/configs/zellij/config.kdl b/configs/zellij/config.kdl index 1d12d77..29af19c 100644 --- a/configs/zellij/config.kdl +++ b/configs/zellij/config.kdl @@ -271,90 +271,90 @@ plugins { // eg. "https://example.com/my-plugin.wasm" load_plugins { } - + // Use a simplified UI without special fonts (arrow glyphs) // Options: // - true // - false (Default) -// +// simplified_ui true - + // Choose the theme that is specified in the themes section. // Default: default -// +// theme "catppuccin-macchiato" - + // Choose the base input mode of zellij. // Default: normal -// +// default_mode "locked" - + // Choose the path to the default shell that zellij will use for opening new panes // Default: $SHELL -// +// // default_shell "fish" - + // Choose the path to override cwd that zellij will use for opening new panes -// +// // default_cwd "/tmp" - + // The name of the default layout to load on startup // Default: "default" -// +// // default_layout "compact" - + // The folder in which Zellij will look for layouts // (Requires restart) -// +// // layout_dir "/tmp" - + // The folder in which Zellij will look for themes // (Requires restart) -// +// // theme_dir "/tmp" - + // Toggle enabling the mouse mode. // On certain configurations, or terminals this could // potentially interfere with copying text. // Options: // - true (default) // - false -// +// // mouse_mode false - + // Toggle having pane frames around the panes // Options: // - true (default, enabled) // - false -// +// // pane_frames false - + // When attaching to an existing session with other users, // should the session be mirrored (true) // or should each user have their own cursor (false) // (Requires restart) // Default: false -// +// // mirror_session true - + // Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP // eg. when terminal window with an active zellij session is closed // (Requires restart) // Options: // - detach (Default) // - quit -// +// // on_force_close "quit" - + // Configure the scroll back buffer size // This is the number of lines zellij stores for each pane in the scroll back // buffer. Excess number of lines are discarded in a FIFO fashion. // (Requires restart) // Valid values: positive integers // Default value: 10000 -// +// // scroll_buffer_size 10000 - + // Provide a command to execute when copying text. The text will be piped to // the stdin of the program to perform the copy. This can be used with // terminal emulators which do not support the OSC 52 ANSI control sequence @@ -364,102 +364,102 @@ default_mode "locked" // copy_command "xclip -selection clipboard" // x11 // copy_command "wl-copy" // wayland // copy_command "pbcopy" // osx -// +// // copy_command "pbcopy" - + // Choose the destination for copied text // Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard. // Does not apply when using copy_command. // Options: // - system (default) // - primary -// +// // copy_clipboard "primary" - + // Enable automatic copying (and clearing) of selection when releasing mouse // Default: true -// +// // copy_on_select true - + // Path to the default editor to use to edit pane scrollbuffer // Default: $EDITOR or $VISUAL // scrollback_editor "/usr/bin/vim" - + // A fixed name to always give the Zellij session. // Consider also setting `attach_to_session true,` // otherwise this will error if such a session exists. // Default: -// +// // session_name "My singleton session" - + // When `session_name` is provided, attaches to that session // if it is already running or creates it otherwise. // Default: false -// +// attach_to_session true - + // Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible // Options: // - true (default) // - false -// +// // auto_layout false - + // Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected // Options: // - true (default) // - false -// +// // session_serialization false - + // Whether pane viewports are serialized along with the session, default is false // Options: // - true // - false (default) -// +// // serialize_pane_viewport false - + // Scrollback lines to serialize along with the pane viewport when serializing sessions, 0 // defaults to the scrollback size. If this number is higher than the scrollback size, it will // also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true. -// +// // scrollback_lines_to_serialize 10000 - + // Enable or disable the rendering of styled and colored underlines (undercurl). // May need to be disabled for certain unsupported terminals // (Requires restart) // Default: true -// +// // styled_underlines false - + // How often in seconds sessions are serialized -// +// // serialization_interval 10000 - + // Enable or disable writing of session metadata to disk (if disabled, other sessions might not know // metadata info on this session) // (Requires restart) // Default: false -// +// // disable_session_metadata false - + // Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it) // (Requires restart) // Default: true (if the host terminal supports it) -// +// // support_kitty_keyboard_protocol false - + // Whether to stack panes when resizing beyond a certain size // Default: true -// +// // stacked_resize false - + // Whether to show tips on startup // Default: true -// +// show_startup_tips false - + // Whether to show release notes on first version run // Default: true -// +// // show_release_notes false