diff --git a/configs/nvim/lua/aleidk/options.lua b/configs/nvim/lua/aleidk/options.lua index 45a3ca3..eb0f4419 100644 --- a/configs/nvim/lua/aleidk/options.lua +++ b/configs/nvim/lua/aleidk/options.lua @@ -164,6 +164,7 @@ vim.lsp.enable({ "biome", "fish_lsp", "gleam", + "gopls", "hyprls", "intelephense", "jsonls", diff --git a/configs/nvim/lua/aleidk/plugins/formatter.lua b/configs/nvim/lua/aleidk/plugins/formatter.lua index 58deae9..2e8cc96 100644 --- a/configs/nvim/lua/aleidk/plugins/formatter.lua +++ b/configs/nvim/lua/aleidk/plugins/formatter.lua @@ -62,6 +62,14 @@ return { config = function(_, opts) require("conform").setup(opts) + vim.api.nvim_create_autocmd("FileType", { + pattern = { "php" }, + callback = function(bufnr) + vim.b[bufnr].disable_autoformat + end, + }) + end, + local function toggleAutoFormat() -- to make this global, change b to g if vim.b.disable_autoformat == nil then diff --git a/configs/nvim/lua/aleidk/plugins/treesitter.lua b/configs/nvim/lua/aleidk/plugins/treesitter.lua index 2a63a3d..caab40c 100644 --- a/configs/nvim/lua/aleidk/plugins/treesitter.lua +++ b/configs/nvim/lua/aleidk/plugins/treesitter.lua @@ -21,7 +21,7 @@ return { init = function() -- HACK: for filetypes that doesn't start treesitter hightlight on it's own vim.api.nvim_create_autocmd("FileType", { - pattern = { "gleam" }, + pattern = { "gleam", "go" }, callback = function() vim.treesitter.start() end, diff --git a/configs/uwsm/env b/configs/uwsm/env index 590a89c..d2e4a6b 100644 --- a/configs/uwsm/env +++ b/configs/uwsm/env @@ -5,7 +5,7 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export QT_QPA_PLATFORMTHEME=qt5ct export MOZ_ENABLE_WAYLAND=1 export XCURSOR_SIZE=24 -export GTK_THEME=catppuccin-macchiato-teal-standard+default +export GTK_THEME=catppuccin-macchiato-teal-standard-default export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/rbw/ssh-agent-socket export EDITOR=nvim