diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua index 27e9e06..57a3fed 100644 --- a/nvim/lua/config/autocmds.lua +++ b/nvim/lua/config/autocmds.lua @@ -1,3 +1,11 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here + +vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "*", + callback = function() + vim.api.nvim_set_hl(0, "SnacksPicker", { bg = "none", nocombine = true }) + vim.api.nvim_set_hl(0, "SnacksPickerBorder", { fg = "#316c71", bg = "none", nocombine = true }) + end, +}) diff --git a/nvim/lua/config/colors.lua b/nvim/lua/config/colors.lua new file mode 100644 index 0000000..7a3e08b --- /dev/null +++ b/nvim/lua/config/colors.lua @@ -0,0 +1,3 @@ +vim.api.nvim_set_hl(0, "SnacksPicker", { bg = "NONE" }) + +SPLAT diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 9ae3f8d..80a40e2 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -34,7 +34,7 @@ vim.cmd([[ " and remove the comment leader when joining lines when it makes sense. set formatoptions=cj " Don't display . on folds. - set fillchars=fold:\ + set fillchars=fold:\ set diffopt=algorithm:patience set fsync " Syncs the filesystem after :write. set nowrap diff --git a/nvim/lua/plugins/dashboard.lua b/nvim/lua/plugins/dashboard.lua deleted file mode 100644 index 20be583..0000000 --- a/nvim/lua/plugins/dashboard.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - "nvimdev/dashboard-nvim", - opts = function() - local logo = [[ - ░ ░░░░ ░░ ░░ ░░ ░░░░ ░░ ░░░░ ░░ ░░░░ ░░ ░░ ░░░░ ░ - ▒ ▒▒▒ ▒▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒▒▒▒ ▒▒ ▒▒ ▒▒▒ ▒▒▒ ▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒ ▒ - ▓ ▓▓▓▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓ ▓▓▓▓▓▓ ▓▓ ▓▓▓▓▓▓ ▓▓▓▓▓ ▓ - █ ███ ██████ █████ ████████ █ █ ██ ███ █████ ███████ █████ █ █ █ - █ ████ █████ █████ ██ ████ ██ ████ █████ █████ ██ ████ █ - ]] - logo = "\n\n" .. logo - - return { - change_to_vcs_root = true, - - config = { - header = vim.split(logo, "\n"), - footer = { - "", - "You are accessing a Tactile Metrology LLC information system, which includes: ", - "(1) this computer, (2) this computer network, (3) all computers connected to this ", - "network, and (4) all devices and storage media attached to this network or to a ", - "computer on this network. ", - "", - "This information system is provided so that you may be gay, and do crime. ", - "", - "Unauthorized or improper use of this system had better be pretty frickin' awesome.", - }, - shortcut = { - { desc = "[ deprekated]", group = "DashboardShortCut" }, - { desc = "[ Kate Adkins]", group = "DashboardShortCut" }, - { desc = "[󱄅 powered by Lix]", group = "DashboardShortCut" }, - }, - }, - } - end, -} diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua index f2ed69c..ed7490d 100644 --- a/nvim/lua/plugins/theme.lua +++ b/nvim/lua/plugins/theme.lua @@ -1,16 +1,16 @@ return { - { - "lifepillar/vim-solarized8", - lazy = false, - priority = 1000, - config = function() - vim.cmd([[ + { + "lifepillar/vim-solarized8", + lazy = false, + priority = 1000, + config = function() + vim.cmd([[ colorscheme solarized8 " Make Solarized8 a biiiit darker. highlight Normal guibg=#001E27 highlight LineNR ctermfg=11 guibg=#0B262D ]]) - end, - }, + end, + }, } diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 8d51e19..e76554d 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -1,80 +1,84 @@ -{ - "nvim-treesitter/nvim-treesitter", - version = false, -- last release is way too old and doesn't work on Windows - build = ":TSUpdate", - event = { "LazyFile", "VeryLazy" }, - lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline - init = function(plugin) - -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early - -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which - -- no longer trigger the **nvim-treesitter** module to be loaded in time. - -- Luckily, the only things that those plugins need are the custom queries, which we make available - -- during startup. - require("lazy.core.loader").add_to_rtp(plugin) - require("nvim-treesitter.query_predicates") - end, - cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" }, - keys = { - { "", desc = "Increment Selection" }, - { "", desc = "Decrement Selection", mode = "x" }, - }, - opts_extend = { "ensure_installed" }, - ---@type TSConfig - ---@diagnostic disable-next-line: missing-fields - opts = { - highlight = { enable = true }, - indent = { enable = true }, - ensure_installed = { - "bash", - "c", - "diff", - "html", - "javascript", - "jsdoc", - "json", - "jsonc", - "lua", - "luadoc", - "luap", - "markdown", - "markdown_inline", - "nix", - "printf", - "python", - "query", - "regex", - "toml", - "tsx", - "typescript", - "vim", - "vimdoc", - "xml", - "yaml", +return { + "nvim-treesitter/nvim-treesitter", + version = false, -- last release is way too old and doesn't work on Windows + build = ":TSUpdate", + event = { "LazyFile", "VeryLazy" }, + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline + init = function(plugin) + -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early + -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which + -- no longer trigger the **nvim-treesitter** module to be loaded in time. + -- Luckily, the only things that those plugins need are the custom queries, which we make available + -- during startup. + require("lazy.core.loader").add_to_rtp(plugin) + require("nvim-treesitter.query_predicates") + end, + cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" }, + keys = { + { "", desc = "Increment Selection" }, + { "", desc = "Decrement Selection", mode = "x" }, }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - node_incremental = "", - scope_incremental = false, - node_decremental = "", - }, + opts_extend = { "ensure_installed" }, + ---@type TSConfig + ---@diagnostic disable-next-line: missing-fields + opts = { + highlight = { enable = true }, + indent = { enable = true }, + ensure_installed = { + "bash", + "c", + "diff", + "html", + "javascript", + "jsdoc", + "json", + "jsonc", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "nix", + "printf", + "python", + "query", + "regex", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "xml", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + move = { + enable = true, + goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" }, + goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" }, + goto_previous_start = { + ["[f"] = "@function.outer", + ["[c"] = "@class.outer", + ["[a"] = "@parameter.inner", + }, + goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" }, + }, + }, }, - textobjects = { - move = { - enable = true, - goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" }, - goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" }, - goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" }, - goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" }, - }, - }, - }, - ---@param opts TSConfig - config = function(_, opts) - if type(opts.ensure_installed) == "table" then - opts.ensure_installed = LazyVim.dedup(opts.ensure_installed) - end - require("nvim-treesitter.configs").setup(opts) - end, + ---@param opts TSConfig + config = function(_, opts) + if type(opts.ensure_installed) == "table" then + opts.ensure_installed = LazyVim.dedup(opts.ensure_installed) + end + require("nvim-treesitter.configs").setup(opts) + end, }