From 9296a9a4a389632d6cff0db32e870cc7efdd77db Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sat, 30 Dec 2023 21:30:39 +0545 Subject: [PATCH] fresh --- README.md | 2 +- config/neovide/.github/README.md | 3 + config/neovide/.github/title.png | Bin 0 -> 26866 bytes config/neovide/config.toml | 6 ++ config/nvim/lazy-lock.json | 9 ++- config/nvim/lazyvim.json | 4 +- config/nvim/lua/config/neovide.lua | 70 ++++++++++++++++ config/nvim/lua/config/options.lua | 73 +---------------- .../lua/plugins/extras/coding/code-runner.lua | 75 ------------------ .../lua/plugins/extras/coding/sniprun.lua | 69 ++++++++++++++++ .../coding/treesitter/various-textobjs.lua | 28 ++++--- .../extras/{lsp => editor}/compiler.lua | 15 ++++ .../extras/editor/terminal/floaterm.lua | 1 - .../plugins/extras/ui/colorschemes/bamboo.lua | 5 ++ .../plugins/extras/ui/colorschemes/boo.lua | 5 ++ .../ui/colorschemes}/catppuccin.lua | 6 -- .../plugins/extras/ui/colorschemes/edge.lua | 5 ++ .../ui/colorschemes/gruvbox-material.lua | 5 ++ .../extras/ui/colorschemes/mellifluous.lua | 6 ++ .../plugins/extras/ui/colorschemes/miasma.lua | 5 ++ .../extras/ui/colorschemes/moonfly.lua | 5 ++ .../extras/ui/colorschemes/moonlight.lua | 5 ++ .../extras/ui/colorschemes/oceanic.lua | 5 ++ .../extras/ui/colorschemes/zenbones.lua | 6 ++ config/nvim/lua/plugins/extras/ui/modes.lua | 16 ++++ .../nvim/lua/plugins/extras/util/hardtime.lua | 3 +- 26 files changed, 263 insertions(+), 169 deletions(-) create mode 100644 config/neovide/.github/README.md create mode 100644 config/neovide/.github/title.png create mode 100644 config/neovide/config.toml create mode 100644 config/nvim/lua/config/neovide.lua delete mode 100644 config/nvim/lua/plugins/extras/coding/code-runner.lua create mode 100644 config/nvim/lua/plugins/extras/coding/sniprun.lua rename config/nvim/lua/plugins/extras/{lsp => editor}/compiler.lua (75%) create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/bamboo.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/boo.lua rename config/nvim/lua/plugins/{ => extras/ui/colorschemes}/catppuccin.lua (96%) create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/edge.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/gruvbox-material.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/mellifluous.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/miasma.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/moonfly.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/moonlight.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/oceanic.lua create mode 100644 config/nvim/lua/plugins/extras/ui/colorschemes/zenbones.lua create mode 100644 config/nvim/lua/plugins/extras/ui/modes.lua 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 0000000000000000000000000000000000000000..71ddefcf6396227d7cfbd6eb3b8ca21b31283069 GIT binary patch literal 26866 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 SUEsfrAUD--tCg$Rg#90s_7uSY literal 0 HcmV?d00001 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 = {