diff --git a/lazy-lock.json b/lazy-lock.json index 052eaf3..2f73f47 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -26,5 +26,6 @@ "undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" }, "zig.vim": { "branch": "master", "commit": "f65ae7a570b71d7a7aa4978ff9ac327e04a36e1e" } } diff --git a/lua/mappings.lua b/lua/mappings.lua index d1b474b..3194323 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -13,6 +13,7 @@ end map({ "n", "v" }, "p", '"+p', { desc = "Paste from clipboard" }) map({ "n", "v" }, "y", '"+y', { desc = "Yank to clipboard" }) map("t", "", "", { desc = "Exit terminal" }) +map("n", "zz", "ZenMode", { desc = "Toggle ZendMode" }) -- Register LSP mappings vim.api.nvim_create_autocmd("LspAttach", { diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 71af0e0..57ad824 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -1,15 +1,28 @@ return { { "stevearc/conform.nvim", + cond = function() + local folder = "/Users/ethan/Documents/work/openfe/openfe" + local cwd = vim.loop.cwd() -- current working directory + -- Normalize both paths + local function normalize(path) + return vim.fs.normalize(path or "") + end + cwd = normalize(cwd) + folder = normalize(folder) + + -- Check if cwd starts with folder path + return cwd:sub(1, #folder) ~= folder + end, opts = { formatters_by_ft = { lua = { "stylua" }, python = { "ruff_format" }, terraform = { "tofu_fmt" }, - astro = { "biome" }, - svelte = { "biome" }, - typescript = { "biome" }, - javascript = { "biome" }, + astro = { "prettierd", "prettier", stop_after_first = true }, + svelte = { "prettierd", "prettier", stop_after_first = true }, + typescript = { "prettierd", "prettier", stop_after_first = true }, + javascript = { "prettierd", "prettier", stop_after_first = true }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/plugins/zen.lua b/lua/plugins/zen.lua new file mode 100644 index 0000000..bfe9ee6 --- /dev/null +++ b/lua/plugins/zen.lua @@ -0,0 +1,8 @@ +return { + "folke/zen-mode.nvim", + opts = { + window = { + width = 0.50, + }, + }, +}