diff --git a/.config/VSCodium/User/keybindings.json b/.config/VSCodium/User/keybindings.json index 026233e0..836221cf 100644 --- a/.config/VSCodium/User/keybindings.json +++ b/.config/VSCodium/User/keybindings.json @@ -84,7 +84,7 @@ "command": "-workbench.action.showAllSymbols" }, { - "key": "ctrl+t", + "key": "ctrl+\\", "command": "workbench.action.terminal.toggleTerminal", "when": "terminal.active" }, @@ -276,8 +276,13 @@ "args": "" }, { - "key": "h", + "key": "shift+h", "command": "toggleexcludedfiles.toggle", "when": "filesExplorerFocus" - } + }, + { + "key": "ctrl+shift+a", + "command": "-toggleexcludedfiles.toggle", + "when": "filesExplorerFocus" + }, ] \ No newline at end of file diff --git a/.config/VSCodium/User/settings.json b/.config/VSCodium/User/settings.json index 281a707b..68427ba6 100644 --- a/.config/VSCodium/User/settings.json +++ b/.config/VSCodium/User/settings.json @@ -107,39 +107,39 @@ }, // Toggle excluded files "files.exclude": { - "**/.git": true, - "**/.svn": true, - "**/.hg": true, - "**/CVS": true, - "**/.DS_Store": true, - "**/Thumbs.db": true, - "**/node_modules": true, - "**/.next": true, - "**/.husky": true, - "**/drizzle": true, - "**/dist": true, - "**/.todo.md": true, - "**/.vscode": true, - "**/.eslintrc.cjs": true, - "**/.editorconfig": true, - "**/.gitignore": true, - "**/.lintstagedrc.mjs": true, - "**/.markdownlint.json": true, - "**/.markdownlintignore": true, - "**/.prettierignore": true, - "**/bun.lockb": true, - "**/cspell.json": true, - "**/package-lock.json": true, - "**/pnpm-lock.yaml": true, - "**/next-env.d.ts": true, - "**/postcss.config.cjs": true, - "**/prettier.config.js": true, - "**/README.md": true, - "**/next.config.js": true, - "**/tailwind.config.ts": true, - "**/drizzle.config.ts": true, - "**/migrate.ts": true, - "**/.env.example": true + "**/.git": false, + "**/.svn": false, + "**/.hg": false, + "**/CVS": false, + "**/.DS_Store": false, + "**/Thumbs.db": false, + "**/node_modules": false, + "**/.next": false, + "**/.husky": false, + "**/drizzle": false, + "**/dist": false, + "**/.todo.md": false, + "**/.vscode": false, + "**/.eslintrc.cjs": false, + "**/.editorconfig": false, + "**/.gitignore": false, + "**/.lintstagedrc.mjs": false, + "**/.markdownlint.json": false, + "**/.markdownlintignore": false, + "**/.prettierignore": false, + "**/bun.lockb": false, + "**/cspell.json": false, + "**/package-lock.json": false, + "**/pnpm-lock.yaml": false, + "**/next-env.d.ts": false, + "**/postcss.config.cjs": false, + "**/prettier.config.js": false, + "**/README.md": false, + "**/next.config.js": false, + "**/tailwind.config.ts": false, + "**/drizzle.config.ts": false, + "**/migrate.ts": false, + "**/.env.example": false }, // Neovim "extensions.experimental.affinity": { @@ -173,7 +173,7 @@ "animations.Smooth-Mode": true, "animations.Install-Method": "Apc Customize UI++", "apc.imports": [ - "file:///home/matt/.vscode/extensions/brandonkirbyson.vscode-animations-2.0.1/dist/updateHandler.js" + "file:///home/matt/.vscode-oss/extensions/brandonkirbyson.vscode-animations-2.0.1/dist/updateHandler.js" ], // Language specific "markdown.preview.scrollEditorWithPreview": true, diff --git a/.config/fish/functions/cdzc.fish b/.config/fish/functions/cdzc.fish new file mode 100644 index 00000000..2a30f784 --- /dev/null +++ b/.config/fish/functions/cdzc.fish @@ -0,0 +1,10 @@ +function cdzc --description 'Open directories from zoxide in vscode' + set selected_dir (zi) + + if test -n "$selected_dir" + cd "$selected_dir" + codium -r . + else + commandline -f repaint + end +end diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 763e35ba..9f92f0c9 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -109,7 +109,7 @@ "nvim-various-textobjs": { "branch": "main", "commit": "ca9e6f290c25f6a3168c5dd64b9ef0a8000263d9" }, "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, "nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" }, - "octo.nvim": { "branch": "master", "commit": "613d73a4b00c365f5a9744fc7e9549cd646291fe" }, + "octo.nvim": { "branch": "master", "commit": "5a04268e54c3f538702ef4f03f635d69c569d23e" }, "oil.nvim": { "branch": "master", "commit": "dd432e76d01eda08b8658415588d011009478469" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, "outline.nvim": { "branch": "main", "commit": "4ad4e8e2b9c797d68774b0d88f91c92183975639" }, @@ -157,6 +157,7 @@ "urlview.nvim": { "branch": "main", "commit": "7d622e11adbc2cac5bba62345ade9b6672d564a4" }, "venv-selector.nvim": { "branch": "main", "commit": "79709f8ad99ac2082d99a713985f3da0c924f4a2" }, "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, + "vim-carbon-now-sh": { "branch": "master", "commit": "31a18d26fc27e7bd5786da092ed886273b4cf639" }, "vim-dadbod": { "branch": "master", "commit": "738cfc2ea6a1510fe23cba9006fef9291be70f7b" }, "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, "vim-dadbod-ui": { "branch": "master", "commit": "e99dcfd5162d9b9b4b24a5d035cf114315f1aeec" }, diff --git a/.config/nvim/lua/plugins/extras/util/vscode.lua b/.config/nvim/lua/plugins/extras/util/vscode.lua index 125ecab3..26d2b0b9 100644 --- a/.config/nvim/lua/plugins/extras/util/vscode.lua +++ b/.config/nvim/lua/plugins/extras/util/vscode.lua @@ -40,9 +40,9 @@ vim.o.spell = false vim.notify = vscode.notify vim.g.clipboard = vim.g.vscode_clipboard -local function vscode_action(cmd) +local function vscode_action(cmd, opts) return function() - vscode.action(cmd) + vscode.action(cmd, opts) end end @@ -60,8 +60,9 @@ vim.api.nvim_create_autocmd("User", { map("n", "xx", vscode_action("workbench.actions.view.problems")) -- open file explorer in left sidebar map("n", "e", vscode_action("workbench.view.explorer")) - -- Open terminal - map("n", "ft", vscode_action("workbench.action.terminal.focus")) + -- terminal + map("n", [[]], vscode_action("workbench.action.terminal.toggleTerminal")) + map("n", "fts", vscode_action("workbench.action.terminal.newWithCwd")) -- close editor map("n", "bd", vscode_action("workbench.action.closeActiveEditor")) -- breakpoints @@ -70,7 +71,7 @@ vim.api.nvim_create_autocmd("User", { map("n", "|", vscode_action("workbench.action.splitEditorRight")) map("n", "-", vscode_action("workbench.action.splitEditorDown")) -- explorer - map("n", "h", vscode_action("toggleexcludedfiles.toggle")) + map("n", "", vscode_action("toggleexcludedfiles.toggle")) -- LSP actions map("n", "ca", vscode_action("editor.action.codeAction")) map("n", "gy", vscode_action("editor.action.goToTypeDefinition")) @@ -84,6 +85,17 @@ vim.api.nvim_create_autocmd("User", { map("n", "cR", vscode_action("editor.action.refactor")) -- markdown preview map("n", "cp", vscode_action("markdown.showPreviewToSide")) + -- project manager + map("n", "fp", vscode_action("projectManager.listProjects")) + -- zoxide + map( + "n", + "fz", + vscode_action( + "terminalCommandKeys.run", + { args = { cmd = "cdzc", newTerminal = false, saveAllFiles = false, showTerminal = true, focus = true } } + ) + ) end, }) diff --git a/.config/nvim/rules/biome.json b/.config/nvim/rules/biome.json index fe004c38..3494b699 100644 --- a/.config/nvim/rules/biome.json +++ b/.config/nvim/rules/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.5.1/schema.json", + "$schema": "https://biomejs.dev/schemas/1.5.2/schema.json", "organizeImports": { "enabled": true },