From 9331121a9fe056ea84ed3262b434b05bcf4ce318 Mon Sep 17 00:00:00 2001
From: Daniel B Sherry <dbsherry890@gmail.com>
Date: Sun, 18 May 2025 11:39:24 -0500
Subject: [PATCH] lualine/bufferline ui

---
 Saved/bufferline.lua       | 167 -------------------------------------
 lua/plugins.lua            |   1 -
 lua/plugins/bufferline.lua | 150 +++++++++++++++++++++++++++++++++
 lua/plugins/lualine.lua    |  13 +++
 lua/plugins/nvim-tree.lua  |  71 +---------------
 lua/user/keymaps.lua       |   1 +
 tester.py                  |   7 +-
 7 files changed, 168 insertions(+), 242 deletions(-)
 delete mode 100644 Saved/bufferline.lua
 create mode 100644 lua/plugins/bufferline.lua
 create mode 100644 lua/plugins/lualine.lua

diff --git a/Saved/bufferline.lua b/Saved/bufferline.lua
deleted file mode 100644
index 8082d057..00000000
--- a/Saved/bufferline.lua
+++ /dev/null
@@ -1,167 +0,0 @@
-local status_ok, bufferline = pcall(require, "bufferline")
-if not status_ok then
-  return
-end
-
-bufferline.setup {
-  options = {
-    numbers = "none", -- | "ordinal" | "buffer_id" | "both" | function({ ordinal, id, lower, raise }): string,
-    close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
-    right_mouse_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
-    left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
-    middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
-    -- NOTE: this plugin is designed with this icon in mind,
-    -- and so changing this is NOT recommended, this is intended
-    -- as an escape hatch for people who cannot bear it for whatever reason
-    indicator_icon = "▎",
-    buffer_close_icon = "",
-    -- buffer_close_icon = '',
-    modified_icon = "●",
-    close_icon = "",
-    -- close_icon = '',
-    left_trunc_marker = "",
-    right_trunc_marker = "",
-    --- name_formatter can be used to change the buffer's label in the bufferline.
-    --- Please note some names can/will break the
-    --- bufferline so use this at your discretion knowing that it has
-    --- some limitations that will *NOT* be fixed.
-    -- name_formatter = function(buf)  -- buf contains a "name", "path" and "bufnr"
-    --   -- remove extension from markdown files for example
-    --   if buf.name:match('%.md') then
-    --     return vim.fn.fnamemodify(buf.name, ':t:r')
-    --   end
-    -- end,
-    max_name_length = 30,
-    max_prefix_length = 30, -- prefix used when a buffer is de-duplicated
-    tab_size = 16,
-    diagnostics = false, -- | "nvim_lsp" | "coc",
-    diagnostics_update_in_insert = false,
-    -- diagnostics_indicator = function(count, level, diagnostics_dict, context)
-    --   return "("..count..")"
-    -- end,
-    -- NOTE: this will be called a lot so don't do any heavy processing here
-    -- custom_filter = function(buf_number)
-    --   -- filter out filetypes you don't want to see
-    --   if vim.bo[buf_number].filetype ~= "<i-dont-want-to-see-this>" then
-    --     return true
-    --   end
-    --   -- filter out by buffer name
-    --   if vim.fn.bufname(buf_number) ~= "<buffer-name-I-dont-want>" then
-    --     return true
-    --   end
-    --   -- filter out based on arbitrary rules
-    --   -- e.g. filter out vim wiki buffer from tabline in your work repo
-    --   if vim.fn.getcwd() == "<work-repo>" and vim.bo[buf_number].filetype ~= "wiki" then
-    --     return true
-    --   end
-    -- end,
-    offsets = { { filetype = "NvimTree", text = "", padding = 1 } },
-    show_buffer_icons = true,
-    show_buffer_close_icons = true,
-    show_close_icon = true,
-    show_tab_indicators = true,
-    persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
-    -- can also be a table containing 2 custom separators
-    -- [focused and unfocused]. eg: { '|', '|' }
-    separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' },
-    enforce_regular_tabs = true,
-    always_show_bufferline = true,
-    -- sort_by = 'id' | 'extension' | 'relative_directory' | 'directory' | 'tabs' | function(buffer_a, buffer_b)
-    --   -- add custom logic
-    --   return buffer_a.modified > buffer_b.modified
-    -- end
-  },
-  highlights = {
-    fill = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    background = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-
-    -- buffer_selected = {
-    --   guifg = {attribute='fg',highlight='#ff0000'},
-    --   guibg = {attribute='bg',highlight='#0000ff'},
-    --   gui = 'none'
-    --   },
-    buffer_visible = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-
-    close_button = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    close_button_visible = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    -- close_button_selected = {
-    --   guifg = {attribute='fg',highlight='TabLineSel'},
-    --   guibg ={attribute='bg',highlight='TabLineSel'}
-    --   },
-
-    tab_selected = {
-      guifg = { attribute = "fg", highlight = "Normal" },
-      guibg = { attribute = "bg", highlight = "Normal" },
-    },
-    tab = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    tab_close = {
-      -- guifg = {attribute='fg',highlight='LspDiagnosticsDefaultError'},
-      guifg = { attribute = "fg", highlight = "TabLineSel" },
-      guibg = { attribute = "bg", highlight = "Normal" },
-    },
-
-    duplicate_selected = {
-      guifg = { attribute = "fg", highlight = "TabLineSel" },
-      guibg = { attribute = "bg", highlight = "TabLineSel" },
-      gui = "italic",
-    },
-    duplicate_visible = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-      gui = "italic",
-    },
-    duplicate = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-      gui = "italic",
-    },
-
-    modified = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    modified_selected = {
-      guifg = { attribute = "fg", highlight = "Normal" },
-      guibg = { attribute = "bg", highlight = "Normal" },
-    },
-    modified_visible = {
-      guifg = { attribute = "fg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-
-    separator = {
-      guifg = { attribute = "bg", highlight = "TabLine" },
-      guibg = { attribute = "bg", highlight = "TabLine" },
-    },
-    separator_selected = {
-      guifg = { attribute = "bg", highlight = "Normal" },
-      guibg = { attribute = "bg", highlight = "Normal" },
-    },
-    -- separator_visible = {
-    --   guifg = {attribute='bg',highlight='TabLine'},
-    --   guibg = {attribute='bg',highlight='TabLine'}
-    --   },
-    indicator_selected = {
-      guifg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" },
-      guibg = { attribute = "bg", highlight = "Normal" },
-    },
-  },
-}
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 30b4c7a8..62d53c51 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -4,7 +4,6 @@ return {
   { "windwp/nvim-autopairs" }, -- Autopairs
   -- "numToStr/Comment.nvim" -- Easily comment stuff
   { 'kyazdani42/nvim-web-devicons' },
-    { 'kyazdani42/nvim-tree.lua' },
   -- Colorschemes
   -- "lunarvim/colorschemes" -- A bunch of colorschemes you can try out
   { "lunarvim/darkplus.nvim" },
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
new file mode 100644
index 00000000..46b70b14
--- /dev/null
+++ b/lua/plugins/bufferline.lua
@@ -0,0 +1,150 @@
+return {
+  "akinsho/bufferline.nvim",
+  version = "*", 
+  dependencies = 'nvim-tree/nvim-web-devicons',
+  opts = {
+    options = {
+      numbers = "none", -- | "ordinal" | "buffer_id" | "both" | function({ ordinal, id, lower, raise }): string,
+      close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
+      right_mouse_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
+      left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
+      middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
+      -- NOTE: this plugin is designed with this icon in mind,
+      -- and so changing this is NOT recommended, this is intended
+      -- as an escape hatch for people who cannot bear it for whatever reason
+      indicator_icon = "▎",
+      buffer_close_icon = "",
+      -- buffer_close_icon = '',
+      modified_icon = "●",
+      close_icon = "",
+      -- close_icon = '',
+      left_trunc_marker = "",
+      right_trunc_marker = "",
+      --- name_formatter can be used to change the buffer's label in the bufferline.
+      --- Please note some names can/will break the
+      --- bufferline so use this at your discretion knowing that it has
+      --- some limitations that will *NOT* be fixed.
+      -- name_formatter = function(buf)  -- buf contains a "name", "path" and "bufnr"
+      --   -- remove extension from markdown files for example
+      --   if buf.name:match('%.md') then
+      --     return vim.fn.fnamemodify(buf.name, ':t:r')
+      --   end
+      -- end,
+      max_name_length = 30,
+      max_prefix_length = 30, -- prefix used when a buffer is de-duplicated
+      tab_size = 16,
+      diagnostics = false, -- | "nvim_lsp" | "coc",
+      diagnostics_update_in_insert = false,
+      offsets = {
+          {
+              filetype = "NvimTree",
+              text = "File Explorer",
+              text_align = "left",
+              separator = true,
+          }
+      },
+      show_buffer_icons = true,
+      show_buffer_close_icons = true,
+      show_close_icon = true,
+      show_tab_indicators = true,
+      persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
+      -- can also be a table containing 2 custom separators
+      -- [focused and unfocused]. eg: { '|', '|' }
+      separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' },
+      enforce_regular_tabs = true,
+      always_show_bufferline = true,
+      -- sort_by = 'id' | 'extension' | 'relative_directory' | 'directory' | 'tabs' | function(buffer_a, buffer_b)
+      --   -- add custom logic
+      --   return buffer_a.modified > buffer_b.modified
+      -- end
+      highlights = {
+        fill = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        background = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+
+        buffer_visible = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+
+        close_button = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        close_button_visible = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        -- close_button_selected = {
+        --   guifg = {attribute='fg',highlight='TabLineSel'},
+        --   guibg ={attribute='bg',highlight='TabLineSel'}
+        --   },
+
+        tab_selected = {
+          guifg = { attribute = "fg", highlight = "Normal" },
+          guibg = { attribute = "bg", highlight = "Normal" },
+        },
+        tab = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        tab_close = {
+          -- guifg = {attribute='fg',highlight='LspDiagnosticsDefaultError'},
+          guifg = { attribute = "fg", highlight = "TabLineSel" },
+          guibg = { attribute = "bg", highlight = "Normal" },
+        },
+
+        duplicate_selected = {
+          guifg = { attribute = "fg", highlight = "TabLineSel" },
+          guibg = { attribute = "bg", highlight = "TabLineSel" },
+          gui = "italic",
+        },
+        duplicate_visible = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+          gui = "italic",
+        },
+        duplicate = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+          gui = "italic",
+        },
+
+        modified = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        modified_selected = {
+          guifg = { attribute = "fg", highlight = "Normal" },
+          guibg = { attribute = "bg", highlight = "Normal" },
+        },
+        modified_visible = {
+          guifg = { attribute = "fg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+
+        separator = {
+          guifg = { attribute = "bg", highlight = "TabLine" },
+          guibg = { attribute = "bg", highlight = "TabLine" },
+        },
+        separator_selected = {
+          guifg = { attribute = "bg", highlight = "Normal" },
+          guibg = { attribute = "bg", highlight = "Normal" },
+        },
+        -- separator_visible = {
+        --   guifg = {attribute='bg',highlight='TabLine'},
+        --   guibg = {attribute='bg',highlight='TabLine'}
+        --   },
+        indicator_selected = {
+          guifg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" },
+          guibg = { attribute = "bg", highlight = "Normal" },
+        },
+      }
+    }
+  }
+}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 00000000..e84f6e1a
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,13 @@
+
+-- Using opts (recommended when no custom logic is needed)
+return {
+  "nvim-lualine/lualine.nvim",
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  opts = {
+    options = {
+      theme = "dracula",
+      section_separators = "",
+      component_separators = "",
+    },
+  },
+}
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
index 51db910c..29078ac4 100644
--- a/lua/plugins/nvim-tree.lua
+++ b/lua/plugins/nvim-tree.lua
@@ -15,11 +15,9 @@ return {
       local api = require("nvim-tree.api")
       
       return {
-        -- disable_netrw = false,
-        -- hiack_netrw = true,
         view = {
           width = 35,
-          side = "left",
+          side = "right",
           preserve_window_proportions = true,
         },
         hijack_cursor = true,
@@ -78,70 +76,3 @@ return {
     end,
   }
 }
-
-
---     local function opts(desc)
---       return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
---     end
-
---     -- default mappings
---     api.config.mappings.default_on_attach(bufnr)
-
---     -- custom mappings
---   end
-
-
---   -- set termguicolors to enable highlight groups
---   vim.opt.termguicolors = true
-
---   -- OR setup with some options
---   nvim_tree.setup({
---     on_attach = my_on_attach,
---     sort_by = "case_sensitive",
---     renderer = {
---         highlight_git = true,
---         root_folder_modifier = ":t",
---         icons = {
---             show = {
---                 file = true,
---                 folder = true,
---                 folder_arrow = true,
---                 git = true,
---             },
---             glyphs = {
---                 default = "",
---                 symlink = "",
---                 git = {
---                     unstaged = "",
---                     staged = "S",
---                     unmerged = "",
---                     renamed = "➜",
---                     deleted = "",
---                     untracked = "U",
---                     ignored = "◌",
---                 },
---                 folder = {
---                     default = "",
---                     open = "",
---                     empty = "",
---                     empty_open = "",
---                     symlink = "",
---                 },
---             }
---         }
---     },
---     filters = {
---       dotfiles = true,
---     },
---     update_cwd = true,
---     diagnostics = {
---         enable = true,
---         icons = {
---             hint = "",
---             info = "",
---             warning = "",
---             error = "",
---         },
---     },
---   })
--- }
\ No newline at end of file
diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 9e116cdd..315186d6 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -130,3 +130,4 @@ vim.keymap.set("n", "k", "gk", opts)
 vim.keymap.set("n", "<C-a>", "ggVG", opts)
 
 vim.keymap.set("n", "YY", "va{Vy", opts)
+vim.keymap.set("n", "<leader>r", ":w<CR>:!python3 %<CR>", { noremap = true, silent = true })
diff --git a/tester.py b/tester.py
index e392f2f4..8f178cda 100644
--- a/tester.py
+++ b/tester.py
@@ -1,5 +1,4 @@
-x = [1, 2, 3]
+items = [1, 2, 3]
 
-for item in x:
-    print(item)
-# print(type(mydict))
+print([x**2 for x in items])
+print(items*2)