diff --git a/nvim/after/ftplugin/gitcommit.lua b/nvim/after/ftplugin/gitcommit.lua new file mode 100644 index 0000000..f6a0af7 --- /dev/null +++ b/nvim/after/ftplugin/gitcommit.lua @@ -0,0 +1,5 @@ +vim.bo.textwidth = 72 +vim.wo.colorcolumn = '+0' + +vim.cmd('goto') +vim.cmd('startinsert') diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index dd84bf6..d3cfc45 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -28,6 +28,6 @@ vim.schedule(function() require('plugins.dap-python') -- Debug plugin settings specifically for python -- Experimental - require('plugins.note_taking') -- In house note taking plugin (TODO: rename once the plugin name is solidified) + -- require('plugins.note_taking') -- In house note taking plugin (TODO: rename once the plugin name is solidified) -- require('plugins.nvim-lint') -- Linter loader end) diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua index 25f70be..7778361 100644 --- a/nvim/lua/plugins/lualine.lua +++ b/nvim/lua/plugins/lualine.lua @@ -7,7 +7,7 @@ local function get_schema() end vim.pack.add({ - 'https://github.com/nvim-tree/nvim-web-devicons', + -- 'https://github.com/nvim-tree/nvim-web-devicons', 'https://github.com/nvim-lualine/lualine.nvim' }) diff --git a/nvim/lua/plugins/luasnip.lua b/nvim/lua/plugins/luasnip.lua index 9be2ef0..0ddffca 100644 --- a/nvim/lua/plugins/luasnip.lua +++ b/nvim/lua/plugins/luasnip.lua @@ -1,5 +1,5 @@ vim.pack.add({ - 'https://github.com/saadparwaiz1/cmp_luasnip', + -- 'https://github.com/saadparwaiz1/cmp_luasnip', 'https://github.com/rafamadriz/friendly-snippets', 'https://github.com/L3MON4D3/LuaSnip' }) @@ -13,7 +13,7 @@ local function luasnip_dependency_update() -- Verify the lib exists, (re)run the make install target if vim.uv.fs_stat(artifact) then vim.notify('Building LuaSnip jsregexp dependency...', vim.log.levels.INFO) - vim.system({ 'make', 'install_jsregexp' }, { cwd = luasnip_root }, function (out) + vim.system({ 'make', 'install_jsregexp' }, { cwd = luasnip_root }, function(out) vim.schedule(function() if out.code == 0 then vim.notify('LuaSnip jsregexp built successfully!', vim.log.levels.INFO) @@ -38,7 +38,10 @@ require('luasnip').setup { enable_autosnippets = true, } --- local types = require('luasnip.util.types') - require('luasnip.loaders.from_vscode').lazy_load() require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" }) + +-- TODO: Figure out keymappings that make sense +vim.keymap.set({ 'i' }, '', function() require('luasnip').expand() end, { silent = true }) +vim.keymap.set({ 'i', 's' }, '', function() require('luasnip').jump(1) end, { silent = true }) +vim.keymap.set({ 'i', 's' }, '', function() require('luasnip').jump(-1) end, { silent = true }) diff --git a/nvim/lua/plugins/telekasten.lua b/nvim/lua/plugins/telekasten.lua index 1b70238..3aad84d 100644 --- a/nvim/lua/plugins/telekasten.lua +++ b/nvim/lua/plugins/telekasten.lua @@ -20,6 +20,8 @@ require('telekasten').setup({ plug_into_calendar = false, }) +vim.treesitter.language.register('markdown', 'telekasten') + -- Color for telekasten syntax vim.api.nvim_set_hl(0, 'tkLink', { ctermfg = 72, cterm = { bold = true, underdouble = true }, fg = '#689d6a', bold = true, underdouble = true }) vim.api.nvim_set_hl(0, 'tkBrackets', { ctermfg = 'gray', fg = 'gray' }) diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index bdb76be..87391fd 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -8,7 +8,7 @@ vim.opt.cursorcolumn = true -- Highlight vim.opt.cursorline = true -- Highlight the line the cursor is on. vim.opt.expandtab = true -- Expand tabs into spaces vim.opt.fileformat = 'unix' -- Explicitly state that files should use the unix style EOL characters. -vim.opt.fillchars = 'fold: ' -- Sets the character that fills in a fold line +-- vim.opt.fillchars = 'fold: ' -- Sets the character that fills in a fold line (removes the dots) vim.opt.foldcolumn = '0' -- Disables the foldcolumn vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Uses Treesitter to determine where code folding should occur vim.opt.foldlevel = 10 -- Sets the initial level at which folds will be closed @@ -16,17 +16,20 @@ vim.opt.foldlevelstart = 4 -- Sets the vim.opt.foldmethod = 'expr' -- Attempt to use the syntax of a file to set folds. vim.opt.foldnestmax = 4 -- Maximum level of fold nesting vim.opt.formatoptions = 'cqrto' -- Allow auto insertion of comment lines when using o or O on a comment. +vim.opt.ignorecase = true -- Case-insensitive searching vim.opt.list = true -- Show the listchars -vim.opt.listchars = 'tab:|·,trail:¬,extends:>,precedes:<,nbsp:+' -- Characters to display when showing whitespace +vim.opt.listchars = 'tab:|·,trail:¬,extends:»,precedes:«,nbsp:+' -- Characters to display when showing whitespace vim.opt.mouse = 'a' -- Enable mouse mode vim.opt.number = true -- Show the line number in the gutter. +vim.opt.pumheight = 15 -- Maximum height of the auto complete floating window vim.opt.relativenumber = true -- Relative line number -vim.opt.sidescrolloff = 8 +vim.opt.sidescrolloff = 8 -- Side scrolling leadoff to keep the cursor a few characters from the screen edge instead of going all the way to it vim.opt.shiftround = true -- Round indentation to shiftwidth vim.opt.shiftwidth = 4 -- Number of spaces a tab counts for when converting tabs to spaces vim.opt.shortmess = 'at' -- Abbreviations and truncation of cmd messages vim.opt.showmatch = true -- Show matching bracket vim.opt.signcolumn = 'yes' -- Always show the gutter +vim.opt.smartcase = true -- Keeps searches Case-insensitive until the search has an upper case character vim.opt.smartindent = true -- Attempt to insert indentation to fit traditional languages. vim.opt.softtabstop = 4 -- Number of spaces a tab counts for when converting tabs to spaces vim.opt.splitbelow = true -- Split windows below when horizontal splitting @@ -36,8 +39,9 @@ vim.opt.tabstop = 4 -- Setting t vim.opt.termguicolors = true -- Enable the truecolor GUI colors in a terminal vim.opt.undodir = os.getenv('HOME') .. '/.config/nvim/undodir' -- Set a specific undo file directory vim.opt.undofile = true -- Enable undo files -vim.opt.updatetime = 300 -- Update time in milliseconds +vim.opt.updatetime = 300 -- Swapfile update time in milliseconds vim.opt.wrap = false -- Do _not_ wrap lines +vim.g.netrw_banner = 0 vim.g.netrw_liststyle = 3 -- Use the tree style display for netrw directory listings vim.g.netrw_winsize = 25 -- Percentage based pane size for directory exploring