Skip to content

Commit cfc9531

Browse files
committed
Added more options and lazygit plugin
1 parent 9e52560 commit cfc9531

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

init.lua

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ vim.g.mapleader = ' '
9191
vim.g.maplocalleader = ' '
9292

9393
-- Set to true if you have a Nerd Font installed and selected in the terminal
94-
vim.g.have_nerd_font = false
94+
vim.g.have_nerd_font = true
95+
96+
vim.opt.wrap = true
97+
vim.opt.linebreak = true
98+
vim.opt.showbreak = ''
9599

96100
-- [[ Setting options ]]
97101
-- See `:help vim.opt`
@@ -102,7 +106,7 @@ vim.g.have_nerd_font = false
102106
vim.opt.number = true
103107
-- You can also add relative line numbers, to help with jumping.
104108
-- Experiment for yourself to see if you like it!
105-
-- vim.opt.relativenumber = true
109+
vim.opt.relativenumber = true
106110

107111
-- Enable mouse mode, can be useful for resizing splits for example!
108112
vim.opt.mouse = 'a'
@@ -127,6 +131,7 @@ vim.opt.undofile = true
127131
-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
128132
vim.opt.ignorecase = true
129133
vim.opt.smartcase = true
134+
vim.opt.smartindent = true
130135

131136
-- Keep signcolumn on by default
132137
vim.opt.signcolumn = 'yes'
@@ -189,10 +194,10 @@ vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }
189194
-- Use CTRL+<hjkl> to switch between windows
190195
--
191196
-- See `:help wincmd` for a list of all window commands
192-
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
193-
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
194-
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
195-
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
197+
-- vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
198+
-- vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
199+
-- vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
200+
-- vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
196201

197202
-- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes
198203
-- vim.keymap.set("n", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" })
@@ -683,6 +688,23 @@ require('lazy').setup({
683688
-- But for many setups, the LSP (`ts_ls`) will work just fine
684689
-- ts_ls = {},
685690
--
691+
-- ts_ls = {
692+
-- capabilities = capabilities,
693+
-- init_options = {
694+
-- plugins = {
695+
-- {
696+
-- name = '@vue/typescript-plugin',
697+
-- location = '/usr/local/lib/node_modules/@vue/typescript-plugin',
698+
-- languages = { 'javascript', 'typescript', 'vue' },
699+
-- },
700+
-- },
701+
-- },
702+
-- filetypes = {
703+
-- 'javascript',
704+
-- 'typescript',
705+
-- 'vue',
706+
-- },
707+
-- },
686708

687709
lua_ls = {
688710
-- cmd = { ... },

lua/custom/plugins/init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ return {
66
require 'custom.plugins.flash',
77
require 'custom.plugins.autopairs',
88
require 'custom.plugins.wilder',
9+
require 'custom.plugins.lazygit',
910
}

lua/kickstart/plugins/indent_line.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ return {
44
-- Enable `lukas-reineke/indent-blankline.nvim`
55
-- See `:help ibl`
66
main = 'ibl',
7-
opts = {},
7+
opts = {
8+
scope = { enabled = false },
9+
},
810
},
911
}

lua/kickstart/plugins/lint.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ return {
66
config = function()
77
local lint = require 'lint'
88
lint.linters_by_ft = {
9-
markdown = { 'markdownlint' },
9+
-- markdown = { 'markdownlint' },
1010
}
1111

1212
-- To allow other plugins to add linters to require('lint').linters_by_ft,

0 commit comments

Comments
 (0)