nvim: use tabs

nvim/lazy-lock.json

@@ -3,11 +3,11 @@
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
-  "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "dropbar.nvim": { "branch": "master", "commit": "fd917b70535371d45285bc94f9eb6387677c6dce" },
+  "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" },
   "haskell-tools.nvim": { "branch": "master", "commit": "65d6993eba1a56bbd5211ef13a100d26ce3e644a" },
-  "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" },
+  "kanagawa.nvim": { "branch": "master", "commit": "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2" },
   "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
   "lazydev.nvim": { "branch": "main", "commit": "7cbb524c85f87017df9c1ea2377a1d840ad8ed51" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@@ -18,14 +18,14 @@
   "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
   "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-treesitter": { "branch": "master", "commit": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421" },
+  "nvim-treesitter": { "branch": "master", "commit": "9636d5a3f4f531256fba147a30b882c44f28fae1" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "precognition.nvim": { "branch": "main", "commit": "5255b72c52b1159e9757f50389bde65e05e3bfb1" },
+  "precognition.nvim": { "branch": "main", "commit": "9e6087fcd27dd5d2fc71b9d9471a101666c39f73" },
   "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "trouble.nvim": { "branch": "main", "commit": "5e45bb78f8da3444d35616934c180fce3742c439" },
+  "trouble.nvim": { "branch": "main", "commit": "e0b35a273df58b03612255783cf475a782ede7e0" },
   "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
 }

nvim/lua/config/helpers/keymap.lua

@@ -1,5 +1,6 @@
 local defaults = { noremap = true, silent = true }
 
+
 ---@class KeymapOpts
 ---@field [1]? string Shorthand description
 ---@field desc? string Description

nvim/lua/config/options.lua

@@ -1,6 +1,9 @@
 local g, opt = vim.g, vim.opt
 
 
+g.mapleader               = [[ ]] -- use space for leader
+g.maplocalleader          = [[\]] -- use backslash for local leader
+
 -- Providers
 g.loaded_python3_provider = 0
 g.loaded_ruby_provider    = 0
@@ -14,10 +17,10 @@ opt.completeopt = 'menuone,noinsert,noselect' -- Completion behavior
 opt.termguicolors         = true
 
 -- Indentation
+opt.shiftwidth            = 2     -- shift 2 spaces when tab
+opt.smartindent           = true  -- autoindent new lines
+opt.expandtab             = false -- use spaces instead of tabs
 opt.tabstop               = 2     -- 1 tab = 2 spaces
-opt.shiftwidth = 2            -- Shift 2 spaces when tab
-opt.smartindent = true        -- Autoindent new lines
-opt.expandtab = true          -- Use spaces instead of tabs
 
 -- UI
 opt.number                = true -- Show current line number
@@ -27,8 +30,10 @@ opt.list = true               -- Show punctuation
 opt.listchars             = {    -- Punctuation marks
 	trail          = '·',
 	nbsp           = '␣',
-  tab             = '⇥ ',
-  leadmultispace  = '│ ',
+	tab            = '│ ',
+	leadmultispace = '│·',
+	extends        = '▶',
+	precedes       = '◀',
 }
 
 -- Additional filetypes

nvim/lua/config/plugins.lua

@@ -216,11 +216,11 @@ return {
 	},
 
 	{
-    "tris203/precognition.nvim",
+		'tris203/precognition.nvim',
 		config = function()
 			local pc = require 'precognition'
 
-      nv '<leader>p' (pc.toggle) "Precognition: toggle"
+			nv '<leader>p' (pc.toggle) 'Precognition: toggle'
 
 			pc.setup {
 				startVisible = false,
@@ -351,6 +351,8 @@ return {
 		opts = {
 			library = {
 				'lazy.nvim',
+				'rustaceanvim',
+				'haskell-tools.nvim',
 			},
 		},
 	},
@@ -358,11 +360,9 @@ return {
 	-- Tools for Rust
 	{
 		'mrcjkb/rustaceanvim',
-    version = '^3',
+		version = '^4',
 		ft = { 'rust' },
-    init = function()
-      require 'config.plugins.rustaceanvim'
-    end
+		init = require 'config.plugins.rustaceanvim',
 	},
 
 	-- Tools for Haskell

nvim/lua/config/plugins/nvim-cmp.lua

@@ -13,16 +13,6 @@ return function()
 			documentation = cmp.config.window.bordered(),
 		},
 		mapping = cmp.mapping.preset.insert {
-      -- ['<Tab>'] = cmp.mapping(function(fallback)
-      --   if cmp.visible() then
-      --     cmp.select_next_item()
-      --   elseif vim.snippet.jumpable(1) then
-      --     vim.snippet.jump(1)
-      --   else
-      --     fallback()
-      --   end
-      -- end, { 'i', 's' }),
-      -- And something similar for vim.snippet.jump(-1)
 			['<C-b>']  = cmp.mapping.scroll_docs(-4),
 			['<C-f>']  = cmp.mapping.scroll_docs(4),
 			['<C-CR>'] = cmp.mapping.complete(),

nvim/lua/config/plugins/rustaceanvim.lua

@@ -2,14 +2,8 @@ local map = require 'config.helpers.keymap'
 local n   = map 'n'
 
 
-vim.g.rustaceanvim = function()
-  local mason  = require 'mason-registry'
+local function get_opts()
 	local tools = require 'rustaceanvim'
-  local config = require 'rustaceanvim.config'
-
-  local lsp_root = mason.get_package('codelldb'):get_install_path() .. '/extension/'
-  local lsp_path = lsp_root .. 'adapter/codelldb'
-  local lib_path = lsp_root .. 'lldb/lib/liblldb.so'
 
 	---@type RustaceanOpts
 	return {
@@ -19,19 +13,9 @@ vim.g.rustaceanvim = function()
 				n '<Leader>a' (tools.code_action_group.code_action_group) { buffer = bufnr }
 			end,
 		},
-    default_settings = {
-      ['rust-analyzer'] = {
-        -- checkOnSave = {
-        --   allFeatures = true,
-        --   overrideCommand = {
-        --     'cargo', 'clippy', '--workspace', '--message-format=json',
-        --     '--all-targets', '--all-features'
-        --   }
-        -- },
-      },
-    },
-    dap = {
-      adapter = config.get_codelldb_adapter(lsp_path, lib_path),
-    },
 	}
 end
+
+return function()
+	vim.g.rustaceanvim = get_opts
+end