Compare commits

..

No commits in common. "4fe2ba1fa848c919ef3124eef8916a4d5b63c396" and "02dd9c13be2fa8303f75577786f93642021bfffb" have entirely different histories.

3 changed files with 29 additions and 60 deletions

View file

@ -13,17 +13,29 @@
"alt-c": "pane::CloseActiveItem", "alt-c": "pane::CloseActiveItem",
"ctrl-shift-w": null, "ctrl-shift-w": null,
"ctrl-q": null, "ctrl-q": null,
"ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], "ctrl-h": [
"ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], "workspace::ActivatePaneInDirection",
"ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], "Left"
"ctrl-j": ["workspace::ActivatePaneInDirection", "Down"] ],
"ctrl-l": [
"workspace::ActivatePaneInDirection",
"Right"
],
"ctrl-k": [
"workspace::ActivatePaneInDirection",
"Up"
],
"ctrl-j": [
"workspace::ActivatePaneInDirection",
"Down"
],
} }
}, },
{ {
"context": "Workspace", "context": "Workspace",
"bindings": { "bindings": {
"f5": "workspace::ToggleLeftDock", "f5": "workspace::ToggleLeftDock",
"alt-v": "terminal_panel::ToggleFocus" "alt-v": "terminal_panel::ToggleFocus",
} }
}, },
{ {
@ -42,12 +54,6 @@
"ctrl-w": "terminal::ToggleViMode" "ctrl-w": "terminal::ToggleViMode"
} }
}, },
{
"context": "Editor",
"bindings": {
"alt-enter": "repl::Run"
}
},
{ {
"context": "VimControl && !menu", "context": "VimControl && !menu",
"bindings": { "bindings": {
@ -80,7 +86,7 @@
"line": true "line": true
} }
} }
] ],
} }
}, },
{ {
@ -92,8 +98,7 @@
"task_name": "lazygit", "task_name": "lazygit",
"reveal_target": "center" "reveal_target": "center"
} }
], ]
"space f f": "editor::Format"
} }
}, },
{ {
@ -102,14 +107,14 @@
"ctrl-l": "vim::Right", "ctrl-l": "vim::Right",
"ctrl-h": "vim::Left", "ctrl-h": "vim::Left",
"ctrl-j": "vim::Down", "ctrl-j": "vim::Down",
"ctrl-k": "vim::Up" "ctrl-k": "vim::Up",
} }
}, },
{ {
"context": "Editor && (showing_code_actions || showing_completions)", "context": "Editor && (showing_code_actions || showing_completions)",
"bindings": { "bindings": {
"shift-tab": "editor::ContextMenuPrev", "shift-tab": "editor::ContextMenuPrev",
"tab": "editor::ContextMenuNext" "tab": "editor::ContextMenuNext",
} }
}, },
{ {
@ -129,7 +134,7 @@
{ {
"skip_prompt": false "skip_prompt": false
} }
] ],
}
} }
},
] ]

View file

@ -23,8 +23,8 @@
"version": "2" "version": "2"
}, },
"buffer_font_size": 17, "buffer_font_size": 17,
"format_on_save": "prettier", "format_on_save": "language_server",
"formatter": "prettier", "formatter": "language_server",
"buffer_font_family": "FiraCode Nerd Font", "buffer_font_family": "FiraCode Nerd Font",
"tab_size": 4, "tab_size": 4,
"vim_mode": true, "vim_mode": true,
@ -61,40 +61,13 @@
"cargo": { "cargo": {
"features": "all", "features": "all",
"allTargets": true "allTargets": true
}
}
}, },
"ruff": {
"initialization_options": {
"settings": {
// Ruff server settings goes here
"lineLength": 80,
"lint": {
"extendSelect": ["I"]
}
}
} }
} }
}, },
"soft_wrap": "editor_width", "soft_wrap": "editor_width",
"show_wrap_guides": true, "show_wrap_guides": true,
"wrap_guides": [80], "wrap_guides": [
"languages": { 80
"Python": { ],
"language_servers": ["ruff"],
"format_on_save": "language_server",
"formatter": [
{
"language_server": {
"name": "ruff"
}
}
]
// "language_servers": ["pyright", "ruff"]
},
"Rust": {
"format_on_save": "language_server",
"formatter": "language_server"
}
}
} }

9
.vimrc
View file

@ -129,12 +129,3 @@ nnoremap zN [s
" same as above but only with bad words (unrecognized) " same as above but only with bad words (unrecognized)
nnoremap Zn ]S nnoremap Zn ]S
nnoremap ZN [S nnoremap ZN [S
" how to move in insert
vnoremap <leader>y "+y
nnoremap <leader>Y "+Y
nnoremap <leader>y "+y
nnoremap <leader>yy "+yy
" back to normal mode with jk in insert
imap jk <esc>