tree-wide: Format files | Reformat chadrc | Misc (#268)

chadrc: looks cleaner this way

move close buffer to misc as it is not dependent on buffer plugin

lua/chadrc.lua

@@ -1,15 +1,21 @@
-local M = {
-   ui = {
+local M = {}
+
+M.ui = {
    theme = "onedark",
-      fav_themes = { "onedark", "gruvchad" }, -- for theme toggle
+   -- for theme toggle
+   fav_themes = {
+      "onedark",
+      "gruvchad",
+   },
    theme_toggler = false,
    hidden_statusline = {
       -- these are filetypes, not pattern matched
       "NvimTree",
       "toggleterm",
    },
-   },
-   options = {
+}
+
+M.options = {
    permanent_undo = true,
    ruler = false,
    hidden = true,
@@ -27,9 +33,10 @@ local M = {
    mapleader = " ",
    autosave = false,
    enable_insertNav = true, -- navigation in insertmode
-   },
-   -- enable and disable plugins (true for disable)
-   plugin_status = {
+}
+
+-- enable and disable plugins (false for disable)
+M.plugin_status = {
    -- UI
    nvim_bufferline = true,
    galaxyline = true,
@@ -52,9 +59,11 @@ local M = {
    neoscroll_nvim = true,
    telescope_media = true,
    cheatsheet = false,
-   },
+}
+
 -- make sure you dont use same keys twice
-   mappings = {
+M.mappings = {
+   -- plugin specific
    truezen = {
       ataraxisMode = "<leader>zz",
       minimalisticmode = "<leader>zm",
@@ -64,7 +73,7 @@ local M = {
       comment_toggle = "<leader>/",
    },
    nvimtree = {
-         treetoggle = "<C-n>",
+      treetoggle = "<C-n>", -- file manager
    },
    neoformat = {
       format = "<leader>fm",
@@ -96,9 +105,8 @@ local M = {
    bufferline = {
       new_buffer = "<S-t>",
       newtab = "<C-t>b",
-         close = "<S-x>",
-         cycleNext = "<TAB>",
-         cyclePrev = "<S-Tab>",
+      cycleNext = "<TAB>", -- next buffer
+      cyclePrev = "<S-Tab>", -- previous buffer
    },
    fugitive = {
       Git = "<leader>gs",
@@ -112,6 +120,7 @@ local M = {
       toggle_hori = "<leader>h",
       hide_term = "JK",
    },
+   -- navigation in insert mode
    insert_nav = {
       forward = "<C-l>",
       backward = "<C-h>",
@@ -120,13 +129,14 @@ local M = {
       prev_line = "<C-j>",
       next_line = "<C-k>",
    },
+   -- non plugin
    misc = {
-         esc_Termmode = "jk",
+      esc_Termmode = "jk", -- get out of terminal mode
+      close_buffer = "<S-x>", -- close current focused buffer
       copywhole_file = "<C-a>",
-         toggle_linenr = "<leader>n",
+      toggle_linenr = "<leader>n", -- show or hide line number
       theme_toggle = "<leader>x",
    },
-   },
 }
 
 return M

lua/mappings.lua

@@ -45,6 +45,10 @@ map("n", miscMap.toggle_linenr, ":set nu!<CR>", opt)
 -- get out of terminal with jk
 map("t", miscMap.esc_Termmode, "<C-\\><C-n>", opt)
 
+-- close current focused buffer, terminal or normal
+-- todo: don't close if non-terminal buffer is saved
+map("n", miscMap.close_buffer, ":bd!<CR>", opt)
+
 M.toggleterm = function()
    local m = user_map.toggleterm
 
@@ -131,7 +135,6 @@ M.bufferline = function()
 
    map("n", m.new_buffer, ":enew<CR>", opt) -- new buffer
    map("n", m.newtab, ":tabnew<CR>", opt) -- new tab
-   map("n", m.close, ":bd!<CR>", opt) -- close  buffer
 
    -- move between tabs
 

lua/themes/chadracula.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#343642",
    lightbg2 = "#2f313d",
    pmenu_bg = "#b389ef",
-   folder_bg = "#BD93F9"
+   folder_bg = "#BD93F9",
 }
 
 return colors

lua/themes/everforest.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#3d454b",
    lightbg2 = "#333b41",
    pmenu_bg = "#83c092",
-   folder_bg = "#7fbbb3"
+   folder_bg = "#7fbbb3",
 }
 
 return colors

lua/themes/gruvchad.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3139",
    lightbg2 = "#262a32",
    pmenu_bg = "#89b482",
-   folder_bg = "#6d8dad"
+   folder_bg = "#6d8dad",
 }
 
 return colors

lua/themes/mountain.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3339",
    lightbg2 = "#252b31",
    pmenu_bg = "#8aac8b",
-   folder_bg = "#6b8bab"
+   folder_bg = "#6b8bab",
 }
 
 return colors

lua/themes/norchad.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#3f4551",
    lightbg2 = "#393f4b",
    pmenu_bg = "#A3BE8C",
-   folder_bg = "#7797b7"
+   folder_bg = "#7797b7",
 }
 
 return colors

lua/themes/one-light.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#d6d6d6",
    lightbg2 = "#5e5f65",
    pmenu_bg = "#5e5f65",
-   folder_bg = "#6C6C6C"
+   folder_bg = "#6C6C6C",
 }
 
 return colors

lua/themes/onedark.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3139",
    lightbg2 = "#262a32",
    pmenu_bg = "#A3BE8C",
-   folder_bg = "#61afef"
+   folder_bg = "#61afef",
 }
 
 return colors

lua/themes/tokyonight.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#252631",
    lightbg2 = "#22232e",
    pmenu_bg = "#7aa2f7",
-   folder_bg = "#7aa2f7"
+   folder_bg = "#7aa2f7",
 }
 
 return colors

lua/themes/tomorrow-night.lua

@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#373B41",
    lightbg2 = "#2D3035",
    pmenu_bg = "#a4b595",
-   folder_bg = "#6f8dab"
+   folder_bg = "#6f8dab",
 }
 
 return colors