diff options
| -rw-r--r-- | nvim/.config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/core.lua | 60 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/noice.lua | 7 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/filetype.lua | 3 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/utils/dashboard.lua | 55 |
6 files changed, 55 insertions, 74 deletions
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 61460b2..e741a74 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -8,4 +8,4 @@ require("tobyvin.lsp") require("tobyvin.diagnostic") require("tobyvin.lazy") -vim.cmd.colorscheme("gruvbox") +pcall(vim.cmd.colorscheme, "gruvbox") diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index cb9165e..5fcb25a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -60,9 +60,7 @@ "peek.nvim": { "branch": "master", "commit": "4163a48f190d2b2d94840be3eb38b4af83961ebe" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" }, "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" }, - "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" }, diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua index 23fdefe..d9f7961 100644 --- a/nvim/.config/nvim/lua/plugins/core.lua +++ b/nvim/.config/nvim/lua/plugins/core.lua @@ -9,59 +9,58 @@ end local M = { "nvim-lua/plenary.nvim", { - "folke/lazy.nvim", - version = "*", + "lukas-reineke/virt-column.nvim", + event = "BufAdd", + opts = {}, }, { - "luukvbaal/statuscol.nvim", - event = "VeryLazy", - config = true, + "akinsho/git-conflict.nvim", + event = "BufReadPre", + opts = { + disable_diagnostics = true, + default_mappings = { + prev = "[x", + next = "]x", + }, + }, }, { "NvChad/nvim-colorizer.lua", - event = "BufReadPre", + ft = { + "css", + "scss", + "sass", + "javascript", + "html", + "htmldjango", + }, opts = { filetypes = { "css", + "scss", + "sass", "javascript", "html", "htmldjango", }, user_default_options = { mode = "virtualtext", - always_update = true, }, }, }, { - "lukas-reineke/virt-column.nvim", - event = "BufReadPre", - config = true, - }, - { "nvim-treesitter/nvim-treesitter-context", event = "BufReadPre", dependencies = { "nvim-treesitter/nvim-treesitter", }, - config = true, - }, - { - "akinsho/git-conflict.nvim", - event = "BufReadPre", - opts = { - disable_diagnostics = true, - default_mappings = { - prev = "[x", - next = "]x", - }, - }, + opts = {}, }, { "f3fora/nvim-texlabconfig", - ft = { "tex", "bib" }, - config = true, build = "go build -o ~/.local/bin", + ft = { "tex", "bib" }, + opts = {}, }, { "mfussenegger/nvim-jdtls", @@ -72,21 +71,16 @@ local M = { config = setup_with("start_or_attach"), }, { - "anuvyklack/pretty-fold.nvim", - event = "VeryLazy", - config = true, - }, - { "eandrju/cellular-automaton.nvim", cmd = "CellularAutomaton", }, { "hjson/vim-hjson", - event = "BufReadPre", + ft = "hjson", }, { "tridactyl/vim-tridactyl", - event = "BufReadPre", + ft = "tridactyl", }, } diff --git a/nvim/.config/nvim/lua/plugins/noice.lua b/nvim/.config/nvim/lua/plugins/noice.lua index 2649413..5491b51 100644 --- a/nvim/.config/nvim/lua/plugins/noice.lua +++ b/nvim/.config/nvim/lua/plugins/noice.lua @@ -2,7 +2,7 @@ local M = { "folke/noice.nvim", version = "*", - event = { "VeryLazy", "LspAttach" }, + event = { "LspAttach" }, dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify", @@ -46,6 +46,11 @@ local M = { } function M:init() + ---@diagnostic disable-next-line: duplicate-set-field + vim.notify = function(...) + return require("noice").notify(...) + end + vim.api.nvim_set_hl(0, "NoiceLspProgressSpinner", { link = "DiagnosticSignInfo" }) vim.api.nvim_set_hl(0, "NoiceLspProgressDone", { link = "DiagnosticSignOk" }) diff --git a/nvim/.config/nvim/lua/tobyvin/filetype.lua b/nvim/.config/nvim/lua/tobyvin/filetype.lua index ee15532..32c068a 100644 --- a/nvim/.config/nvim/lua/tobyvin/filetype.lua +++ b/nvim/.config/nvim/lua/tobyvin/filetype.lua @@ -5,7 +5,8 @@ vim.filetype.add({ zsh = "sh", }, filename = { - ["PKGBUILD"] = "PKGBUILD", + PKGBUILD = "PKGBUILD", + tridactylrc = "trytactylrc", }, pattern = { -- sway drop-ins diff --git a/nvim/.config/nvim/lua/tobyvin/utils/dashboard.lua b/nvim/.config/nvim/lua/tobyvin/utils/dashboard.lua index b978122..951dcf5 100644 --- a/nvim/.config/nvim/lua/tobyvin/utils/dashboard.lua +++ b/nvim/.config/nvim/lua/tobyvin/utils/dashboard.lua @@ -36,27 +36,12 @@ local M = { return {} end - local opts = { - text = true, - timeout = 30, - } - - local cowsay + local cmd = vim.system({ "fortune", "-s" }, { text = true }) if vim.fn.executable("cowsay") == 1 then - cowsay = vim.system({ "cowsay" }, { text = true, stdin = true }) - opts.stdout = function(_, data) - cowsay:write(data) - end + cmd = vim.system({ "cowsay" }, { text = true, stdin = cmd:wait().stdout }) end - local stdout = vim.system({ "fortune", "-s" }, opts):wait().stdout - - if cowsay then - cowsay:write(nil) - stdout = cowsay:wait().stdout - end - - return vim.split(stdout or "", "\n") + return vim.split(cmd:wait().stdout or "", "\n") end, { " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", @@ -87,7 +72,7 @@ local M = { } function M.render(bufnr, index) - bufnr = bufnr or 0 + bufnr = bufnr or 0 local width = vim.api.nvim_win_get_width(0) local height = vim.api.nvim_win_get_height(0) @@ -140,32 +125,30 @@ function M.initialize() vim.bo[bufnr].buftype = "nofile" vim.bo[bufnr].filetype = "dashboard" vim.bo[bufnr].synmaxcol = 0 + vim.wo[winid][0].wrap = false + vim.wo[winid][0].colorcolumn = "" + vim.wo[winid][0].foldlevel = 999 + vim.wo[winid][0].foldcolumn = "0" + vim.wo[winid][0].cursorcolumn = false + vim.wo[winid][0].cursorline = false + vim.wo[winid][0].number = false + vim.wo[winid][0].relativenumber = false + vim.wo[winid][0].list = false + vim.wo[winid][0].spell = false + vim.wo[winid][0].signcolumn = "no" vim.b[bufnr].dashboard = {} vim.b[bufnr].dashboard.augroup = vim.api.nvim_create_augroup("dashboard", { clear = true }) - local opts = { scope = "local", win = winid } - vim.api.nvim_set_option_value("wrap", false, opts) - vim.api.nvim_set_option_value("colorcolumn", "", opts) - vim.api.nvim_set_option_value("foldlevel", 999, opts) - vim.api.nvim_set_option_value("foldcolumn", "0", opts) - vim.api.nvim_set_option_value("cursorcolumn", false, opts) - vim.api.nvim_set_option_value("cursorline", false, opts) - vim.api.nvim_set_option_value("number", false, opts) - vim.api.nvim_set_option_value("relativenumber", false, opts) - vim.api.nvim_set_option_value("list", false, opts) - vim.api.nvim_set_option_value("spell", false, opts) - vim.api.nvim_set_option_value("signcolumn", "no", opts) - return bufnr end function M.next_fortune(bufnr) - M.render(bufnr, 1) + M.render(bufnr, 1) end function M.refresh_stats(bufnr) - M.render(bufnr, 3) + M.render(bufnr, 3) end function M.setup() @@ -176,8 +159,8 @@ function M.setup() group = augroup, pattern = { "LazyVimStarted", "LazyLoad", "LazyCheck" }, callback = function() - M.refresh_stats(bufnr) - end, + M.refresh_stats(bufnr) + end, desc = "dashboard lazy stats", }) |