From 196d3ee59e03c7e43d946cd04be1189ad608bd26 Mon Sep 17 00:00:00 2001 From: rootiest Date: Sat, 13 Jul 2024 11:51:32 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Projects=20and=20plugins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds Projects option - Reorganize plugins --- init.lua | 23 +----- lua/plugins/ansi-escape.lua | 8 -- lua/plugins/auto-save.lua | 10 --- lua/plugins/codesnap.lua | 16 ---- lua/plugins/codewindow.lua | 34 -------- lua/plugins/coding.lua | 38 +++++++++ lua/plugins/colorizer.lua | 9 -- lua/plugins/comment.lua | 10 --- lua/plugins/dap.lua | 4 + lua/plugins/dead-column.lua | 32 -------- lua/plugins/editor.lua | 80 ++++++++++++++++++ lua/plugins/gists.lua | 17 ---- lua/plugins/gx.lua | 12 --- lua/plugins/hlchunk.lua | 21 ----- lua/plugins/icon-picker.lua | 9 -- lua/plugins/kitty-navigator.lua | 27 ------ lua/plugins/kitty-runner.lua | 11 --- lua/plugins/kitty-scrollback.lua | 17 ---- lua/plugins/lang.lua | 9 ++ lua/plugins/lazygit.lua | 16 ---- lua/plugins/persistence.lua | 9 -- lua/plugins/remote-nvim.lua | 14 ---- lua/plugins/rip-substitute.lua | 8 -- lua/plugins/smoothcursor.lua | 86 -------------------- lua/plugins/toggleterm.lua | 44 ---------- lua/plugins/transparent.lua | 8 -- lua/plugins/ugbi.lua | 7 -- lua/plugins/util.lua | 77 ++++++++++++++++++ lua/{plugins => ui}/dashboard.lua | 0 lua/ui/kitty.lua | 35 ++++++++ lua/ui/ui.lua | 131 ++++++++++++++++++++++++++++++ lua/{plugins => ui}/wezterm.lua | 0 32 files changed, 375 insertions(+), 447 deletions(-) delete mode 100644 lua/plugins/ansi-escape.lua delete mode 100644 lua/plugins/auto-save.lua delete mode 100644 lua/plugins/codesnap.lua delete mode 100644 lua/plugins/codewindow.lua create mode 100644 lua/plugins/coding.lua delete mode 100644 lua/plugins/colorizer.lua delete mode 100644 lua/plugins/comment.lua create mode 100644 lua/plugins/dap.lua delete mode 100644 lua/plugins/dead-column.lua create mode 100644 lua/plugins/editor.lua delete mode 100644 lua/plugins/gists.lua delete mode 100644 lua/plugins/gx.lua delete mode 100644 lua/plugins/hlchunk.lua delete mode 100644 lua/plugins/icon-picker.lua delete mode 100644 lua/plugins/kitty-navigator.lua delete mode 100644 lua/plugins/kitty-runner.lua delete mode 100644 lua/plugins/kitty-scrollback.lua create mode 100644 lua/plugins/lang.lua delete mode 100644 lua/plugins/lazygit.lua delete mode 100644 lua/plugins/persistence.lua delete mode 100644 lua/plugins/remote-nvim.lua delete mode 100644 lua/plugins/rip-substitute.lua delete mode 100644 lua/plugins/smoothcursor.lua delete mode 100644 lua/plugins/toggleterm.lua delete mode 100644 lua/plugins/transparent.lua delete mode 100644 lua/plugins/ugbi.lua create mode 100644 lua/plugins/util.lua rename lua/{plugins => ui}/dashboard.lua (100%) create mode 100644 lua/ui/kitty.lua create mode 100644 lua/ui/ui.lua rename lua/{plugins => ui}/wezterm.lua (100%) diff --git a/init.lua b/init.lua index 48c99b4..a78314e 100644 --- a/init.lua +++ b/init.lua @@ -72,28 +72,7 @@ vim.g.loaded_perl_provider = 0 require("lazy").setup({ spec = { { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - { import = "lazyvim.plugins.extras.dap.core" }, - { import = "lazyvim.plugins.extras.dap.nlua" }, - { import = "lazyvim.plugins.extras.ui.edgy" }, - { import = "lazyvim.plugins.extras.util.chezmoi" }, - { import = "lazyvim.plugins.extras.editor.aerial" }, - { import = "lazyvim.plugins.extras.editor.dial" }, - { import = "lazyvim.plugins.extras.editor.illuminate" }, - { import = "lazyvim.plugins.extras.editor.outline" }, - { import = "lazyvim.plugins.extras.coding.codeium" }, - { import = "lazyvim.plugins.extras.coding.yanky" }, - { import = "lazyvim.plugins.extras.coding.mini-surround" }, - { import = "lazyvim.plugins.extras.ui.mini-animate" }, - { import = "lazyvim.plugins.extras.util.gitui" }, - { import = "lazyvim.plugins.extras.util.octo" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.lang.toml" }, - { import = "lazyvim.plugins.extras.lang.git" }, - { import = "lazyvim.plugins.extras.lang.python" }, - { import = "lazyvim.plugins.extras.lang.toml" }, - { import = "lazyvim.plugins.extras.lang.yaml" }, - { import = "lazyvim.plugins.extras.editor.telescope" }, + { import = "ui" }, { import = "plugins" }, { import = "themes" }, }, diff --git a/lua/plugins/ansi-escape.lua b/lua/plugins/ansi-escape.lua deleted file mode 100644 index 58c66ba..0000000 --- a/lua/plugins/ansi-escape.lua +++ /dev/null @@ -1,8 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- ANSI-escape --------------------------------- --- ----------------------------------------------------------------------------- -return { - "vim-scripts/AnsiEsc.vim", - lazy = true, -} - diff --git a/lua/plugins/auto-save.lua b/lua/plugins/auto-save.lua deleted file mode 100644 index 76b4b97..0000000 --- a/lua/plugins/auto-save.lua +++ /dev/null @@ -1,10 +0,0 @@ --- ----------------------------------------------------------------------------- --- -------------------------------- auto-save ---------------------------------- --- ----------------------------------------------------------------------------- -return { - "Pocco81/auto-save.nvim", - config = function() - require("auto-save").setup({}) - end, -} - diff --git a/lua/plugins/codesnap.lua b/lua/plugins/codesnap.lua deleted file mode 100644 index 67bfbea..0000000 --- a/lua/plugins/codesnap.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ----------------------------------------------------------------------------- --- -------------------------------- CodeSnap ----------------------------------- --- ----------------------------------------------------------------------------- -return { - "mistricky/codesnap.nvim", - build = "make", - opts = { - save_path = "~/Pictures/Screenshots/", - has_breadcrumbs = true, - show_workspace = true, - bg_theme = "default", - watermark = "Rootiest Snippets", - code_font_family = "Iosevka NF", - code_font_size = 12, - }, -} diff --git a/lua/plugins/codewindow.lua b/lua/plugins/codewindow.lua deleted file mode 100644 index a6b8a01..0000000 --- a/lua/plugins/codewindow.lua +++ /dev/null @@ -1,34 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- CodeWindow ---------------------------------- --- ----------------------------------------------------------------------------- -return { - "gorbit99/codewindow.nvim", - version = false, - config = function() - require("codewindow").setup({ - active_in_terminals = false, -- Should the minimap activate for terminal buffers - auto_enable = true, -- Automatically open the minimap when entering a (non-excluded) buffer (accepts a table of filetypes) - exclude_filetypes = { "help", "dashboard" }, -- Choose certain filetypes to not show minimap on - max_minimap_height = nil, -- The maximum height the minimap can take (including borders) - max_lines = nil, -- If auto_enable is true, don't open the minimap for buffers which have more than this many lines. - minimap_width = 10, -- The width of the text part of the minimap - use_lsp = true, -- Use the builtin LSP to show errors and warnings - use_treesitter = true, -- Use nvim-treesitter to highlight the code - use_git = true, -- Show small dots to indicate git additions and deletions - width_multiplier = 4, -- How many characters one dot represents - z_index = 1, -- The z-index the floating window will be on - show_cursor = true, -- Show the cursor position in the minimap - screen_bounds = "background", -- How the visible area is displayed, "lines": lines above and below, "background": background color - window_border = "none", -- The border style of the floating window (accepts all usual options) - relative = "win", -- What will be the minimap be placed relative to, "win": the curre - events = { - "TextChanged", - "InsertLeave", - "DiagnosticChanged", - "FileWritePost", - }, -- Events that update the code window - }) - require("codewindow").apply_default_keybinds() - end, -} - diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua new file mode 100644 index 0000000..bce185f --- /dev/null +++ b/lua/plugins/coding.lua @@ -0,0 +1,38 @@ +return { + { import = "lazyvim.plugins.extras.coding.codeium" }, + { import = "lazyvim.plugins.extras.coding.yanky" }, + { import = "lazyvim.plugins.extras.coding.mini-surround" }, + { + "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, + }, + { + "vim-scripts/AnsiEsc.vim", + lazy = true, + }, + { + "numToStr/Comment.nvim", + config = function() + require("Comment").setup() + end, + }, + { + "shellRaining/hlchunk.nvim", + lazy = false, + config = function() + require("hlchunk").setup({ + chunk = { + style = { + { fg = "#90FDA9" }, + }, + enable = true, + }, + indent = { + enable = true, + }, + }) + end, + }, +} diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua deleted file mode 100644 index 7c4ff18..0000000 --- a/lua/plugins/colorizer.lua +++ /dev/null @@ -1,9 +0,0 @@ --- ----------------------------------------------------------------------------- --- -------------------------------- Colorizer ---------------------------------- --- ----------------------------------------------------------------------------- -return { - "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, -} diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua deleted file mode 100644 index 4eac629..0000000 --- a/lua/plugins/comment.lua +++ /dev/null @@ -1,10 +0,0 @@ --- ----------------------------------------------------------------------------- --- --------------------------------- Comment ----------------------------------- --- ----------------------------------------------------------------------------- -return { - "numToStr/Comment.nvim", - config = function() - require("Comment").setup() - end, -} - diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua new file mode 100644 index 0000000..efd66ba --- /dev/null +++ b/lua/plugins/dap.lua @@ -0,0 +1,4 @@ +return { + { import = "lazyvim.plugins.extras.dap.core" }, + { import = "lazyvim.plugins.extras.dap.nlua" }, +} diff --git a/lua/plugins/dead-column.lua b/lua/plugins/dead-column.lua deleted file mode 100644 index 5e504f1..0000000 --- a/lua/plugins/dead-column.lua +++ /dev/null @@ -1,32 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- DeadColumn ---------------------------------- --- ----------------------------------------------------------------------------- -return { - "Bekaboo/deadcolumn.nvim", - config = function() - require("deadcolumn").setup({ - scope = "line", ---@type string|fun(): integer - ---@type string[]|fun(mode: string): boolean - modes = function(mode) - return mode:find("^[ictRss\x13]") ~= nil - end, - blending = { - threshold = 0.9, - colorcode = "#737895", - hlgroup = { "Normal", "bg" }, - }, - warning = { - alpha = 0.4, - offset = 0, - colorcode = "#f27b82", - hlgroup = { "Error", "bg" }, - }, - extra = { - ---@type string? - follow_tw = "80", - }, - }) - vim.cmd(":set colorcolumn=120") - end, -} - diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua new file mode 100644 index 0000000..626ba42 --- /dev/null +++ b/lua/plugins/editor.lua @@ -0,0 +1,80 @@ +return { + { import = "lazyvim.plugins.extras.editor.aerial" }, + { import = "lazyvim.plugins.extras.editor.dial" }, + { import = "lazyvim.plugins.extras.editor.illuminate" }, + { import = "lazyvim.plugins.extras.editor.outline" }, + { import = "lazyvim.plugins.extras.editor.telescope" }, + { + "gorbit99/codewindow.nvim", + version = false, + config = function() + require("codewindow").setup({ + active_in_terminals = false, -- Should the minimap activate for terminal buffers + auto_enable = true, -- Automatically open the minimap when entering a (non-excluded) buffer (accepts a table of filetypes) + exclude_filetypes = { "help", "dashboard" }, -- Choose certain filetypes to not show minimap on + max_minimap_height = nil, -- The maximum height the minimap can take (including borders) + max_lines = nil, -- If auto_enable is true, don't open the minimap for buffers which have more than this many lines. + minimap_width = 10, -- The width of the text part of the minimap + use_lsp = true, -- Use the builtin LSP to show errors and warnings + use_treesitter = true, -- Use nvim-treesitter to highlight the code + use_git = true, -- Show small dots to indicate git additions and deletions + width_multiplier = 4, -- How many characters one dot represents + z_index = 1, -- The z-index the floating window will be on + show_cursor = true, -- Show the cursor position in the minimap + screen_bounds = "background", -- How the visible area is displayed, "lines": lines above and below, "background": background color + window_border = "none", -- The border style of the floating window (accepts all usual options) + relative = "win", -- What will be the minimap be placed relative to, "win": the curre + events = { + "TextChanged", + "InsertLeave", + "DiagnosticChanged", + "FileWritePost", + }, -- Events that update the code window + }) + require("codewindow").apply_default_keybinds() + end, + }, + { + "folke/persistence.nvim", + event = "BufReadPre", + opts = {}, + }, + { + "amitds1997/remote-nvim.nvim", + version = "*", -- Pin to GitHub releases + dependencies = { + "nvim-lua/plenary.nvim", -- For standard functions + "MunifTanjim/nui.nvim", -- To build the plugin UI + "nvim-telescope/telescope.nvim", -- For picking b/w different remote methods + }, + config = true, + }, + { + "Bekaboo/deadcolumn.nvim", + config = function() + require("deadcolumn").setup({ + scope = "line", ---@type string|fun(): integer + ---@type string[]|fun(mode: string): boolean + modes = function(mode) + return mode:find("^[ictRss\x13]") ~= nil + end, + blending = { + threshold = 0.9, + colorcode = "#737895", + hlgroup = { "Normal", "bg" }, + }, + warning = { + alpha = 0.4, + offset = 0, + colorcode = "#f27b82", + hlgroup = { "Error", "bg" }, + }, + extra = { + ---@type string? + follow_tw = "80", + }, + }) + vim.cmd(":set colorcolumn=120") + end, + }, +} diff --git a/lua/plugins/gists.lua b/lua/plugins/gists.lua deleted file mode 100644 index 30a6f34..0000000 --- a/lua/plugins/gists.lua +++ /dev/null @@ -1,17 +0,0 @@ --- ----------------------------------------------------------------------------- --- ---------------------------------- Gists ------------------------------------ --- ----------------------------------------------------------------------------- -return { - { - "Rawnly/gist.nvim", - cmd = { "GistCreate", "GistCreateFromFile", "GistsList" }, - config = true, - }, - { - "samjwill/nvim-unception", - lazy = false, - init = function() - vim.g.unception_block_while_host_edits = true - end, - }, -} diff --git a/lua/plugins/gx.lua b/lua/plugins/gx.lua deleted file mode 100644 index ba1bbee..0000000 --- a/lua/plugins/gx.lua +++ /dev/null @@ -1,12 +0,0 @@ --- ----------------------------------------------------------------------------- --- ----------------------------------- gx -------------------------------------- --- ----------------------------------------------------------------------------- -return { - "chrishrb/gx.nvim", - cmd = { "Browse" }, - init = function() - vim.g.netrw_nogx = 1 - end, - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, -} diff --git a/lua/plugins/hlchunk.lua b/lua/plugins/hlchunk.lua deleted file mode 100644 index 95390c5..0000000 --- a/lua/plugins/hlchunk.lua +++ /dev/null @@ -1,21 +0,0 @@ --- ----------------------------------------------------------------------------- --- --------------------------------- hlchunk ----------------------------------- --- ----------------------------------------------------------------------------- -return { - "shellRaining/hlchunk.nvim", - lazy = false, - config = function() - require("hlchunk").setup({ - chunk = { - style = { - { fg = "#90FDA9" }, - }, - enable = true, - }, - indent = { - enable = true, - }, - }) - end, -} - diff --git a/lua/plugins/icon-picker.lua b/lua/plugins/icon-picker.lua deleted file mode 100644 index 96f59a2..0000000 --- a/lua/plugins/icon-picker.lua +++ /dev/null @@ -1,9 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- Icon Picker --------------------------------- --- ----------------------------------------------------------------------------- -return { - "ziontee113/icon-picker.nvim", - config = function() - require("icon-picker").setup({ disable_legacy_commands = true }) - end, -} diff --git a/lua/plugins/kitty-navigator.lua b/lua/plugins/kitty-navigator.lua deleted file mode 100644 index 01e2054..0000000 --- a/lua/plugins/kitty-navigator.lua +++ /dev/null @@ -1,27 +0,0 @@ --- ----------------------------------------------------------------------------- --- ----------------------------- kitty-navigator ------------------------------- --- ----------------------------------------------------------------------------- --- return { --- "knubie/vim-kitty-navigator", --- build = { --- "cp ./*.py ~/.config/kitty/", --- }, --- cond = function() -- Using Kitty --- local term = os.getenv("TERM") or "" --- local kit = string.find(term, "kitty") --- return kit ~= nil --- end, --- } - -return { - "MunsMan/kitty-navigator.nvim", - build = { - "cp navigate_kitty.py ~/.config/kitty", - "cp pass_keys.py ~/.config/kitty", - }, - cond = function() -- Using Kitty - local term = os.getenv("TERM") or "" - local kit = string.find(term, "kitty") - return kit ~= nil - end, -} diff --git a/lua/plugins/kitty-runner.lua b/lua/plugins/kitty-runner.lua deleted file mode 100644 index 131e3c3..0000000 --- a/lua/plugins/kitty-runner.lua +++ /dev/null @@ -1,11 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------ kitty-runner --------------------------------- --- ----------------------------------------------------------------------------- -return { - "jghauser/kitty-runner.nvim", - cond = function() -- Using Kitty - local term = os.getenv("TERM") or "" - local kit = string.find(term, "kitty") - return kit ~= nil - end, -} diff --git a/lua/plugins/kitty-scrollback.lua b/lua/plugins/kitty-scrollback.lua deleted file mode 100644 index 2218f93..0000000 --- a/lua/plugins/kitty-scrollback.lua +++ /dev/null @@ -1,17 +0,0 @@ --- ----------------------------------------------------------------------------- --- ---------------------------- kitty-scrollback ------------------------------- --- ----------------------------------------------------------------------------- -return { - "mikesmithgh/kitty-scrollback.nvim", - enabled = true, - lazy = true, - cmd = { "KittyScrollbackGenerateKittens", "KittyScrollbackCheckHealth" }, - event = { "User KittyScrollbackLaunch" }, - version = "*", - config = function() -- Using Kitty-Scrollback - if vim.env.KITTY_SCROLLBACK_NVIM == "true" then - require("kitty-scrollback").setup() - end - end, -} - diff --git a/lua/plugins/lang.lua b/lua/plugins/lang.lua new file mode 100644 index 0000000..2881d11 --- /dev/null +++ b/lua/plugins/lang.lua @@ -0,0 +1,9 @@ +return { + { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.lang.markdown" }, + { import = "lazyvim.plugins.extras.lang.toml" }, + { import = "lazyvim.plugins.extras.lang.git" }, + { import = "lazyvim.plugins.extras.lang.python" }, + { import = "lazyvim.plugins.extras.lang.toml" }, + { import = "lazyvim.plugins.extras.lang.yaml" }, +} diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua deleted file mode 100644 index aa155ec..0000000 --- a/lua/plugins/lazygit.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ----------------------------------------------------------------------------- --- --------------------------------- LazyGit ----------------------------------- --- ----------------------------------------------------------------------------- -return { - "kdheepak/lazygit.nvim", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - dependencies = { - "nvim-lua/plenary.nvim", - }, -} diff --git a/lua/plugins/persistence.lua b/lua/plugins/persistence.lua deleted file mode 100644 index 0472f32..0000000 --- a/lua/plugins/persistence.lua +++ /dev/null @@ -1,9 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- Persistence --------------------------------- --- ----------------------------------------------------------------------------- -return { - "folke/persistence.nvim", - event = "BufReadPre", - opts = {}, -} - diff --git a/lua/plugins/remote-nvim.lua b/lua/plugins/remote-nvim.lua deleted file mode 100644 index dd9c221..0000000 --- a/lua/plugins/remote-nvim.lua +++ /dev/null @@ -1,14 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- remote-nvim --------------------------------- --- ----------------------------------------------------------------------------- -return { - "amitds1997/remote-nvim.nvim", - version = "*", -- Pin to GitHub releases - dependencies = { - "nvim-lua/plenary.nvim", -- For standard functions - "MunifTanjim/nui.nvim", -- To build the plugin UI - "nvim-telescope/telescope.nvim", -- For picking b/w different remote methods - }, - config = true, -} - diff --git a/lua/plugins/rip-substitute.lua b/lua/plugins/rip-substitute.lua deleted file mode 100644 index acff236..0000000 --- a/lua/plugins/rip-substitute.lua +++ /dev/null @@ -1,8 +0,0 @@ --- ----------------------------------------------------------------------------- --- ----------------------------- rip-substitute -------------------------------- --- ----------------------------------------------------------------------------- - -return { - "chrisgrieser/nvim-rip-substitute", - cmd = "RipSubstitute", -} diff --git a/lua/plugins/smoothcursor.lua b/lua/plugins/smoothcursor.lua deleted file mode 100644 index 0b368e1..0000000 --- a/lua/plugins/smoothcursor.lua +++ /dev/null @@ -1,86 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------ SmoothCursor --------------------------------- --- ----------------------------------------------------------------------------- -return { - "gen740/SmoothCursor.nvim", - config = function() - require("smoothcursor").setup({ - type = "default", - cursor = "", - texthl = "SmoothCursor", - fancy = { - enable = true, -- enable fancy mode - head = { cursor = "", texthl = nil, linehl = nil }, - body = {}, - tail = { false }, -- false to disable fancy tail - }, - matrix = { -- Loaded when 'type' is set to "matrix" - head = { - cursor = require("smoothcursor.matrix_chars"), - texthl = { - "SmoothCursor", - }, - linehl = nil, -- No line highlight for the head - }, - body = { - length = 6, -- Specifies the length of the cursor body - cursor = require("smoothcursor.matrix_chars"), - texthl = { - "SmoothCursorGreen", - }, - }, - tail = { - cursor = nil, - texthl = { - "SmoothCursor", - }, - }, - unstop = false, - }, - autostart = true, -- Automatically start SmoothCursor - always_redraw = true, -- Redraw the screen on each update - flyin_effect = nil, -- Choose "bottom" or "top" for flying effect - speed = 25, -- Max speed is 100 to stick with your current position - intervals = 35, -- Update intervals in milliseconds - priority = 10, -- Set marker priority - timeout = 3000, -- Timeout for animations in milliseconds - threshold = 3, -- Animate only if cursor moves more than this many lines - max_threshold = 2000, -- If you move more than this many lines, don't animate (if `nil`, deactivate check) - disable_float_win = false, -- Disable in floating windows - enabled_filetypes = nil, -- Enable only for specific file types, e.g., { "lua", "vim" } - disabled_filetypes = nil, -- Disable for these file types - show_last_positions = nil, - }) - -- Define cursor color/icon based on mode - local autocmd = vim.api.nvim_create_autocmd - autocmd({ "ModeChanged", "BufEnter" }, { - callback = function() - local current_mode = vim.fn.mode() - if current_mode == "n" then - vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#8aa8f3" }) - vim.fn.sign_define("smoothcursor", { text = "" }) - elseif current_mode == "v" then - vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#d298eb" }) - vim.fn.sign_define("smoothcursor", { text = "" }) - elseif current_mode == "V" then - vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#d298eb" }) - vim.fn.sign_define("smoothcursor", { text = "" }) - elseif current_mode == "�" then - vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#bf616a" }) - vim.fn.sign_define("smoothcursor", { text = "" }) - elseif current_mode == "i" then - vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#9bd482" }) - vim.fn.sign_define("smoothcursor", { text = "" }) - end - end, - }) - -- Define last cursor position icon - vim.fn.sign_define("smoothcursor_n", { text = "" }) - vim.fn.sign_define("smoothcursor_v", { text = " " }) - vim.fn.sign_define("smoothcursor_V", { text = "" }) - vim.fn.sign_define("smoothcursor_i", { text = "" }) - vim.fn.sign_define("smoothcursor_�", { text = "" }) - vim.fn.sign_define("smoothcursor_R", { text = "󰊄" }) - end, -} - diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua deleted file mode 100644 index 8c08d25..0000000 --- a/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,44 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- ToggleTerm ---------------------------------- --- ----------------------------------------------------------------------------- -return { - "akinsho/toggleterm.nvim", - version = false, - lazy = false, - config = function() - require("toggleterm").setup({ - -- size can be a number or function which is passed the current terminal - size = function(term) - if term.direction == "horizontal" then - return 10 - elseif term.direction == "vertical" then - return vim.o.columns * 0.4 - end - end, - open_mapping = [[]], - hide_numbers = true, - autochdir = true, - shade_terminals = false, - start_in_insert = true, - insert_mappings = true, - terminal_mappings = true, - persist_size = true, - persist_mode = true, - direction = "horizontal", - close_on_exit = true, - shell = vim.o.shell, - auto_scroll = true, - float_opts = { - border = "curved", - winblend = 3, - title_pos = "left", - }, - winbar = { - enabled = true, - name_formatter = function(term) -- term: Terminal - return term.name - end, - }, - }) - end, -} diff --git a/lua/plugins/transparent.lua b/lua/plugins/transparent.lua deleted file mode 100644 index a2f9484..0000000 --- a/lua/plugins/transparent.lua +++ /dev/null @@ -1,8 +0,0 @@ --- ----------------------------------------------------------------------------- --- ------------------------------- Transparent --------------------------------- --- ----------------------------------------------------------------------------- -return { - "xiyaowong/transparent.nvim", - config = true, -} - diff --git a/lua/plugins/ugbi.lua b/lua/plugins/ugbi.lua deleted file mode 100644 index e536313..0000000 --- a/lua/plugins/ugbi.lua +++ /dev/null @@ -1,7 +0,0 @@ --- ----------------------------------------------------------------------------- --- --------------------------- User-getting-bored ------------------------------ --- ----------------------------------------------------------------------------- -return { - "mikesmithgh/ugbi", - lazy = false, -} diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua new file mode 100644 index 0000000..82a5718 --- /dev/null +++ b/lua/plugins/util.lua @@ -0,0 +1,77 @@ +return { + { + import = "lazyvim.plugins.extras.util.project", + opts = { manual_mode = false }, + }, + { import = "lazyvim.plugins.extras.util.chezmoi" }, + { import = "lazyvim.plugins.extras.util.dot" }, + { import = "lazyvim.plugins.extras.util.gitui" }, + { import = "lazyvim.plugins.extras.util.octo" }, + { + "chrishrb/gx.nvim", + cmd = { "Browse" }, + init = function() + vim.g.netrw_nogx = 1 + end, + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, + { + "Pocco81/auto-save.nvim", + config = function() + require("auto-save").setup({}) + end, + }, + { + "mikesmithgh/ugbi", + lazy = false, + }, + { + "chrisgrieser/nvim-rip-substitute", + cmd = "RipSubstitute", + }, + { + "Rawnly/gist.nvim", + cmd = { "GistCreate", "GistCreateFromFile", "GistsList" }, + config = true, + }, + { + "samjwill/nvim-unception", + lazy = false, + init = function() + vim.g.unception_block_while_host_edits = true + end, + }, + { + "ziontee113/icon-picker.nvim", + config = function() + require("icon-picker").setup({ disable_legacy_commands = true }) + end, + }, + { + "kdheepak/lazygit.nvim", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + dependencies = { + "nvim-lua/plenary.nvim", + }, + }, + { + "mistricky/codesnap.nvim", + build = "make", + opts = { + save_path = "~/Pictures/Screenshots/", + has_breadcrumbs = true, + show_workspace = true, + bg_theme = "default", + watermark = "Rootiest Snippets", + code_font_family = "Iosevka NF", + code_font_size = 12, + }, + }, +} diff --git a/lua/plugins/dashboard.lua b/lua/ui/dashboard.lua similarity index 100% rename from lua/plugins/dashboard.lua rename to lua/ui/dashboard.lua diff --git a/lua/ui/kitty.lua b/lua/ui/kitty.lua new file mode 100644 index 0000000..cbacbac --- /dev/null +++ b/lua/ui/kitty.lua @@ -0,0 +1,35 @@ +return { + { + "MunsMan/kitty-navigator.nvim", + build = { + "cp navigate_kitty.py ~/.config/kitty", + "cp pass_keys.py ~/.config/kitty", + }, + cond = function() -- Using Kitty + local term = os.getenv("TERM") or "" + local kit = string.find(term, "kitty") + return kit ~= nil + end, + }, + { + "jghauser/kitty-runner.nvim", + cond = function() -- Using Kitty + local term = os.getenv("TERM") or "" + local kit = string.find(term, "kitty") + return kit ~= nil + end, + }, + { + "mikesmithgh/kitty-scrollback.nvim", + enabled = true, + lazy = true, + cmd = { "KittyScrollbackGenerateKittens", "KittyScrollbackCheckHealth" }, + event = { "User KittyScrollbackLaunch" }, + version = "*", + config = function() -- Using Kitty-Scrollback + if vim.env.KITTY_SCROLLBACK_NVIM == "true" then + require("kitty-scrollback").setup() + end + end, + }, +} diff --git a/lua/ui/ui.lua b/lua/ui/ui.lua new file mode 100644 index 0000000..c0247e0 --- /dev/null +++ b/lua/ui/ui.lua @@ -0,0 +1,131 @@ +return { + { import = "lazyvim.plugins.extras.ui.edgy" }, + { import = "lazyvim.plugins.extras.ui.mini-animate" }, + { + "xiyaowong/transparent.nvim", + config = true, + }, + { + "gen740/SmoothCursor.nvim", + config = function() + require("smoothcursor").setup({ + type = "default", + cursor = "", + texthl = "SmoothCursor", + fancy = { + enable = true, -- enable fancy mode + head = { cursor = "", texthl = nil, linehl = nil }, + body = {}, + tail = { false }, -- false to disable fancy tail + }, + matrix = { -- Loaded when 'type' is set to "matrix" + head = { + cursor = require("smoothcursor.matrix_chars"), + texthl = { + "SmoothCursor", + }, + linehl = nil, -- No line highlight for the head + }, + body = { + length = 6, -- Specifies the length of the cursor body + cursor = require("smoothcursor.matrix_chars"), + texthl = { + "SmoothCursorGreen", + }, + }, + tail = { + cursor = nil, + texthl = { + "SmoothCursor", + }, + }, + unstop = false, + }, + autostart = true, -- Automatically start SmoothCursor + always_redraw = true, -- Redraw the screen on each update + flyin_effect = nil, -- Choose "bottom" or "top" for flying effect + speed = 25, -- Max speed is 100 to stick with your current position + intervals = 35, -- Update intervals in milliseconds + priority = 10, -- Set marker priority + timeout = 3000, -- Timeout for animations in milliseconds + threshold = 3, -- Animate only if cursor moves more than this many lines + max_threshold = 2000, -- If you move more than this many lines, don't animate (if `nil`, deactivate check) + disable_float_win = false, -- Disable in floating windows + enabled_filetypes = nil, -- Enable only for specific file types, e.g., { "lua", "vim" } + disabled_filetypes = nil, -- Disable for these file types + show_last_positions = nil, + }) + -- Define cursor color/icon based on mode + local autocmd = vim.api.nvim_create_autocmd + autocmd({ "ModeChanged", "BufEnter" }, { + callback = function() + local current_mode = vim.fn.mode() + if current_mode == "n" then + vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#8aa8f3" }) + vim.fn.sign_define("smoothcursor", { text = "" }) + elseif current_mode == "v" then + vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#d298eb" }) + vim.fn.sign_define("smoothcursor", { text = "" }) + elseif current_mode == "V" then + vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#d298eb" }) + vim.fn.sign_define("smoothcursor", { text = "" }) + elseif current_mode == "�" then + vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#bf616a" }) + vim.fn.sign_define("smoothcursor", { text = "" }) + elseif current_mode == "i" then + vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#9bd482" }) + vim.fn.sign_define("smoothcursor", { text = "" }) + end + end, + }) + -- Define last cursor position icon + vim.fn.sign_define("smoothcursor_n", { text = "" }) + vim.fn.sign_define("smoothcursor_v", { text = " " }) + vim.fn.sign_define("smoothcursor_V", { text = "" }) + vim.fn.sign_define("smoothcursor_i", { text = "" }) + vim.fn.sign_define("smoothcursor_�", { text = "" }) + vim.fn.sign_define("smoothcursor_R", { text = "󰊄" }) + end, + }, + { + "akinsho/toggleterm.nvim", + version = false, + lazy = false, + config = function() + require("toggleterm").setup({ + -- size can be a number or function which is passed the current terminal + size = function(term) + if term.direction == "horizontal" then + return 10 + elseif term.direction == "vertical" then + return vim.o.columns * 0.4 + end + end, + open_mapping = [[]], + hide_numbers = true, + autochdir = true, + shade_terminals = false, + start_in_insert = true, + insert_mappings = true, + terminal_mappings = true, + persist_size = true, + persist_mode = true, + direction = "horizontal", + close_on_exit = true, + shell = vim.o.shell, + auto_scroll = true, + float_opts = { + border = "curved", + winblend = 3, + title_pos = "left", + }, + winbar = { + enabled = true, + name_formatter = function(term) -- term: Terminal + return term.name + end, + }, + }) + end, + }, +} diff --git a/lua/plugins/wezterm.lua b/lua/ui/wezterm.lua similarity index 100% rename from lua/plugins/wezterm.lua rename to lua/ui/wezterm.lua