diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index fccb0fd..2a22c50 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -167,7 +167,8 @@ return require'packer'.startup(function() MkdnTab = {{'i',}, ''}, MkdnSTab = {{'i'}, ''}, MkdnFollowLink = {'n', 'p'} - } + }, + wrap = true }) end }) diff --git a/lua/settings/init.lua b/lua/settings/init.lua index 1c3a8ce..c9f8ed3 100755 --- a/lua/settings/init.lua +++ b/lua/settings/init.lua @@ -34,13 +34,15 @@ opt.number = true -- Show line number opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. opt.showmatch = true -- Highlight matching parenthesis opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker') -opt.colorcolumn = '150' -- Line length marker at 80 columns +opt.colorcolumn = '120' -- Line length marker at 80 columns +opt.textwidth = 120 opt.splitright = true -- Vertical split to the right opt.splitbelow = true -- Horizontal split to the bottom opt.ignorecase = true -- Ignore case letters when search opt.smartcase = true -- Ignore lowercase for the whole pattern opt.linebreak = true -- Wrap on word boundary opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2. +opt.wrap = true ----------------------------------------------------------- -- Memory, CPU @@ -52,14 +54,14 @@ opt.synmaxcol = 240 -- Max column for syntax highlight ----------------------------------------------------------- -- Colorscheme ----------------------------------------------------------- -opt.termguicolors = true -- Enable 24-bit RGB colors +opt.termguicolors = true -- Enable 24-bit RGB colors cmd [[colorscheme catppuccin-macchiato]] ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- opt.expandtab = true -- Use spaces instead of tabs -opt.shiftwidth = 2 -- Shift 4 spaces when tab -opt.tabstop = 8 -- 1 tab == 4 spaces +opt.shiftwidth = 1 -- Shift 4 spaces when tab +opt.tabstop = 1 -- 1 tab == 4 spaces opt.smartindent = true -- Autoindent new lines ----------------------------------------------------------- -- Glow Settings @@ -70,13 +72,14 @@ g.glow_width = 120 g.glow_use_pager = true g.glow_style = 'dark' ----------------------------------------------------------- --- MKDX Settings, mkdx#settings. +-- MKDX Settings, mkdx#settings. ----------------------------------------------------------- -- 2 spaces for selected filetypes cmd [[ autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab ]] + local disabled_built_ins = { "netrw", "netrwPlugin", diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index a0239e5..73bbd75 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -213,7 +213,7 @@ _G.packer_plugins = { url = "https://github.com/echasnovski/mini.trailspace" }, ["mkdnflow.nvim"] = { - config = { "\27LJ\2\nð\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0" }, + config = { "\27LJ\2\nö\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\1\twrap\2\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/mkdnflow.nvim", url = "https://github.com/jakewvincent/mkdnflow.nvim" @@ -359,6 +359,12 @@ _G.packer_plugins = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/which-key.nvim", url = "https://github.com/folke/which-key.nvim" + }, + ["wrapping.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0" }, + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/wrapping.nvim", + url = "https://github.com/andrewferrier/wrapping.nvim" } } @@ -379,10 +385,10 @@ time([[Config for nvim-mapper]], false) time([[Config for gitsigns.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") time([[Config for gitsigns.nvim]], false) --- Config for: null-ls.nvim -time([[Config for null-ls.nvim]], true) -try_loadstring("\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\ndebug\2\nsetup\fnull-ls\frequire\0", "config", "null-ls.nvim") -time([[Config for null-ls.nvim]], false) +-- Config for: wrapping.nvim +time([[Config for wrapping.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim") +time([[Config for wrapping.nvim]], false) -- Config for: mini.move time([[Config for mini.move]], true) try_loadstring("\27LJ\2\nÒ\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\rmappings\1\0\0\1\0\b\tleft\r\14line_left\r\aup\v\14line_down\r\tdown\r\fline_up\v\nright\14\15line_right\14\nsetup\14mini.move\frequire\0", "config", "mini.move") @@ -407,18 +413,22 @@ time([[Config for which-key.nvim]], false) time([[Config for mini.fuzzy]], true) try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\15mini.fuzzy\frequire\0", "config", "mini.fuzzy") time([[Config for mini.fuzzy]], false) --- Config for: trouble.nvim -time([[Config for trouble.nvim]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") -time([[Config for trouble.nvim]], false) -- Config for: tmux.nvim time([[Config for tmux.nvim]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0", "config", "tmux.nvim") time([[Config for tmux.nvim]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) -- Config for: mkdnflow.nvim time([[Config for mkdnflow.nvim]], true) -try_loadstring("\27LJ\2\nð\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") +try_loadstring("\27LJ\2\nö\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\1\twrap\2\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") time([[Config for mkdnflow.nvim]], false) +-- Config for: null-ls.nvim +time([[Config for null-ls.nvim]], true) +try_loadstring("\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\ndebug\2\nsetup\fnull-ls\frequire\0", "config", "null-ls.nvim") +time([[Config for null-ls.nvim]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Filetype lazy-loads