add a multitude of fixes, modifications and lintings

nvim/cheatsheet.txt

@@ -0,0 +1 @@
+Search, Preview and Open file | <leader>ff

nvim/init.vim

@@ -1,5 +1,5 @@
 set nocompatible
-set number
+set relativenumber
 set cc=80
 set ignorecase
 hi ColorColumn ctermbg=black guibg=black
@@ -11,4 +11,9 @@ set completeopt=menu,menuone,noselect
 
 filetype plugin on
 
+augroup FormatAutogroup
+  autocmd!
+  autocmd BufWritePost * FormatWrite
+augroup END
+
 lua require('plugins')

nvim/lua/ale-config.lua

@@ -0,0 +1,16 @@
+
+vim.g.ale_fixers = {
+    ['*'] = {
+        'remove_trailing_lines',
+        'trim_whitespace'
+    },
+    ["lua"] = {
+        "lua-format"
+    },
+    ["rust"] = {
+        "rustfmt"
+    }
+}
+
+
+vim.g.ale_fix_on_save = 1

nvim/lua/autoclose-config.lua

@@ -0,0 +1,26 @@
+require('autoclose').setup(
+    {
+        keys = {
+            ["("] = { escape = false, close = true, pair = "()" },
+            ["["] = { escape = false, close = true, pair = "[]" },
+            ["{"] = { escape = false, close = true, pair = "{}" },
+
+            [">"] = { escape = true, close = false, pair = "<>" },
+            [")"] = { escape = true, close = false, pair = "()" },
+            ["]"] = { escape = true, close = false, pair = "[]" },
+            ["}"] = { escape = true, close = false, pair = "{}" },
+
+            ['"'] = { escape = true, close = true, pair = '""' },
+            ["'"] = { escape = true, close = true, pair = "''" },
+            ["`"] = { escape = true, close = true, pair = "``" },
+        },
+        options = {
+            disabled_filetypes = { "text" },
+            disable_when_touch = false,
+            touch_regex = "[%w(%[{]",
+            pair_spaces = false,
+            auto_indent = true,
+            disable_command_mode = false,
+        },
+    }
+)

nvim/lua/formatter-config.lua

@@ -0,0 +1,23 @@
+local util = require("formatter.util")
+
+require("formatter").setup({
+	logging = true,
+	log_level = vim.log.levels.WARN,
+	filetype = {
+		lua = {
+			require("formatter.filetypes.lua").stylua,
+		},
+		rust = {
+			function()
+				return {
+					exe = "rustfmt",
+					args = { "--edition 2021" },
+					stdin = true,
+				}
+			end,
+		},
+		["*"] = {
+			require("formatter.filetypes.any").remove_trailing_whitespace,
+		},
+	},
+})

nvim/lua/image-config.lua

@@ -1,12 +1,29 @@
-require('image').setup {
-    render = {
-        min_padding = 5,
-        show_label = true,
-        use_dither = true,
-        foreground_color = true,
-        background_color = true,
+-- default config
+require("image").setup({
+  backend = "kitty",
+  integrations = {
+    markdown = {
+      enabled = true,
+      clear_in_insert_mode = false,
+      download_remote_images = true,
+      only_render_image_at_cursor = false,
+      filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
     },
-    events = {
-        update_on_nvim_resize = true,
+    neorg = {
+      enabled = true,
+      clear_in_insert_mode = false,
+      download_remote_images = true,
+      only_render_image_at_cursor = false,
+      filetypes = { "norg" },
     },
-}
+  },
+  max_width = nil,
+  max_height = nil,
+  max_width_window_percentage = nil,
+  max_height_window_percentage = 50,
+  window_overlap_clear_enabled = false,                                     -- toggles images when windows are overlapped
+  window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "" },
+  editor_only_render_when_focused = false,                                  -- auto show/hide images when the editor gains/looses focus
+  tmux_show_only_in_active_window = false,                                  -- auto show/hide images in the correct Tmux window (needs visual-activity off)
+  hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp" }, -- render image files as images when opened
+})

nvim/lua/nvim-cmp-config.lua

@@ -7,86 +7,86 @@ end
 local cmp = require 'cmp'
 
 cmp.setup({
-    snippet = {
-        -- REQUIRED - you must specify a snippet engine
-        expand = function(args)
-          vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-          -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-          -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-          -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-        end,
+  snippet = {
+    -- REQUIRED - you must specify a snippet engine
+    expand = function(args)
+      vim.fn["vsnip#anonymous"](args.body)     -- For `vsnip` users.
+      -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+      -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+      -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+    end,
+  },
+  window = {
+    -- completion = cmp.config.window.bordered(),
+    -- documentation = cmp.config.window.bordered(),
+  },
+  mapping = cmp.mapping.preset.insert({
+    ['<C-Space>'] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Insert,
+      select = true,
     },
-    window = {
-        -- completion = cmp.config.window.bordered(),
-        -- documentation = cmp.config.window.bordered(),
-    },
-    mapping = cmp.mapping.preset.insert({
-        ['<C-Space>'] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.Insert,
-            select = true,
-        },
 
-        ['<Tab>'] = function(fallback)
-          if not cmp.select_next_item() then
-            if vim.bo.buftype ~= 'prompt' and has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end
-        end,
+    ['<Tab>'] = function(fallback)
+      if not cmp.select_next_item() then
+        if vim.bo.buftype ~= 'prompt' and has_words_before() then
+          cmp.complete()
+        else
+          fallback()
+        end
+      end
+    end,
 
-        ['<S-Tab>'] = function(fallback)
-          if not cmp.select_prev_item() then
-            if vim.bo.buftype ~= 'prompt' and has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end
-        end,
-    }),
-    sources = cmp.config.sources({
-        { name = 'nvim_lsp' },
-        { name = 'vsnip' }, -- For vsnip users.
-        -- { name = 'luasnip' }, -- For luasnip users.
-        -- { name = 'ultisnips' }, -- For ultisnips users.
-        -- { name = 'snippy' }, -- For snippy users.
-    }, {
-        { name = 'buffer' },
-    })
+    ['<S-Tab>'] = function(fallback)
+      if not cmp.select_prev_item() then
+        if vim.bo.buftype ~= 'prompt' and has_words_before() then
+          cmp.complete()
+        else
+          fallback()
+        end
+      end
+    end,
+  }),
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp' },
+    { name = 'vsnip' },     -- For vsnip users.
+    -- { name = 'luasnip' }, -- For luasnip users.
+    -- { name = 'ultisnips' }, -- For ultisnips users.
+    -- { name = 'snippy' }, -- For snippy users.
+  }, {
+    { name = 'buffer' },
+  })
 })
 
 -- Set configuration for specific filetype.
 cmp.setup.filetype('gitcommit', {
-    sources = cmp.config.sources({
-        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
-    }, {
-        { name = 'buffer' },
-    })
+  sources = cmp.config.sources({
+    { name = 'cmp_git' },     -- You can specify the `cmp_git` source if you were installed it.
+  }, {
+    { name = 'buffer' },
+  })
 })
 
 -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline({ '/', '?' }, {
-    mapping = cmp.mapping.preset.cmdline(),
-    sources = {
-        { name = 'buffer' }
-    }
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
 })
 
 -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline(':', {
-    mapping = cmp.mapping.preset.cmdline(),
-    sources = cmp.config.sources({
-        { name = 'path' }
-    }, {
-        { name = 'cmdline' }
-    })
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = 'path' }
+  }, {
+    { name = 'cmdline' }
+  })
 })
 
 -- Set up lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
 require('lspconfig')['pyright'].setup {
-    capabilities = capabilities
+  capabilities = capabilities
 }

nvim/lua/nvim-lsp-config.lua

@@ -34,12 +34,12 @@ end
 
 
 local lsp_flags = {
-    -- This is the default in Nvim 0.7+
-    debounce_text_changes = 150,
+  -- This is the default in Nvim 0.7+
+  debounce_text_changes = 150,
 }
 require('lspconfig')['pyright'].setup {
-    on_attach = on_attach,
-    flags = lsp_flags,
+  on_attach = on_attach,
+  flags = lsp_flags,
 }
 
-require'lspconfig'.clangd.setup{}
+require 'lspconfig'.clangd.setup {}

nvim/lua/plugins.lua

@@ -1,108 +1,100 @@
 local ensure_packer = function()
-    local fn = vim.fn
-    local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
-    if fn.empty(fn.glob(install_path)) > 0 then
-        fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path })
-        vim.cmd [[packadd packer.nvim]]
-        return true
-    end
-    return false
+	local fn = vim.fn
+	local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
+	if fn.empty(fn.glob(install_path)) > 0 then
+		fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+		vim.cmd([[packadd packer.nvim]])
+		return true
+	end
+	return false
 end
 
 local packer_bootstrap = ensure_packer()
 
-return require('packer').startup(function(use)
-        use 'wbthomason/packer.nvim'
+return require("packer").startup(function(use)
+	use("wbthomason/packer.nvim")
 
-        use {
-            'nvim-tree/nvim-tree.lua',
-            requires = {
-                'nvim-tree/nvim-web-devicons', -- optional, for file icons
-            }
-        }
+	use({
+		"nvim-tree/nvim-tree.lua",
+		requires = {
+			"nvim-tree/nvim-web-devicons", -- optional, for file icons
+		},
+	})
 
-        use {
-            'nvim-lualine/lualine.nvim',
-            requires = {
-                'nvim-tree/nvim-web-devicons', -- optional, for file icons
-            }
+	use({
+		"nvim-lualine/lualine.nvim",
+		requires = {
+			"nvim-tree/nvim-web-devicons", -- optional, for file icons
+		},
+	})
 
-        }
+	use({ "romgrk/barbar.nvim", requires = "nvim-web-devicons" })
 
-        use { 'romgrk/barbar.nvim', requires = 'nvim-web-devicons' }
+	use("nvim-treesitter/nvim-treesitter")
 
-        use 'nvim-treesitter/nvim-treesitter'
+	use("neovim/nvim-lspconfig") -- Configurations for Nvim LSP
+	use("simrat39/rust-tools.nvim")
 
-        use 'neovim/nvim-lspconfig' -- Configurations for Nvim LSP
+	-- (batch)commenting tool
+	use("preservim/nerdcommenter")
+	use("m4xshen/autoclose.nvim")
+	use("lukas-reineke/indent-blankline.nvim")
 
-        -- (batch)commenting tool
-        use 'preservim/nerdcommenter'
+	-- themeing
+	use("EdenEast/nightfox.nvim")
 
-        use "lukas-reineke/indent-blankline.nvim"
+	-- thin bar indicating an arbitray character limit
+	use("lukas-reineke/virt-column.nvim")
 
-        -- themeing
-        use "EdenEast/nightfox.nvim"
+	-- fuzzy file finder
+	use("nvim-telescope/telescope.nvim")
 
-        -- thin bar indicating an arbitray character limit
-        use "lukas-reineke/virt-column.nvim"
+	-- autocompletion engine, plugs into lsp
+	use({
+		"hrsh7th/nvim-cmp",
+		requires = {
+			"hrsh7th/cmp-buffer",
+			"hrsh7th/cmp-nvim-lsp",
+			"hrsh7th/cmp-cmdline",
+			"hrsh7th/cmp-path",
+			"hrsh7th/cmp-nvim-lua",
+		},
+	})
 
-        -- fuzzy file finder
-        use 'nvim-telescope/telescope.nvim'
+	--use 'dense-analysis/ale'
+	use("mhartington/formatter.nvim")
 
-        -- autocompletion engine, plugs into lsp
-        use {
-            "hrsh7th/nvim-cmp",
-            requires = {
-                "hrsh7th/cmp-buffer",
-                "hrsh7th/cmp-nvim-lsp",
-                "hrsh7th/cmp-cmdline",
-                "hrsh7th/cmp-path",
-                "hrsh7th/cmp-nvim-lua",
-            }
-        }
+	use({
+		"sudormrfbin/cheatsheet.nvim",
 
-        -- renders images in nvim
-        use {
-            'samodostal/image.nvim',
-            requires = {
-                'nvim-lua/plenary.nvim',
-                'm00qek/baleia.nvim'
-            },
-        }
+		requires = {
+			{ "nvim-telescope/telescope.nvim" },
+			{ "nvim-lua/popup.nvim" },
+			{ "nvim-lua/plenary.nvim" },
+		},
+	})
 
-        use {
-            'mrcjkb/haskell-tools.nvim',
-            requires = {
-                'nvim-lua/plenary.nvim',
-                'nvim-telescope/telescope.nvim'
-            },
-            branch = '1.x.x',
-        }
-
-        use 'dense-analysis/ale'
-
-        vim.cmd([[
+	vim.cmd([[
         augroup packer_user_config
             autocmd!
             autocmd BufWritePost plugins.lua source <afile> | PackerCompile
         augroup end
         ]])
 
-        -- init configs
-        require('nightfox-config')
-        require('nvim-lsp-config')
-        require('nvim-tree-config')
-        require('nvim-cmp-config')
-        require('image-config')
-        require('haskell-config')
-        require('telescope-config')
-        require('lualine').setup()
-        require("virt-column").setup()
+	-- init configs
+	require("nightfox-config")
+	require("nvim-lsp-config")
+	require("nvim-tree-config")
+	require("nvim-cmp-config")
+	require("autoclose-config")
+	require("image-config")
+	require("telescope-config")
+	-- require('ale-config')
+	require("formatter-config")
+	require("lualine").setup()
+	require("virt-column").setup()
 
-
-        vim.g.ale_linters = { haskell =  {'hlint', 'hdevtools', 'hfmt'} }
-
-        if packer_bootstrap then
-            require('packer').sync()
-        end
-    end)
+	if packer_bootstrap then
+		require("packer").sync()
+	end
+end)