diff --git a/init.lua b/init.lua index f95ec48..ae264c5 100644 --- a/init.lua +++ b/init.lua @@ -19,7 +19,7 @@ vim.g.maplocalleader = ' ' -- For a full summary of this table, run ":lua vim.inspect(vim.g.os_uname)" -- Shows up as undefined but executes and behaves flawlessly as of 2024-08-18 ---@diagnostic disable-next-line: undefined-field -vim.g.os_uname = vim.loop.os_uname() +vim.g.os_uname = vim.uv.os_uname() vim.g.sysname = vim.g.os_uname.sysname -- "Linux, FreeBSD, ..." vim.g.arch = vim.g.os_uname.machine -- "x86_64, ..." diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 51aae05..0c1ba7e 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -31,7 +31,12 @@ return { -- Autoformat -- -- You can use a sub-list to tell conform to run *until* a formatter -- is found. + nu = { 'nufmt' }, + bash = { 'shfmt' }, + zsh = { 'shfmt' }, + rust = { "rustfmt", lsp_format = "fallback" }, javascript = { { 'prettierd', 'prettier' } }, + html = { { 'prettierd', 'prettier' } }, java = { 'clang-format' }, }, }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index c3ef163..4ba42f4 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,12 +9,12 @@ return { -- Fuzzy Finder (files, lsp, etc) -- `build` is used to run some command when the plugin is installed/updated. -- This is only run then, not every time Neovim starts up. - build = 'make', + build = 'gmake', -- `cond` is a condition used to determine whether this plugin should be -- installed and loaded. cond = function() - return vim.fn.executable 'make' == 1 + return vim.fn.executable 'gmake' == 1 end, }, { 'nvim-telescope/telescope-ui-select.nvim' },