diff --git a/README.md b/README.md index 18cc0aa6..0ec239fd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ git clone https://aur.archlinux.org/paru-bin.git Install Dependencies / Packages ``` -paru -S fnm hyprland wlsunset keyb rofi-file-browser-extended-git imv brightnessctl neofetch yazi waybar playerctl wf-recorder kvantum swaylock-effects-git qt5ct qt6ct nwg-look mpv-mpris pacman-contrib swayidle pavucontrol pamixer file-roller htop adobe-source-code-pro-fonts ttf-fira-code ttf-jetbrains-mono-nerd ttf-jetbrains-mono noto-fonts-emoji ttf-droid otf-font-awesome ttf-cascadia-code-nerd linux-headers alsa-utils less wlroots vlc thunar thunar-volman thunar-archive-plugin udiskie mtpfs jmtpfs gvfs-gphoto2 gvfs-mtp mousepad rofi-lbonn-wayland-git yad network-manager-applet lsd cava geany geany-plugin swaync tumbler unzip zip unrar polkit-gnome pokemon-colorscripts-git tty-clock-git xdg-user-dirs grim slurp gnome-system-monitor jq blueberyy-wayland polkit-kde-agent cbonsai zathura-pdf-mupdf zathura yt-dlp ffmpegthumbnailer xdotool wmctrl zsh lazygit xdg-desktop-portal-gtk gtk-engine-murrine +paru -S fnm hyprland wlsunset keyb rofi-file-browser-extended-git imv brightnessctl neofetch yazi waybar playerctl wf-recorder kvantum swaylock-effects-git qt5ct qt6ct nwg-look mpv-mpris pacman-contrib swayidle pavucontrol pamixer file-roller htop adobe-source-code-pro-fonts ttf-fira-code ttf-jetbrains-mono-nerd ttf-jetbrains-mono noto-fonts-emoji ttf-droid otf-font-awesome ttf-cascadia-code-nerd linux-headers alsa-utils less wlroots vlc thunar thunar-volman thunar-archive-plugin udiskie mtpfs jmtpfs gvfs-gphoto2 gvfs-mtp mousepad rofi-lbonn-wayland-git yad network-manager-applet lsd cava geany geany-plugin swaync tumbler unzip zip unrar polkit-gnome pokemon-colorscripts-git tty-clock-git xdg-user-dirs grim slurp gnome-system-monitor jq blueberyy-wayland polkit-kde-agent cbonsai zathura-pdf-mupdf zathura yt-dlp ffmpegthumbnailer xdotool wmctrl zsh lazygit xdg-desktop-portal-gtk gtk-engine-murrine neovide ``` > **Warning** diff --git a/config/neovide/.github/README.md b/config/neovide/.github/README.md new file mode 100644 index 00000000..affa9d51 --- /dev/null +++ b/config/neovide/.github/README.md @@ -0,0 +1,3 @@ +
+ +
diff --git a/config/neovide/.github/title.png b/config/neovide/.github/title.png new file mode 100644 index 00000000..71ddefcf Binary files /dev/null and b/config/neovide/.github/title.png differ diff --git a/config/neovide/config.toml b/config/neovide/config.toml new file mode 100644 index 00000000..73869445 --- /dev/null +++ b/config/neovide/config.toml @@ -0,0 +1,6 @@ +vsync = true +maximized = false +srgb = true +idle = false +neovim_bin = "/home/matt/.local/share/bob/nvim-bin/nvim" +frame = "full" diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 854695fd..ececf959 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -84,18 +84,18 @@ "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" }, "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "362ebd3a210f20aab80be05557f216cbaf4531e6" }, + "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, - "nvim-various-textobjs": { "branch": "main", "commit": "8ebbedb58845d4bce91cfb1db705fb4e942ee333" }, - "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, + "nvim-various-textobjs": { "branch": "main", "commit": "f68df17056ab9b68b0da10e722b03445450330ec" }, + "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" }, "octo.nvim": { "branch": "master", "commit": "b5371003f209764c9d1cc43cf20b6dc52961f0e8" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, - "outline.nvim": { "branch": "main", "commit": "5669c8aa9ea6346ab491646a9a1e73d7f594e2f8" }, + "outline.nvim": { "branch": "main", "commit": "8c6b11e4c27bca690bfde0c6ce35ba66a805dfa3" }, "overseer.nvim": { "branch": "master", "commit": "78e893394cef6efee05f31bd65f6dff08b0bac09" }, "package-info.nvim": { "branch": "master", "commit": "18f8126dd8e65b2e21804c9107785af4abbb5bfc" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, @@ -109,6 +109,7 @@ "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, "smart-splits.nvim": { "branch": "master", "commit": "f0003bf9c3f11b8b9209264f865b8864453ca926" }, + "sniprun": { "branch": "master", "commit": "639877399a23e375a8c07b75c14d017735eab7cb" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-all-recent.nvim": { "branch": "main", "commit": "766d79bedf8dd59c2d0a944a7cf3c98795ab5f07" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index bff20a81..97027272 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -13,6 +13,7 @@ "plugins.extras.coding.dial", "plugins.extras.coding.multicursor", "plugins.extras.coding.refactoring", + "plugins.extras.coding.sniprun", "plugins.extras.coding.treesitter.endwise", "plugins.extras.coding.treesitter.mini-align", "plugins.extras.coding.treesitter.node-action", @@ -23,6 +24,7 @@ "plugins.extras.dap.core", "plugins.extras.dap.persistent-breakpoints", "plugins.extras.editor.color", + "plugins.extras.editor.compiler", "plugins.extras.editor.docs.devdocs", "plugins.extras.editor.git.diffview", "plugins.extras.editor.git.github", @@ -57,7 +59,6 @@ "plugins.extras.linting.eslint-extended", "plugins.extras.linting.shellcheck", "plugins.extras.lsp.actions-preview", - "plugins.extras.lsp.compiler", "plugins.extras.lsp.file-operations", "plugins.extras.lsp.garbage-day", "plugins.extras.lsp.glance", @@ -66,6 +67,7 @@ "plugins.extras.lsp.lightbulb", "plugins.extras.test.core", "plugins.extras.ui.breadcrumbs", + "plugins.extras.ui.colorschemes.catppuccin", "plugins.extras.ui.context", "plugins.extras.ui.highlight-undo", "plugins.extras.ui.number-toggle", diff --git a/config/nvim/lua/config/neovide.lua b/config/nvim/lua/config/neovide.lua new file mode 100644 index 00000000..cdb99ccd --- /dev/null +++ b/config/nvim/lua/config/neovide.lua @@ -0,0 +1,70 @@ +if not vim.g.neovide then + return +end + +RefreshGuiFont = function() + vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size) +end + +ResizeGuiFont = function(delta) + vim.g.gui_font_size = vim.g.gui_font_size + delta + RefreshGuiFont() +end + +ResetGuiFont = function() + vim.g.gui_font_size = vim.g.gui_font_default_size + RefreshGuiFont() +end + +-- Call function on startup to set default value +ResetGuiFont() + +-- Keymaps + +local opts = { noremap = true, silent = true } + +vim.keymap.set({ "n", "i" }, "", function() + ResizeGuiFont(1) +end, opts) +vim.keymap.set({ "n", "i" }, "", function() + ResizeGuiFont(-1) +end, opts) +vim.keymap.set({ "n", "i" }, "", function() + ResetGuiFont() +end, opts) + +vim.g.neovide_padding_top = 5 +vim.g.neovide_padding_right = 5 +vim.g.neovide_padding_left = 5 + +vim.g.neovide_floating_blur_amount_x = 5.0 +vim.g.neovide_floating_blur_amount_y = 5.0 + +vim.g.neovide_transparency = 0.85 + +vim.g.neovide_cursor_antialiasing = false + +vim.g.neovide_cursor_vfx_mode = "pixiedust" + +vim.opt.winblend = 20 + +if vim.fn.exists("g:terminal_color_0") == 0 then + vim.api.nvim_set_var("terminal_color_0", "#494D64") + vim.api.nvim_set_var("terminal_color_1", "#ED8796") + vim.api.nvim_set_var("terminal_color_2", "#A6DA95") + vim.api.nvim_set_var("terminal_color_3", "#EED49F") + vim.api.nvim_set_var("terminal_color_4", "#8AADF4") + vim.api.nvim_set_var("terminal_color_5", "#F5BDE6") + vim.api.nvim_set_var("terminal_color_6", "#8BD5CA") + vim.api.nvim_set_var("terminal_color_7", "#B8C0E0") + vim.api.nvim_set_var("terminal_color_8", "#5B6078") + vim.api.nvim_set_var("terminal_color_9", "#ED8796") + vim.api.nvim_set_var("terminal_color_10", "#A6DA95") + vim.api.nvim_set_var("terminal_color_11", "#EED49F") + vim.api.nvim_set_var("terminal_color_12", "#8AADF4") + vim.api.nvim_set_var("terminal_color_13", "#F5BDE6") + vim.api.nvim_set_var("terminal_color_14", "#8BD5CA") + vim.api.nvim_set_var("terminal_color_15", "#B8C0E0") +end + +vim.g.neovide_theme = "catppuccin-macchiato" diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index e1d71952..d54e1b52 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -1,7 +1,8 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here --- vim.o.spell = true +require("config.neovide") + vim.loader.enable() vim.g.mapleader = " " @@ -10,76 +11,6 @@ vim.g.gui_font_default_size = 10 vim.g.gui_font_size = vim.g.gui_font_default_size vim.g.gui_font_face = "JetBrainsMono Nerd Font" -if vim.g.neovide then - -- Put anything you want to happen only in Neovide here - RefreshGuiFont = function() - vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size) - end - - ResizeGuiFont = function(delta) - vim.g.gui_font_size = vim.g.gui_font_size + delta - RefreshGuiFont() - end - - ResetGuiFont = function() - vim.g.gui_font_size = vim.g.gui_font_default_size - RefreshGuiFont() - end - - -- Call function on startup to set default value - ResetGuiFont() - - -- Keymaps - - local opts = { noremap = true, silent = true } - - vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(1) - end, opts) - vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(-1) - end, opts) - vim.keymap.set({ "n", "i" }, "", function() - ResetGuiFont() - end, opts) - - vim.g.neovide_padding_top = 5 - vim.g.neovide_padding_right = 5 - vim.g.neovide_padding_left = 5 - - vim.g.neovide_floating_blur_amount_x = 5.0 - vim.g.neovide_floating_blur_amount_y = 5.0 - - vim.g.neovide_transparency = 0.85 - - vim.g.neovide_cursor_antialiasing = false - - vim.g.neovide_cursor_vfx_mode = "pixiedust" - - vim.opt.winblend = 20 - - if vim.fn.exists("g:terminal_color_0") == 0 then - vim.api.nvim_set_var("terminal_color_0", "#494D64") - vim.api.nvim_set_var("terminal_color_1", "#ED8796") - vim.api.nvim_set_var("terminal_color_2", "#A6DA95") - vim.api.nvim_set_var("terminal_color_3", "#EED49F") - vim.api.nvim_set_var("terminal_color_4", "#8AADF4") - vim.api.nvim_set_var("terminal_color_5", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_6", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_7", "#B8C0E0") - vim.api.nvim_set_var("terminal_color_8", "#5B6078") - vim.api.nvim_set_var("terminal_color_9", "#ED8796") - vim.api.nvim_set_var("terminal_color_10", "#A6DA95") - vim.api.nvim_set_var("terminal_color_11", "#EED49F") - vim.api.nvim_set_var("terminal_color_12", "#8AADF4") - vim.api.nvim_set_var("terminal_color_13", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_14", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_15", "#B8C0E0") - end - - vim.g.neovide_theme = "catppuccin-macchiato" -end - vim.o.winwidth = 10 vim.o.winminwidth = 10 vim.o.equalalways = false diff --git a/config/nvim/lua/plugins/extras/coding/code-runner.lua b/config/nvim/lua/plugins/extras/coding/code-runner.lua deleted file mode 100644 index e74d9399..00000000 --- a/config/nvim/lua/plugins/extras/coding/code-runner.lua +++ /dev/null @@ -1,75 +0,0 @@ -return { - "michaelb/sniprun", - run = "bash ./install.sh", - cmd = { "SnipRun", "SnipInfo", "SnipLive", "SnipClose", "SnipReset", "SnipReplMemoryClean" }, - opts = { - selected_interpreters = {}, --# use those instead of the default for the current filetype - repl_enable = { "javascript", "typescript" }, --# enable REPL-like behavior for the given interpreters - repl_disable = {}, --# disable REPL-like behavior for the given interpreters - - interpreter_options = { - --# interpreter-specific options, see docs / :SnipInfo - - --# use the interpreter name as key - GFM_original = { - use_on_filetypes = { "markdown.pandoc" }, --# the 'use_on_filetypes' configuration key is - --# available for every interpreter - }, - Python3_original = { - error_truncate = "auto", --# Truncate runtime errors 'long', 'short' or 'auto' - --# the hint is available for every interpreter - --# but may not be always respected - }, - }, - - --# you can combo different display modes as desired and with the 'Ok' or 'Err' suffix - --# to filter only sucessful runs (or errored-out runs respectively) - display = { - -- "Classic", --# display results in the command-line area - -- "VirtualTextOk", --# display ok results as virtual text (multiline is shortened) - - "VirtualText", --# display results as virtual text - -- "TempFloatingWindow", --# display results in a floating window - -- "LongTempFloatingWindow", --# same as above, but only long results. To use with VirtualText[Ok/Err] - -- "Terminal", --# display results in a vertical split - -- "TerminalWithCode", --# display results and code history in a vertical split - -- "NvimNotify", --# display with the nvim-notify plugin - -- "Api" --# return output to a programming interface - }, - - live_display = { "VirtualTextOk" }, --# display mode used in live_mode - - display_options = { - terminal_scrollback = vim.o.scrollback, --# change terminal display scrollback lines - terminal_line_number = false, --# whether show line number in terminal window - terminal_signcolumn = false, --# whether show signcolumn in terminal window - terminal_persistence = true, --# always keep the terminal open (true) or close it at every occasion (false) - terminal_width = 45, --# change the terminal display option width - notification_timeout = 5, --# timeout for nvim_notify output - }, - - --# You can use the same keys to customize whether a sniprun producing - --# no output should display nothing or '(no output)' - show_no_output = { - "Classic", - "TempFloatingWindow", --# implies LongTempFloatingWindow, which has no effect on its own - }, - - --# customize highlight groups (setting this overrides colorscheme) - -- snipruncolors = { - -- SniprunVirtualTextOk = { bg = "#66eeff", fg = "#000000", ctermbg = "Cyan", cterfg = "Black" }, - -- SniprunFloatingWinOk = { fg = "#66eeff", ctermfg = "Cyan" }, - -- SniprunVirtualTextErr = { bg = "#881515", fg = "#000000", ctermbg = "DarkRed", cterfg = "Black" }, - -- SniprunFloatingWinErr = { fg = "#881515", ctermfg = "DarkRed" }, - -- }, - - live_mode_toggle = "off", --# live mode toggle, see Usage - Running for more info - - --# miscellaneous compatibility/adjustement settings - inline_messages = false, --# inline_message (0/1) is a one-line way to display messages - --# to workaround sniprun not being able to display anything - - borders = "single", --# display borders around floating windows - --# possible values are 'none', 'single', 'double', or 'shadow' - }, -} diff --git a/config/nvim/lua/plugins/extras/coding/sniprun.lua b/config/nvim/lua/plugins/extras/coding/sniprun.lua new file mode 100644 index 00000000..e4f3af47 --- /dev/null +++ b/config/nvim/lua/plugins/extras/coding/sniprun.lua @@ -0,0 +1,69 @@ +return { + { + "michaelb/sniprun", + run = "bash ./install.sh", + cmd = { "SnipRun", "SnipInfo", "SnipLive", "SnipClose", "SnipReset", "SnipReplMemoryClean" }, + opts = { + selected_interpreters = {}, --# use those instead of the default for the current filetype + repl_enable = { "javascript", "typescript" }, --# enable REPL-like behavior for the given interpreters + repl_disable = {}, --# disable REPL-like behavior for the given interpreters + + interpreter_options = { + GFM_original = { + use_on_filetypes = { "markdown.pandoc" }, --# the 'use_on_filetypes' configuration key is + }, + Python3_original = { + error_truncate = "auto", --# Truncate runtime errors 'long', 'short' or 'auto' + }, + }, + + display = { + "VirtualText", --# display results as virtual text + }, + + live_display = { "VirtualTextOk" }, --# display mode used in live_mode + + display_options = { + terminal_scrollback = vim.o.scrollback, --# change terminal display scrollback lines + terminal_line_number = false, --# whether show line number in terminal window + terminal_signcolumn = false, --# whether show signcolumn in terminal window + terminal_persistence = true, --# always keep the terminal open (true) or close it at every occasion (false) + terminal_width = 45, --# change the terminal display option width + notification_timeout = 5, --# timeout for nvim_notify output + }, + + --# You can use the same keys to customize whether a sniprun producing + --# no output should display nothing or '(no output)' + show_no_output = { + "Classic", + "TempFloatingWindow", --# implies LongTempFloatingWindow, which has no effect on its own + }, + + live_mode_toggle = "off", --# live mode toggle, see Usage - Running for more info + + inline_messages = false, --# inline_message (0/1) is a one-line way to display messages + + borders = "single", --# display borders around floating windows + --# possible values are 'none', 'single', 'double', or 'shadow' + }, + -- stylua: ignore + keys = { + { "cur", "SnipRun", desc = "Run" }, + { "", "SnipRun", desc = "Run" }, + { "cur", function() require("sniprun").run("v") end, mode = { "v" }, desc = "Run" }, + { "", function() require("sniprun").run("v") end, mode = { "v" }, desc = "Run" }, + { "cui", function() require("sniprun").info() end, desc = "Info" }, + { "cuR", function() require("sniprun").reset() end, desc = "Reset" }, + { "", function() require("sniprun").reset() end, desc = "Reset" }, + { "cul", function() require("sniprun.live_mode").toggle() end, desc = "Live" }, + }, + }, + { + "folke/which-key.nvim", + opts = { + defaults = { + ["cu"] = { name = "runner" }, + }, + }, + }, +} diff --git a/config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua b/config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua index 3e055b28..cfa7ae7e 100644 --- a/config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua +++ b/config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua @@ -3,14 +3,24 @@ return { opts = { useDefaultKeymaps = false }, -- stylua: ignore keys = { - { "im", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("inner") end, desc = "Markdown Link", }, - { "am", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("outer") end, desc = "Markdown Link", }, - { "iC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("inner") end, desc = "CodeBlock", }, - { "aC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("outer") end, desc = "CodeBlock", }, - { "gd", mode = { "o", "x" }, function() require("various-textobjs").diagnostics() end, desc = "Diagnostics", }, - { "iy", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("inner") end, desc = "Triple Quotes", }, - { "ay", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("outer") end, desc = "Triple Quotes", }, - { "iC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("inner") end, desc = "CSS Selector", }, - { "aC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("outer") end, desc = "CSS Selector", }, + { "im", ft = { "markdown", "toml" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("inner") end, desc = "Markdown Link" }, + { "am", ft = { "markdown", "toml" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("outer") end, desc = "Markdown Link" }, + { "iC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("inner") end, desc = "CodeBlock" }, + { "aC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("outer") end, desc = "CodeBlock" }, + { "gd", mode = { "o", "x" }, function() require("various-textobjs").diagnostics() end, desc = "Diagnostics" }, + { "iy", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("inner") end, desc = "Triple Quotes" }, + { "ay", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("outer") end, desc = "Triple Quotes" }, + { "iC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("inner") end, desc = "CSS Selector" }, + { "aC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("outer") end, desc = "CSS Selector" }, + { "iP", ft = { "sh" }, mode = { "o", "x" }, function() require("various-textobjs").shellPipe("inner") end, desc = "Pipe" }, + { "aP", ft = { "sh" }, mode = { "o", "x" }, function() require("various-textobjs").shellPipe("outer") end, desc = "Pipe" }, + { "iH", ft = { "html, xml, css, scss, less" }, mode = { "o", "x" }, function() require("various-textobjs").htmlAttribute("inner") end, desc = "HTML Attribute" }, + { "iv", mode = { "o", "x" }, function() require("various-textobjs").value("inner") end, desc = "Value" }, + { "av", mode = { "o", "x" }, function() require("various-textobjs").value("outer") end, desc = "Value" }, + { "ik", mode = { "o", "x" }, function() require("various-textobjs").key("inner") end, desc = "Key" }, + { "ak", mode = { "o", "x" }, function() require("various-textobjs").key("outer") end, desc = "Key" }, + { "L", mode = { "o", "x" }, function() require("various-textobjs").url() end, desc = "Link" }, + { "iN", mode = { "o", "x" }, function() require("various-textobjs").number("inner") end, desc = "Number" }, + { "aN", mode = { "o", "x" }, function() require("various-textobjs").number("outer") end, desc = "Number" }, }, } diff --git a/config/nvim/lua/plugins/extras/lsp/compiler.lua b/config/nvim/lua/plugins/extras/editor/compiler.lua similarity index 75% rename from config/nvim/lua/plugins/extras/lsp/compiler.lua rename to config/nvim/lua/plugins/extras/editor/compiler.lua index 809c652e..a1b9df13 100644 --- a/config/nvim/lua/plugins/extras/lsp/compiler.lua +++ b/config/nvim/lua/plugins/extras/editor/compiler.lua @@ -16,6 +16,21 @@ return { }, { "stevearc/overseer.nvim", + cmd = { + "OverseerOpen", + "OverseerClose", + "OverseerToggle", + "OverseerSaveBundle", + "OverseerLoadBundle", + "OverseerDeleteBundle", + "OverseerRunCmd", + "OverseerRun", + "OverseerInfo", + "OverseerBuild", + "OverseerQuickAction", + "OverseerTaskAction ", + "OverseerClearCache", + }, opts = { task_list = { direction = "bottom", diff --git a/config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua b/config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua index fd1a7502..ca6a52bd 100644 --- a/config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua +++ b/config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua @@ -11,7 +11,6 @@ return { { "gG", "FloatermNew --disposable --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazygit", desc = "Lazygit (cwd)" }, { "Td", "FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker", desc = "Lazydocker" }, { "Tb", "FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop", desc = "Btop" }, - { "fd", "FloatermNew --disposable --name=dots --opener=edit --titleposition=center --height=0.85 --width=0.85 dots", desc = "Dotfiles" }, { "Tn", "FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages", desc = "Navi Pages" }, { "Tp", "FloatermNew --disposable --name=proc --opener=edit --titleposition=center --height=0.85 --width=0.85 proc", desc = "Systemd Processes" }, { "TB", "FloatermNew --disposable --name=bandwhich --opener=edit --titleposition=center --height=0.85 --width=0.85 bandwhich", desc = "Bandwidth" }, diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/bamboo.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/bamboo.lua new file mode 100644 index 00000000..d49248f7 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/bamboo.lua @@ -0,0 +1,5 @@ +return { + "ribru17/bamboo.nvim", + name = "bamboo", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/boo.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/boo.lua new file mode 100644 index 00000000..7ed3efc0 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/boo.lua @@ -0,0 +1,5 @@ +return { + "rockerBOO/boo-colorscheme-nvim", + name = "boo", + lazy = false, +} diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua similarity index 96% rename from config/nvim/lua/plugins/catppuccin.lua rename to config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua index 29378fe7..a7e42590 100644 --- a/config/nvim/lua/plugins/catppuccin.lua +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua @@ -89,10 +89,4 @@ return { }), }, }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = "catppuccin-macchiato", - }, - }, } diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/edge.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/edge.lua new file mode 100644 index 00000000..1b46aebd --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/edge.lua @@ -0,0 +1,5 @@ +return { + "sainnhe/edge", + name = "edge", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/gruvbox-material.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/gruvbox-material.lua new file mode 100644 index 00000000..fc9de681 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/gruvbox-material.lua @@ -0,0 +1,5 @@ +return { + "sainnhe/gruvbox-material", + name = "gruvbox-material", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/mellifluous.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/mellifluous.lua new file mode 100644 index 00000000..4c7f1700 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/mellifluous.lua @@ -0,0 +1,6 @@ +return { + "ramojus/mellifluous.nvim", + name = "mellifluous", + lazy = false, + opts = {}, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/miasma.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/miasma.lua new file mode 100644 index 00000000..540cb141 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/miasma.lua @@ -0,0 +1,5 @@ +return { + "xero/miasma.nvim", + name = "miasma", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/moonfly.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/moonfly.lua new file mode 100644 index 00000000..8f8e3b0d --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/moonfly.lua @@ -0,0 +1,5 @@ +return { + "bluz71/vim-moonfly-colors", + name = "moonfly", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/moonlight.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/moonlight.lua new file mode 100644 index 00000000..a563d03a --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/moonlight.lua @@ -0,0 +1,5 @@ +return { + "shaunsingh/moonlight.nvim", + name = "moonlight", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/oceanic.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/oceanic.lua new file mode 100644 index 00000000..41e0ad60 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/oceanic.lua @@ -0,0 +1,5 @@ +return { + "mhartington/oceanic-next", + name = "oceanic-next", + lazy = false, +} diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/zenbones.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/zenbones.lua new file mode 100644 index 00000000..e1ebc05a --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/zenbones.lua @@ -0,0 +1,6 @@ +return { + "mcchrish/zenbones.nvim", + name = "zenbones", + lazy = false, + opts = {}, +} diff --git a/config/nvim/lua/plugins/extras/ui/modes.lua b/config/nvim/lua/plugins/extras/ui/modes.lua new file mode 100644 index 00000000..1e87fb57 --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/modes.lua @@ -0,0 +1,16 @@ +return { + { + "mvllow/modes.nvim", + event = "VeryLazy", + opts = {}, + }, + { + "folke/which-key.nvim", + optional = true, + opts = { + triggers_blacklist = { + n = { "d", "y" }, + }, + }, + }, +} diff --git a/config/nvim/lua/plugins/extras/util/hardtime.lua b/config/nvim/lua/plugins/extras/util/hardtime.lua index 715f973b..456db304 100644 --- a/config/nvim/lua/plugins/extras/util/hardtime.lua +++ b/config/nvim/lua/plugins/extras/util/hardtime.lua @@ -1,7 +1,7 @@ return { "m4xshen/hardtime.nvim", dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - event = "VeryLazy", + event = "LazyFile", keys = { { "uH", "Hardtime toggle", desc = "Toggle Hardtime" }, }, @@ -16,6 +16,7 @@ return { "neo-tree", "symbols-outline", "vim-be-good", + "oil", }, restriction_mode = "hint", restricted_keys = {