diff --git a/init.lua b/init.lua index 141b4714..83ef799c 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,11 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true + +vim.opt.wrap = true +vim.opt.linebreak = true +vim.opt.showbreak = '↳' -- [[ Setting options ]] -- See `:help vim.opt` @@ -102,7 +106,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -127,6 +131,7 @@ vim.opt.undofile = true -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.opt.ignorecase = true vim.opt.smartcase = true +vim.opt.smartindent = true -- Keep signcolumn on by default vim.opt.signcolumn = 'yes' @@ -189,10 +194,10 @@ vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' } -- Use CTRL+ to switch between windows -- -- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +-- vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) -- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes -- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) @@ -683,6 +688,23 @@ require('lazy').setup({ -- But for many setups, the LSP (`ts_ls`) will work just fine -- ts_ls = {}, -- + -- ts_ls = { + -- capabilities = capabilities, + -- init_options = { + -- plugins = { + -- { + -- name = '@vue/typescript-plugin', + -- location = '/usr/local/lib/node_modules/@vue/typescript-plugin', + -- languages = { 'javascript', 'typescript', 'vue' }, + -- }, + -- }, + -- }, + -- filetypes = { + -- 'javascript', + -- 'typescript', + -- 'vue', + -- }, + -- }, lua_ls = { -- cmd = { ... }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 6fdb9e03..c34e5c64 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -6,4 +6,5 @@ return { require 'custom.plugins.flash', require 'custom.plugins.autopairs', require 'custom.plugins.wilder', + require 'custom.plugins.lazygit', } diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua index ed7f2693..240f3d08 100644 --- a/lua/kickstart/plugins/indent_line.lua +++ b/lua/kickstart/plugins/indent_line.lua @@ -4,6 +4,8 @@ return { -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help ibl` main = 'ibl', - opts = {}, + opts = { + scope = { enabled = false }, + }, }, } diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua index 907c6bf3..c178e849 100644 --- a/lua/kickstart/plugins/lint.lua +++ b/lua/kickstart/plugins/lint.lua @@ -6,7 +6,7 @@ return { config = function() local lint = require 'lint' lint.linters_by_ft = { - markdown = { 'markdownlint' }, + -- markdown = { 'markdownlint' }, } -- To allow other plugins to add linters to require('lint').linters_by_ft,