diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json index 63c2d1e..538af3e 100644 --- a/nvim/.config/nvim/coc-settings.json +++ b/nvim/.config/nvim/coc-settings.json @@ -45,5 +45,6 @@ "coc.source.OmniSharp.shortcut": "󰆧 ", "pyright.inlayHints.variableTypes": false, "pyright.inlayHints.parameterTypes": false, - "pyright.inlayHints.functionReturnTypes": false + "pyright.inlayHints.functionReturnTypes": false, + "python.formatting.provider": "null" } diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 956a690..154fd64 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -3,7 +3,7 @@ require("config.keymap") require("config.run") require("plugins") -local lsp = "coc" +local lsp = "mason" -- PLUGINS require("lazy").setup({ @@ -16,7 +16,6 @@ require("lazy").setup({ { import = "plugins.tmux_navigator" }, { import = "plugins.lualine" }, { import = "plugins.autopairs" }, - { import = "plugins.nvim-tree" }, { import = "plugins.which-key" }, { import = "plugins.telescope" }, { import = "plugins.omnisharp" }, diff --git a/nvim/.config/nvim/lua/config/run.lua b/nvim/.config/nvim/lua/config/run.lua index e44be17..94244cd 100644 --- a/nvim/.config/nvim/lua/config/run.lua +++ b/nvim/.config/nvim/lua/config/run.lua @@ -30,3 +30,14 @@ new_run_command("go run .", "go", "Run Go Project") new_run_command("cargo run", "rust", "Cargo run") new_run_command("uv run main.py", "python", "Run Python Project") new_run_command("dotnet run Project.cs", "cs", "Run Dotnet Project") + + +vim.api.nvim_create_autocmd("BufRead", { + pattern = "*.jsx", + command = "set filetype=javascriptreact" +}) + +vim.api.nvim_create_autocmd("BufRead", { + pattern = "*.tsx", + command = "set filetype=typescriptreact" +}) diff --git a/zsh/.zshrc b/zsh/.zshrc index 7584f8b..0e30f26 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -8,7 +8,11 @@ eval "$(starship init zsh)" function yy() { local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" - yazi "$@" --cwd-file="$tmp" + if command -v yazi &>/dev/null; then + yazi "$@" --cwd-file="$tmp" + else + nvim . + fi if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then cd -- "$cwd" fi