overhauled plugins

lua/haelnorr/init.lua

@@ -8,7 +8,7 @@ local HaelnorrGroup = augroup('Haelnorr', {})
 local autocmd = vim.api.nvim_create_autocmd
 
 function R(name)
-	require("plenary.reload").reload_module(name)
+    require("plenary.reload").reload_module(name)
 end
 
 autocmd('LspAttach', {

lua/haelnorr/lazy/aerial.lua

@@ -0,0 +1,21 @@
+return {
+    "stevearc/aerial.nvim",
+    opts = {},
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter",
+        "nvim-tree/nvim-web-devicons"
+    },
+    config = function()
+        require("aerial").setup({
+            on_attach = function(bufnr)
+                vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
+                vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
+            end,
+            layout = {
+                default_direction = "prefer_left",
+                min_width = 10
+            }
+        })
+        vim.keymap.set("n", "<leader>pa", "<cmd>AerialToggle!<CR>")
+    end
+}

lua/haelnorr/lazy/comment.lua

@@ -0,0 +1,3 @@
+return {
+    "numToStr/Comment.nvim",
+}

lua/haelnorr/lazy/conform.lua

@@ -0,0 +1,48 @@
+return {
+  "stevearc/conform.nvim",
+  event = { "BufWritePre" },
+  cmd = { "ConformInfo" },
+  keys = {
+    {
+      -- Customize or remove this keymap to your liking
+      "<leader>f",
+      function()
+        require("conform").format({ async = true })
+      end,
+      mode = "",
+      desc = "Format buffer",
+    },
+  },
+  -- This will provide type hinting with LuaLS
+  ---@module "conform"
+  ---@type conform.setupOpts
+  opts = {
+    -- Define your formatters
+    formatters_by_ft = {
+      lua = { "stylua" },
+      python = { "isort", "black" },
+      javascript = { "prettierd", "prettier", stop_after_first = true },
+      typescript = { "prettierd", "prettier", stop_after_first = true },
+      typescriptreact = { "prettierd", "prettier", stop_after_first = true },
+      json = { "prettierd", "prettier", stop_after_first = true },
+      html = { "prettierd", "prettier", stop_after_first = true },
+      css = { "prettierd", "prettier", stop_after_first = true },
+    },
+    -- Set default options
+    default_format_opts = {
+      lsp_format = "fallback",
+    },
+    -- Set up format-on-save
+    format_on_save = { timeout_ms = 500 },
+    -- Customize formatters
+    formatters = {
+      shfmt = {
+        prepend_args = { "-i", "2" },
+      },
+    },
+  },
+  init = function()
+    -- If you want the formatexpr, here is the place to set it
+    vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+  end,
+}

lua/haelnorr/lazy/feline.lua

@@ -1,5 +1,5 @@
 return {
-    'feline-nvim/feline.nvim',
+    'freddiehaddad/feline.nvim',
     config = function ()
         local ctp_feline = require('catppuccin.groups.integrations.feline')
 

lua/haelnorr/lazy/lsp.lua

@@ -27,8 +27,6 @@ return {
         require("mason-lspconfig").setup({
             ensure_installed = {
                 "lua_ls",
-                "ansiblels",
-                "astro",
                 "bashls",
                 "css_variables",
                 "cssls",
@@ -38,7 +36,6 @@ return {
                 "html",
                 "jsonls",
                 "pyright",
-                "tailwindcss",
             },
             handlers = {
                 function(server_name) -- default handler (optional)

lua/haelnorr/lazy/markdown-preview.lua

@@ -0,0 +1,9 @@
+return {
+  "iamcco/markdown-preview.nvim",
+  cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+  build = "cd app && yarn install",
+  init = function()
+    vim.g.mkdp_filetypes = { "markdown" }
+  end,
+  ft = { "markdown" },
+}

lua/haelnorr/lazy/snippets.lua

@@ -1,29 +0,0 @@
-return {
-    {
-        "L3MON4D3/LuaSnip",
-        -- follow latest release.
-        version = "v2.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
-        -- install jsregexp (optional!).
-        build = "make install_jsregexp",
-
-        dependencies = { "rafamadriz/friendly-snippets" },
-
-        config = function()
-            local ls = require("luasnip")
-            ls.filetype_extend("javascript", { "jsdoc" })
-
-            --- TODO: What is expand?
-            vim.keymap.set({"i"}, "<C-s>e", function() ls.expand() end, {silent = true})
-
-            vim.keymap.set({"i", "s"}, "<C-s>;", function() ls.jump(1) end, {silent = true})
-            vim.keymap.set({"i", "s"}, "<C-s>,", function() ls.jump(-1) end, {silent = true})
-
-            vim.keymap.set({"i", "s"}, "<C-E>", function()
-                if ls.choice_active() then
-                    ls.change_choice(1)
-                end
-            end, {silent = true})
-        end,
-    }
-}
-

lua/haelnorr/lazy/windows.lua

@@ -0,0 +1,13 @@
+return {
+    "anuvyklack/windows.nvim",
+    dependencies = {
+        "anuvyklack/middleclass",
+        "anuvyklack/animation.nvim"
+    },
+    config = function()
+        vim.o.winwidth = 10
+        vim.o.winminwidth = 10
+        vim.o.equalalways = false
+        require('windows').setup()
+    end
+}

lua/haelnorr/lazy/zenmode.lua

@@ -1,19 +0,0 @@
-
-return {
-    "folke/zen-mode.nvim",
-    config = function()
-        vim.keymap.set("n", "<leader>zz", function()
-            require("zen-mode").setup {
-                window = {
-                    width = 90,
-                    options = { }
-                },
-            }
-            require("zen-mode").toggle()
-            vim.wo.wrap = false
-            vim.wo.number = true
-            vim.wo.rnu = true
-        end)
-    end
-}
-

lua/haelnorr/remap.lua

@@ -16,15 +16,24 @@ vim.keymap.set("n", "N", "Nzzzv")
 vim.keymap.set("x", "<leader>p", [["_dP]])
 
 -- yanks to system clipboard
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
+vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 vim.keymap.set("n", "<leader>Y", [["+Y]])
 
--- pretty sure this deletes without replacing buffer but idk
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
+-- deletes without replacing buffer
+vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
 
--- idk something with tmux, ill come back to this
-vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
-vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
+-- formats file using LSP
+-- vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
+vim.keymap.set("", "<leader>f", function()
+    require("conform").format({ async = true }, function(err)
+        if not err then
+            local mode = vim.api.nvim_get_mode().mode
+            if vim.startswith(string.lower(mode), "v") then
+                vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)
+            end
+        end
+    end)
+end, { desc = "Format code" })
 
 vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
 vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
@@ -43,4 +52,3 @@ vim.keymap.set("n", "<C-Q>", function()
         vim.opt.colorcolumn = ""
     end
 end)
-