diff --git a/nvim/dot-config/nvim/after/plugin/lspconfig.lua b/nvim/dot-config/nvim/after/plugin/lspconfig.lua index 6f95a35..de9e077 100644 --- a/nvim/dot-config/nvim/after/plugin/lspconfig.lua +++ b/nvim/dot-config/nvim/after/plugin/lspconfig.lua @@ -89,15 +89,26 @@ local eslint = { lintSource = "eslint", } +local shellcheck = { + lintCommand = "shellcheck -f gcc -x", + lintSource = "shellcheck", + lintFormats = { + "%f:%l:%c: %trror: %m", + "%f:%l:%c: %tarning: %m", + "%f:%l:%c: %tote: %m", + }, +} + local servers = { efm = { - filetypes = { "typescript", "typescriptreact" }, + filetypes = { "typescript", "typescriptreact", "sh" }, init_options = { documentFormatting = true }, settings = { rootMarkers = { ".git/" }, languages = { typescript = { prettier, eslint }, typescriptreact = { prettier, eslint }, + sh = { shellcheck }, }, }, }, diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index c6108d0..0e76f82 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -27,31 +27,31 @@ local function bootstrap_paq(packages) end bootstrap_paq { - "savq/paq-nvim", - "nvim-lua/plenary.nvim", - "lewis6991/gitsigns.nvim", - "kyazdani42/nvim-web-devicons", - "lukas-reineke/indent-blankline.nvim", - "nvim-lualine/lualine.nvim", - "windwp/nvim-autopairs", - "mickael-menu/zk-nvim", - { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, - { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, { "catppuccin/nvim", as = "catppuccin" }, - { "williamboman/mason.nvim", branch = "v1.6.0" }, + { "lukas-reineke/indent-blankline.nvim", branch = "v2.20.7" }, { "lukas-reineke/lsp-format.nvim", branch = "v2.5.1" }, + { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, + { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, { "nvim-treesitter/nvim-treesitter", branch = "master" }, - "nvim-treesitter/playground", - "nvim-treesitter/nvim-treesitter-textobjects", - "nvim-treesitter/nvim-treesitter-context", - "stevearc/oil.nvim", - "neovim/nvim-lspconfig", - "hrsh7th/nvim-cmp", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", + { "stevearc/oil.nvim", branch = "v1.0.0" }, + { "williamboman/mason.nvim", branch = "v1.6.0" }, "L3MON4D3/LuaSnip", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + "hrsh7th/nvim-cmp", + "lewis6991/gitsigns.nvim", + "mickael-menu/zk-nvim", + "neovim/nvim-lspconfig", "nvim-lua/lsp-status.nvim", + "nvim-lua/plenary.nvim", + "nvim-lualine/lualine.nvim", + "nvim-tree/nvim-web-devicons", + "nvim-treesitter/nvim-treesitter-context", + "nvim-treesitter/nvim-treesitter-textobjects", + "nvim-treesitter/playground", "onsails/lspkind.nvim", + "savq/paq-nvim", + "windwp/nvim-autopairs", } diff --git a/wezterm/dot-config/wezterm/wezterm.lua b/wezterm/dot-config/wezterm/wezterm.lua index 3fb7681..8a5553a 100644 --- a/wezterm/dot-config/wezterm/wezterm.lua +++ b/wezterm/dot-config/wezterm/wezterm.lua @@ -4,7 +4,7 @@ return { font = wezterm.font 'JetBrainsMono Nerd Font Mono', color_scheme = 'Catppuccin Mocha', harfbuzz_features = { "zero" }, - front_end = "OpenGL", + front_end = "Software", use_fancy_tab_bar = true, window_padding = { left = 0,