chore: update to black

This commit is contained in:
jabuxas 2024-12-20 13:12:59 -03:00
parent efeeab9bfc
commit 7319efbe3e
7 changed files with 188 additions and 26 deletions

View File

@ -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 # 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 # https://github.com/alacritty/alacritty/tree/master#configuration
import = ["~/.config/alacritty/white.toml"] import = ["~/.config/alacritty/black.toml"]
[window] [window]

View File

@ -1,11 +1,7 @@
output { output {
HDMI-A-1 pos 0 0 mode --custom 2560x1080@75Hz adaptive_sync on 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 DP-3 pos 2560 0 mode --custom 2560x1080@60Hz adaptive_sync on
DP-1 disable pos 0 -1080
# old setup
# # HDMI-A-1 pos 0 0
# DP-3 disable pos 0 -1080
# DP-2 pos 2560 0
} }
default_border pixel 2 default_border pixel 2

View File

@ -2,8 +2,8 @@ for_window [class="Anki" title="Add"] floating enable
for_window [class="vrising.exe"] move to workspace 9 for_window [class="vrising.exe"] move to workspace 9
for_window [shell=".*"] inhibit_idle fullscreen for_window [shell=".*"] inhibit_idle fullscreen
for_window [app_id=".*office.*"] move to workspace 5 for_window [app_id=".*office.*"] move to workspace 5
for_window [app_id="WebCord"] move to workspace 6 for_window [app_id="WebCord"] move to workspace 2
for_window [class="WebCord"] move to workspace 6 for_window [class="WebCord"] move to workspace 2
for_window [class="Spotify"] move to workspace 4 for_window [class="Spotify"] move to workspace 4
for_window [class="Steam"] move to workspace 8 for_window [class="Steam"] move to workspace 8
for_window [class="steam"] move to workspace 8 for_window [class="steam"] move to workspace 8

View File

@ -1 +1 @@
/yang/.config/tmux/themes/tmux-white.conf /yang/.config/tmux/themes/tmux-monochrome.conf

View File

@ -4,18 +4,19 @@
/* padding: 0; */ /* padding: 0; */
/* margin: 0; */ /* margin: 0; */
font-size: 18px; font-size: 18px;
font-family: CozetteVector; font-family: CartographCF Nerd Font;
font-style: italic; font-style: italic;
} }
window#waybar { window#waybar {
background: #0a0c10; background: #0a0c10;
color: #f0f3f6; color: #f0f3f6;
margin: 20px; margin: 10px;
} }
#workspaces button { #workspaces button {
padding: 0; margin-left: 2px;
padding: 2px 8px;
} }
#workspaces button:hover, #workspaces button:hover,

View File

@ -11,11 +11,10 @@
"bindings": {} "bindings": {}
}, },
{ {
"context": "Editor && vim_mode == normal", "context": "Editor && vim_mode == normal && !VimWaiting && !menu",
"bindings": { "bindings": {
"space s f": "file_finder::Toggle", "space s f": "file_finder::Toggle",
"space c a": "editor::ToggleCodeActions", "space c a": "editor::ToggleCodeActions",
"space o t": "terminal_panel::ToggleFocus",
"space o l": "assistant::ToggleFocus", "space o l": "assistant::ToggleFocus",
"space o p": "projects::OpenRecent", "space o p": "projects::OpenRecent",
"alt-.": "pane::ActivateNextItem", "alt-.": "pane::ActivateNextItem",
@ -24,22 +23,87 @@
"alt-1": "project_panel::ToggleFocus", "alt-1": "project_panel::ToggleFocus",
"alt-2": "outline_panel::ToggleFocus", "alt-2": "outline_panel::ToggleFocus",
"alt-3": "collab_panel::ToggleFocus", "alt-3": "collab_panel::ToggleFocus",
"space o t": "terminal_panel::ToggleFocus",
"alt-4": "editor::ToggleTabBar", "alt-4": "editor::ToggleTabBar",
"ctrl-d": ["vim::ScrollDown", "editor::ScrollCursorCenter"], "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": { "bindings": {
"shift-j": "editor::MoveLineDown", "shift-j": "editor::MoveLineDown",
"shift-k": "editor::MoveLineUp" "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", "context": "Terminal",
"bindings": { "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"]
} }
} }
] ]

View File

@ -7,30 +7,131 @@
// custom settings, run `zed: open default settings` from the // custom settings, run `zed: open default settings` from the
// command palette // command palette
{ {
"chat_panel": { // Move all panel to the right
"project_panel": {
"button": true,
"dock": "right",
"git_status": true
},
"outline_panel": {
"dock": "right" "dock": "right"
}, },
"collaboration_panel": {
"dock": "left"
},
// Move some unnecessary panels to the left
"notification_panel": {
"dock": "left"
},
"chat_panel": {
"dock": "left"
},
"assistant": { "assistant": {
"default_model": { "default_model": {
"provider": "zed.dev", "provider": "copilot_chat",
"model": "claude-3-5-sonnet-20240620" "model": "claude-3-5-sonnet"
}, },
"version": "2" "version": "2"
}, },
"tab_bar": { "tab_bar": {
"show": true "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": { "telemetry": {
"diagnostics": false, "diagnostics": false,
"metrics": false "metrics": false
}, },
"scrollbar": {
"show": "never"
},
"vim_mode": true, "vim_mode": true,
"relative_line_numbers": true, "relative_line_numbers": true,
"ui_font_size": 16, "ui_font_size": 16,
"buffer_font_size": 16, "buffer_font_size": 18,
"theme": { "buffer_font_family": "CartographCF Nerd Font",
"mode": "system", "theme": "Le Blackque orange italic",
"light": "One Light", "terminal": {
"dark": "Solarized Dark" "dock": "bottom",
"detect_venv": {
"on": {
"activate_script": "fish"
}
}
} }
} }