Various Plugins and Settings

lua/keymaps.lua

@@ -105,7 +105,7 @@ M(
   )
 
 M(
-  'n', '<leader>ce', ":TodoTrouble keywords=TODO<CR> | resize +10<CR>", 
+  'n', '<leader>ce', ":TodoTrouble keywords=TODO,FEAT<CR> | resize +10<CR>", 
   {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', '<leader>b', ":! black %<CR>",
+  {silent=true, noremap=true},
+  "Black Cwf",
+  "black_current_file",
+  "Use Black Formatting on Current File."
+)
+
+M(
+  'n', '<leader>m', ":! markdownlint -f %<CR>",
+  {silent=true, noremap=true},
+  "Black Cwf",
+  "black_current_file",
+  "Use Black Formatting on Current File."
+) 

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" }}),
   },
 })

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 = {
-        ["<C-h>"] = "which_key"
-        -- map actions.which_key to <C-h> (default: <C-/>)
-        -- 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"] = {
-
+          ["<C-c>"] = fb_actions.create
         },
         ["n"] = {
-         
+        
         },
       },
     },
---]]
   },
-
 })
 
 require("telescope").load_extension "file_browser"

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" }
     },
 }

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 = {