From 7319efbe3eafc35793be5ef7e005bf06f4649513 Mon Sep 17 00:00:00 2001 From: jabuxas Date: Fri, 20 Dec 2024 13:12:59 -0300 Subject: [PATCH] chore: update to black --- .../.config/alacritty/alacritty.toml | 2 +- .../configs/sway/.config/sway/settings/config | 8 +- .../configs/sway/.config/sway/settings/rules | 4 +- desktop/configs/tmux/.config/tmux/theme.conf | 2 +- .../configs/waybar/.config/waybar/style.css | 7 +- .../app/dev.zed.Zed/config/zed/keymap.json | 74 ++++++++++- .../app/dev.zed.Zed/config/zed/settings.json | 117 ++++++++++++++++-- 7 files changed, 188 insertions(+), 26 deletions(-) diff --git a/desktop/configs/alacritty/.config/alacritty/alacritty.toml b/desktop/configs/alacritty/.config/alacritty/alacritty.toml index 0de1960..5cf6644 100644 --- a/desktop/configs/alacritty/.config/alacritty/alacritty.toml +++ b/desktop/configs/alacritty/.config/alacritty/alacritty.toml @@ -12,7 +12,7 @@ # I put the file alacritty.toml in $HOME/.config/alacritty. However it can be kept anywhere among the places mentioned in # https://github.com/alacritty/alacritty/tree/master#configuration -import = ["~/.config/alacritty/white.toml"] +import = ["~/.config/alacritty/black.toml"] [window] diff --git a/desktop/configs/sway/.config/sway/settings/config b/desktop/configs/sway/.config/sway/settings/config index faebc12..66da4a5 100644 --- a/desktop/configs/sway/.config/sway/settings/config +++ b/desktop/configs/sway/.config/sway/settings/config @@ -1,11 +1,7 @@ output { HDMI-A-1 pos 0 0 mode --custom 2560x1080@75Hz adaptive_sync on - DP-3 pos 2560 0 mode --custom 2560x1080@75Hz adaptive_sync on - - # old setup - # # HDMI-A-1 pos 0 0 - # DP-3 disable pos 0 -1080 - # DP-2 pos 2560 0 + DP-3 pos 2560 0 mode --custom 2560x1080@60Hz adaptive_sync on + DP-1 disable pos 0 -1080 } default_border pixel 2 diff --git a/desktop/configs/sway/.config/sway/settings/rules b/desktop/configs/sway/.config/sway/settings/rules index 1d49440..b3e0e10 100644 --- a/desktop/configs/sway/.config/sway/settings/rules +++ b/desktop/configs/sway/.config/sway/settings/rules @@ -2,8 +2,8 @@ for_window [class="Anki" title="Add"] floating enable for_window [class="vrising.exe"] move to workspace 9 for_window [shell=".*"] inhibit_idle fullscreen for_window [app_id=".*office.*"] move to workspace 5 -for_window [app_id="WebCord"] move to workspace 6 -for_window [class="WebCord"] move to workspace 6 +for_window [app_id="WebCord"] move to workspace 2 +for_window [class="WebCord"] move to workspace 2 for_window [class="Spotify"] move to workspace 4 for_window [class="Steam"] move to workspace 8 for_window [class="steam"] move to workspace 8 diff --git a/desktop/configs/tmux/.config/tmux/theme.conf b/desktop/configs/tmux/.config/tmux/theme.conf index b1417f2..3e4999b 120000 --- a/desktop/configs/tmux/.config/tmux/theme.conf +++ b/desktop/configs/tmux/.config/tmux/theme.conf @@ -1 +1 @@ -/yang/.config/tmux/themes/tmux-white.conf \ No newline at end of file +/yang/.config/tmux/themes/tmux-monochrome.conf \ No newline at end of file diff --git a/desktop/configs/waybar/.config/waybar/style.css b/desktop/configs/waybar/.config/waybar/style.css index 05fa046..02b0533 100644 --- a/desktop/configs/waybar/.config/waybar/style.css +++ b/desktop/configs/waybar/.config/waybar/style.css @@ -4,18 +4,19 @@ /* padding: 0; */ /* margin: 0; */ font-size: 18px; - font-family: CozetteVector; + font-family: CartographCF Nerd Font; font-style: italic; } window#waybar { background: #0a0c10; color: #f0f3f6; - margin: 20px; + margin: 10px; } #workspaces button { - padding: 0; + margin-left: 2px; + padding: 2px 8px; } #workspaces button:hover, diff --git a/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/keymap.json b/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/keymap.json index de3f909..41d13cd 100644 --- a/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/keymap.json +++ b/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/keymap.json @@ -11,11 +11,10 @@ "bindings": {} }, { - "context": "Editor && vim_mode == normal", + "context": "Editor && vim_mode == normal && !VimWaiting && !menu", "bindings": { "space s f": "file_finder::Toggle", "space c a": "editor::ToggleCodeActions", - "space o t": "terminal_panel::ToggleFocus", "space o l": "assistant::ToggleFocus", "space o p": "projects::OpenRecent", "alt-.": "pane::ActivateNextItem", @@ -24,22 +23,87 @@ "alt-1": "project_panel::ToggleFocus", "alt-2": "outline_panel::ToggleFocus", "alt-3": "collab_panel::ToggleFocus", + "space o t": "terminal_panel::ToggleFocus", "alt-4": "editor::ToggleTabBar", "ctrl-d": ["vim::ScrollDown", "editor::ScrollCursorCenter"], - "ctrl-u": ["vim::ScrollUp", "editor::ScrollCursorCenter"] + "ctrl-u": ["vim::ScrollUp", "editor::ScrollCursorCenter"], + "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"], + "space a c": "assistant::ToggleFocus", + "space r r": "editor::Rename", + "g d": "editor::GoToDefinition", + "g D": "editor::GoToDefinitionSplit", + "g i": "editor::GoToImplementation", + "g I": "editor::GoToImplementationSplit", + "g t": "editor::GoToTypeDefinition", + "g T": "editor::GoToTypeDefinitionSplit", + "g r": "editor::FindAllReferences", + "] d": "editor::GoToDiagnostic", + "[ d": "editor::GoToPrevDiagnostic", + "s s": "outline::Toggle", + "s S": "project_symbols::Toggle" } }, { - "context": "vim_mode == visual", + "context": "(vim_mode == visual) && !VimWaiting && !menu", "bindings": { "shift-j": "editor::MoveLineDown", "shift-k": "editor::MoveLineUp" } }, + { + "context": "Workspace && !vim_mode == insert", + "bindings": {} + }, + { + "context": "OutlinePanel", + "bindings": { + "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"], + "shift-j": "menu::SelectNext", + "shift-k": "menu::SelectPrev" + } + }, { "context": "Terminal", "bindings": { - "ctrl-w": null + "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"] + } + }, + { + "context": "ProjectPanel && not_editing", + "bindings": { + "a": "project_panel::NewFile", + "A": "project_panel::NewDirectory", + "r": "project_panel::Rename", + "d": "project_panel::Delete", + "x": "project_panel::Cut", + "c": "project_panel::Copy", + "p": "project_panel::Paste", + // Close project panel as project file panel on the right + "q": "workspace::ToggleRightDock", + "space e": "workspace::ToggleRightDock", + // Navigate between panel + "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"] + } + }, + { + "context": "Dock", + "bindings": { + "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"] } } ] diff --git a/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/settings.json b/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/settings.json index 6370008..7047d1e 100644 --- a/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/settings.json +++ b/desktop/configs/zed/.var/app/dev.zed.Zed/config/zed/settings.json @@ -7,30 +7,131 @@ // custom settings, run `zed: open default settings` from the // command palette { - "chat_panel": { + // Move all panel to the right + "project_panel": { + "button": true, + "dock": "right", + "git_status": true + }, + "outline_panel": { "dock": "right" }, + "collaboration_panel": { + "dock": "left" + }, + // Move some unnecessary panels to the left + "notification_panel": { + "dock": "left" + }, + "chat_panel": { + "dock": "left" + }, "assistant": { "default_model": { - "provider": "zed.dev", - "model": "claude-3-5-sonnet-20240620" + "provider": "copilot_chat", + "model": "claude-3-5-sonnet" }, "version": "2" }, "tab_bar": { "show": true }, + "indent_guides": { + "enabled": true, + "coloring": "indent_aware" + }, + "inlay_hints": { + "enabled": true + }, + "languages": { + "Go": { + "language_servers": ["gopls", "golangci-lint"] + }, + "TypeScript": { + // Refer https://github.com/jellydn/ts-inlay-hints for how to setup for Neovim and VSCode + "inlay_hints": { + "enabled": true, + "show_parameter_hints": false, + "show_other_hints": true, + "show_type_hints": true + } + }, + "Python": { + "format_on_save": { "language_server": { "name": "ruff" } }, + "formatter": { "language_server": { "name": "ruff" } }, + "language_servers": ["pyright", "ruff"] + } + }, + "lsp": { + "golangci-lint": { + "initialization_options": { + "command": [ + "golangci-lint", + "run", + "--enable-all", + "--disable", + "lll", + "--out-format", + "json", + "--issues-exit-code=1" + ] + } + }, + "pyright": { + "settings": { + "python.analysis": { + "diagnosticMode": "workspace" + // "typeCheckingMode": "strict" + } + } + } + }, + "file_types": { + "Dockerfile": ["Dockerfile", "Dockerfile.*"], + "JSON": ["json", "jsonc", "*.code-snippets"] + }, + "file_scan_exclusions": [ + "**/.git", + "**/.svn", + "**/.hg", + "**/CVS", + "**/.DS_Store", + "**/Thumbs.db", + "**/.classpath", + "**/.settings", + // above is default from Zed + "**/out", + "**/dist", + "**/.husky", + "**/.turbo", + "**/.vscode-test", + "**/.vscode", + "**/.next", + "**/.storybook", + "**/.tap", + "**/.nyc_output", + "**/report", + "**/node_modules" + ], "telemetry": { "diagnostics": false, "metrics": false }, + "scrollbar": { + "show": "never" + }, "vim_mode": true, "relative_line_numbers": true, "ui_font_size": 16, - "buffer_font_size": 16, - "theme": { - "mode": "system", - "light": "One Light", - "dark": "Solarized Dark" + "buffer_font_size": 18, + "buffer_font_family": "CartographCF Nerd Font", + "theme": "Le Blackque orange italic", + "terminal": { + "dock": "bottom", + "detect_venv": { + "on": { + "activate_script": "fish" + } + } } }