From 822dc35b50cb1c22fc6dc6cedf853dd36098f96f Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 7 Dec 2022 14:09:19 -0500 Subject: [PATCH] Various Plugins and Settings --- lua/keymaps.lua | 18 +++++++- lua/plugins/null-ls.lua | 5 +- lua/plugins/telescope.lua | 32 ++----------- lua/plugins/todo-comments.lua | 10 ++-- lua/settings/init.lua | 8 ++-- plugin/packer_compiled.lua | 48 +++++++++---------- spell/en.utf-8.add | 84 ++++++++++++++++++++++++++++++++++ spell/en.utf-8.add.spl | Bin 443 -> 1344 bytes 8 files changed, 141 insertions(+), 64 deletions(-) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 9fe2b4b..843f716 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -105,7 +105,7 @@ M( ) M( - 'n', 'ce', ":TodoTrouble keywords=TODO | resize +10", + 'n', 'ce', ":TodoTrouble keywords=TODO,FEAT | resize +10", {silent=true, noremap=true}, "Show Todos", "todo_trouble_todo", @@ -127,3 +127,19 @@ M( "todo_trouble_todo", "Show Errors from Folke's Todo Comments Plugin." ) + +M( + 'n', 'b', ":! black %", + {silent=true, noremap=true}, + "Black Cwf", + "black_current_file", + "Use Black Formatting on Current File." +) + +M( + 'n', 'm', ":! markdownlint -f %", + {silent=true, noremap=true}, + "Black Cwf", + "black_current_file", + "Use Black Formatting on Current File." +) diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index 08db788..4215001 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -14,8 +14,9 @@ null_ls.setup({ sources = { null_ls.builtins.completion.spell, null_ls.builtins.diagnostics.codespell, - null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable MD013" }}), - null_ls.builtins.diagnostics.pycodestyle, + null_ls.builtins.diagnostics.markdownlint.with({ extra_args = { "--disable", "MD013", "--" } + ,}), + null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}), null_ls.builtins.formatting.black.with({ extra_args = { "--fast" }}), }, }) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index da0aed0..1f77d8a 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,44 +1,20 @@ local g = vim.g ---local fb_actions = require "telescope".extensions.file_browser.actions +local fb_actions = require "telescope".extensions.file_browser.actions local telescope_installer = require('telescope').setup({ - defaults = { - -- Default configuration for telescope goes here: - previewer = true, - file_previewer = require'telescope.previewers'.vim_buffer_cat.new, - -- config_key = value, - mappings = { - i = { - [""] = "which_key" - -- map actions.which_key to (default: ) - -- actions.which_key shows the mappings for your picker, - -- e.g. git_{create, delete, ...}_branch for the git_branches picker - } - } - }, - pickers = { - find_files = { - theme = "dropdown", - } - }, extensions = { ---[[ file_browser = { - theme = "dropdown", - -- disables netrw and use telescope-file-browser in its place - hijack_netrw = true, + file_browser = { mappings = { ["i"] = { - + [""] = fb_actions.create }, ["n"] = { - + }, }, }, ---]] }, - }) require("telescope").load_extension "file_browser" diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua index fe8c730..f57d158 100644 --- a/lua/plugins/todo-comments.lua +++ b/lua/plugins/todo-comments.lua @@ -11,7 +11,7 @@ require('todo-comments').setup { DONE = { icon = " ", color = "info" }, FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, - TASK = { icon = " ", color = "hint", alt = { "TODO", "TBD" } }, + TODO = { icon = " ", color = "test", alt = { "TASK", "TBD" } }, NOTE = { icon = " ", color = "hint", alt = { "INFO" } }, SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } }, }, @@ -20,10 +20,10 @@ require('todo-comments').setup { }, colors = { error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, - warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, - info = { "DiagnosticInfo", "#2563EB" }, - hint = { "DiagnosticHint", "#10B981" }, - default = { "Identifier", "#7C3AED" }, + warning = { "DiagnosticWarning", "WarningMsg", "#ffba08" }, + info = { "DiagnosticInfo", "#05eb42" }, + hint = { "DiagnosticHint", "#ff12d7" }, + default = { "Identifier", "#711fff" }, test = { "Identifier", "#FF00FF" } }, } diff --git a/lua/settings/init.lua b/lua/settings/init.lua index a570b96..3624e80 100755 --- a/lua/settings/init.lua +++ b/lua/settings/init.lua @@ -25,6 +25,7 @@ opt.cursorline = true g.markdown_folding = 1 opt.spell=true opt.spelllang = 'en_us' +cmd [[ autocmd FileType md autocmd BufWritePre * :%s/\s\+$//e ]] ----------------------------------------------------------- -- Neovim UI ----------------------------------------------------------- @@ -47,7 +48,6 @@ opt.hidden = true -- Enable background buffers opt.history = 100 -- Remember N lines in history opt.lazyredraw = true -- Faster scrolling opt.synmaxcol = 240 -- Max column for syntax highlight - ----------------------------------------------------------- -- Colorscheme ----------------------------------------------------------- @@ -57,8 +57,8 @@ cmd [[colorscheme catppuccin-macchiato]] -- Tabs, indent ----------------------------------------------------------- opt.expandtab = true -- Use spaces instead of tabs -opt.shiftwidth = 4 -- Shift 4 spaces when tab -opt.tabstop = 4 -- 1 tab == 4 spaces +opt.shiftwidth = 2 -- Shift 4 spaces when tab +opt.tabstop = 8 -- 1 tab == 4 spaces opt.smartindent = true -- Autoindent new lines ----------------------------------------------------------- -- Glow Settings @@ -73,7 +73,7 @@ g.glow_style = 'dark' ----------------------------------------------------------- -- 2 spaces for selected filetypes cmd [[ - autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=2 + autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab ]] local disabled_built_ins = { diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index e07fef4..57a07a4 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -345,6 +345,22 @@ time([[Defining packer_plugins]], false) time([[Setup for markdown-preview.nvim]], true) try_loadstring("\27LJ\2\n=\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\2\0\0\rmarkdown\19mkdp_filetypes\6g\bvim\0", "setup", "markdown-preview.nvim") time([[Setup for markdown-preview.nvim]], false) +-- Config for: which-key.nvim +time([[Config for which-key.nvim]], true) +try_loadstring("\27LJ\2\n;\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\14which-key\frequire\0", "config", "which-key.nvim") +time([[Config for which-key.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: mason.nvim +time([[Config for mason.nvim]], true) +try_loadstring("\27LJ\2\n3\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\nmason\frequire\0", "config", "mason.nvim") +time([[Config for mason.nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n;\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\14telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) -- Config for: nvim-autopairs time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\2\n@\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\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") @@ -357,38 +373,22 @@ time([[Config for tmux.nvim]], false) 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: nvim-mapper -time([[Config for nvim-mapper]], true) -try_loadstring("\27LJ\2\n=\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\16nvim-mapper\frequire\0", "config", "nvim-mapper") -time([[Config for nvim-mapper]], false) --- Config for: todo-comments.nvim -time([[Config for todo-comments.nvim]], true) -try_loadstring("\27LJ\2\n\6\0\0\6\0+\00036\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\25\0005\3\6\0005\4\3\0005\5\4\0=\5\5\4=\4\a\0035\4\b\0=\4\t\0035\4\n\0005\5\v\0=\5\5\4=\4\f\0035\4\r\0005\5\14\0=\5\5\4=\4\15\0035\4\16\0005\5\17\0=\5\5\4=\4\18\0035\4\19\0005\5\20\0=\5\5\4=\4\21\0035\4\22\0005\5\23\0=\5\5\4=\4\24\3=\3\26\0025\3\27\0=\3\28\0025\3\30\0005\4\29\0=\4\31\0035\4 \0=\4!\0035\4\"\0=\4#\0035\4$\0=\4%\0035\4&\0=\4'\0035\4(\0=\4)\3=\3*\2B\0\2\1K\0\1\0\vcolors\ttest\1\3\0\0\15Identifier\f#FF00FF\fdefault\1\3\0\0\15Identifier\f#7C3AED\thint\1\3\0\0\19DiagnosticHint\f#10B981\tinfo\1\3\0\0\19DiagnosticInfo\f#2563EB\fwarning\1\4\0\0\22DiagnosticWarning\15WarningMsg\f#FBBF24\nerror\1\0\0\1\4\0\0\20DiagnosticError\rErrorMsg\f#DC2626\14highlight\1\0\1\18comments_only\1\rkeywords\1\0\0\tSENG\1\4\0\0\14SOLUTIONS\aSE\15WORKAROUND\1\0\2\ncolor\ttest\ticon\t \tNOTE\1\2\0\0\tINFO\1\0\2\ncolor\thint\ticon\t \tTASK\1\3\0\0\tTODO\bTBD\1\0\2\ncolor\thint\ticon\t \tWARN\1\3\0\0\fWARNING\nERROR\1\0\2\ncolor\nerror\ticon\t \tFEAT\1\3\0\0\tNEED\fREQUEST\1\0\2\ncolor\fwarning\ticon\t \tDONE\1\0\2\ncolor\tinfo\ticon\t \bFIX\1\0\0\balt\1\5\0\0\nFIXME\bBUG\nFIXIT\nISSUE\1\0\2\ncolor\nerror\ticon\t \nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") -time([[Config for todo-comments.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") time([[Config for mkdnflow.nvim]], false) --- Config for: which-key.nvim -time([[Config for which-key.nvim]], true) -try_loadstring("\27LJ\2\n;\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\14which-key\frequire\0", "config", "which-key.nvim") -time([[Config for which-key.nvim]], false) --- Config for: mason.nvim -time([[Config for mason.nvim]], true) -try_loadstring("\27LJ\2\n3\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\nmason\frequire\0", "config", "mason.nvim") -time([[Config for mason.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: todo-comments.nvim +time([[Config for todo-comments.nvim]], true) +try_loadstring("\27LJ\2\n\6\0\0\6\0+\00036\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\25\0005\3\6\0005\4\3\0005\5\4\0=\5\5\4=\4\a\0035\4\b\0=\4\t\0035\4\n\0005\5\v\0=\5\5\4=\4\f\0035\4\r\0005\5\14\0=\5\5\4=\4\15\0035\4\16\0005\5\17\0=\5\5\4=\4\18\0035\4\19\0005\5\20\0=\5\5\4=\4\21\0035\4\22\0005\5\23\0=\5\5\4=\4\24\3=\3\26\0025\3\27\0=\3\28\0025\3\30\0005\4\29\0=\4\31\0035\4 \0=\4!\0035\4\"\0=\4#\0035\4$\0=\4%\0035\4&\0=\4'\0035\4(\0=\4)\3=\3*\2B\0\2\1K\0\1\0\vcolors\ttest\1\3\0\0\15Identifier\f#FF00FF\fdefault\1\3\0\0\15Identifier\f#7C3AED\thint\1\3\0\0\19DiagnosticHint\f#10B981\tinfo\1\3\0\0\19DiagnosticInfo\f#2563EB\fwarning\1\4\0\0\22DiagnosticWarning\15WarningMsg\f#FBBF24\nerror\1\0\0\1\4\0\0\20DiagnosticError\rErrorMsg\f#DC2626\14highlight\1\0\1\18comments_only\1\rkeywords\1\0\0\tSENG\1\4\0\0\14SOLUTIONS\aSE\15WORKAROUND\1\0\2\ncolor\ttest\ticon\t \tNOTE\1\2\0\0\tINFO\1\0\2\ncolor\thint\ticon\t \tTASK\1\3\0\0\tTODO\bTBD\1\0\2\ncolor\thint\ticon\t \tWARN\1\3\0\0\fWARNING\nERROR\1\0\2\ncolor\nerror\ticon\t \tFEAT\1\3\0\0\tNEED\fREQUEST\1\0\2\ncolor\fwarning\ticon\t \tDONE\1\0\2\ncolor\tinfo\ticon\t \bFIX\1\0\0\balt\1\5\0\0\nFIXME\bBUG\nFIXIT\nISSUE\1\0\2\ncolor\nerror\ticon\t \nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") +time([[Config for todo-comments.nvim]], false) -- Config for: gitsigns.nvim 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: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n;\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\14telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) +-- Config for: nvim-mapper +time([[Config for nvim-mapper]], true) +try_loadstring("\27LJ\2\n=\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\16nvim-mapper\frequire\0", "config", "nvim-mapper") +time([[Config for nvim-mapper]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Filetype lazy-loads diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index c30051b..fb10d2e 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -30,3 +30,87 @@ programmatically Wistia iOS PPT +Kaitlyn's +OneTrust +JS +Analytics +KPI +param +UUID +Pipedrive +pipedrive +Lukasz +Bjorn +webhooks +trackable +Pipedrive's +boolean +Kaisa +SSO +XP +DW +Chołodecki +Łukasz +Kotkas +Patrycja +Q1 +Vidyard +badging +Flink +S3 +Unclickable +DataDog +wistia +https +https +wifi +autoplaying +tbd +G2 +SMEs +CSM +AEs +ZoomInfo's +linkedin +Enablement +enablement +DIY +Zoominfo +G2M +Carli +LevelJump +LMS +CMS +Lessonly +Katlin +nd +LT +EVP's +UX +Schoology +Pendo +Salesforce +ILTs +SFDC +ROI +NPS +roadmap +BigIdeasMath +Hubspot +analytics +SCORM +AWS +JnJ +DSAR +ons +Zapier +Accredible +LPs +Shopify +Callum +Chek +Chek +Chek +Chek +Chek +Chek diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index cf2f2d1d2aa43427d50644577ee2b1ff1e0e4c85..c49deba937c5635f2f60d106809c0bbf5fc0546f 100644 GIT binary patch literal 1344 zcmXw3!A{#i5cO;Vy|h9(_R=d=Zv^?)9>7Ehln5jcNIg{A*z3fJy>@LU5TvRV7rvpV z9{LOYfL>5Pt9@^rUUqkO-^{#uGxp8dq^Vq<5B~;1&%CzNIC1H0o-LNSFRRaW)2`Nc z_YcoIvGc1tiA`BcA(iBkNh5P{l1QLyCR5xxF$NFjn^;&IX@QHSF#)byDb>^BJ`*nz z1mTR}{_fCDvqj09(X2!pCw7o8ZhHUX}}#J&Bz*Wldo zY*83PsWobWa!{#O{|p#S7&V3<-!SXxqG!v>WNpuwMg@$z26-hQW3mG7dxl_3oMfzW z`fS%_xX&rUsKVmgm1))>!!+s>ZB*9RM;BJNE}qQl0>Q( zgdf^Cofi#4I5198hdLa^W?sVJz4#zi3lWHSE4vvoXt(NaAV>|jvI;w#$0PxhH8+v>RkBsqS6$HVT zmq*7ZqtmnV@x|50Oh%|EFhdPEI7VB}K%@HwOh85_cre$Kl@sL>3}$j8m#lVgUxwTV z6B(<0jl8ta*}}a`#~DDq=l@4`z>#%wjUH?VYoIA!O%R&I&y+Zv-t+pyG literal 443 zcmXX?K~BUl475!pPKZBnC?`0yKiJzI5Ci+ba`yaLAARb{KTXU5}v z9^Z1b%hLT3@#~`*#>t(1h+ip}%Quhs0O`bKcGphwcQ!`=P*=$9I1KanEY`v848K=bDx+Rh#1PSg R92|FiVB&Xe-hZG;^bdPMP-_4H