From 2c39b28da3f0b04a73d3a2c02190725c495187f7 Mon Sep 17 00:00:00 2001 From: thomasabishop Date: Thu, 16 Apr 2026 17:10:12 +0100 Subject: [PATCH] fix issues with nvim --- nvim/lazy-lock.json | 24 +++++++++++----------- nvim/lsp/ts_ls.lua | 4 ++++ nvim/lua/plugins/colorizer.lua | 7 +++---- nvim/lua/plugins/gruvbox.lua | 20 ++++++++++++++++-- nvim/lua/plugins/telescope.lua | 37 +--------------------------------- 5 files changed, 38 insertions(+), 54 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 13a2c4a..b9d7650 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,26 +1,26 @@ { "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "git-blame.nvim": { "branch": "main", "commit": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7" }, - "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mini.diff": { "branch": "main", "commit": "ff3cd5e76e812fa18bde0f8126d6f3bb62008c79" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, + "mini.diff": { "branch": "main", "commit": "ab11575a6c147ecfba894d676d0c93e855021d34" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" }, + "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-treesitter": { "branch": "main", "commit": "493890b87a81dfe6a7e577dbc364ae33fa482da9" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, - "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "5cfe7fffbd01e17b3c1e14af85d5febdef88bd8c" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, + "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" }, - "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, - "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }, + "vim-wakatime": { "branch": "master", "commit": "cb7ba055330245b3a9d29f8bb4b82aeb2d52e580" }, "zk-nvim": { "branch": "main", "commit": "dea1ee6cd6d07568c92ea8353063d4d85c58a964" } } diff --git a/nvim/lsp/ts_ls.lua b/nvim/lsp/ts_ls.lua index 1da67fb..64b963c 100644 --- a/nvim/lsp/ts_ls.lua +++ b/nvim/lsp/ts_ls.lua @@ -6,4 +6,8 @@ return { "typescript", "typescriptreact", "typescript.tsx", }, root_markers = { "tsconfig.json", "jsconfig.json", "package.json", ".git" }, + on_init = function(client) + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = false + end, } diff --git a/nvim/lua/plugins/colorizer.lua b/nvim/lua/plugins/colorizer.lua index a92caac..fb1582a 100644 --- a/nvim/lua/plugins/colorizer.lua +++ b/nvim/lua/plugins/colorizer.lua @@ -1,6 +1,5 @@ return { - "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup({ "*" }) - end, + "catgoose/nvim-colorizer.lua", + event = "BufReadPre", + opts = {}, } diff --git a/nvim/lua/plugins/gruvbox.lua b/nvim/lua/plugins/gruvbox.lua index baadeda..eab63ed 100644 --- a/nvim/lua/plugins/gruvbox.lua +++ b/nvim/lua/plugins/gruvbox.lua @@ -10,5 +10,21 @@ -- vim.cmd.colorscheme("solarized") -- end, -- } --- -return {} + +return { + "shaunsingh/nord.nvim", + lazy = false, + priority = 1000, + config = function() + vim.g.nord_contrast = true + vim.g.nord_borders = false + vim.g.nord_disable_background = false + vim.g.nord_italic = false + vim.g.nord_bold = true + vim.g.nord_uniform_diff_background = false + vim.g.nord_cursorline_transparent = false + vim.g.nord_enable_sidebar_background = false + + require("nord").set() + end, +} diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 506ad85..0f66ebf 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,39 +1,3 @@ --- local actions = require("telescope.actions") - --- return { --- "nvim-telescope/telescope.nvim", --- tag = "0.1.8", --- dependencies = { --- "nvim-lua/plenary.nvim", --- "nvim-telescope/telescope-fzf-native.nvim", --- "nvim-telescope/telescope-file-browser.nvim", --- }, --- opts = { --- defaults = { --- mappings = { --- i = { --- [""] = actions.move_selection_previous, -- move to prev result --- [""] = actions.move_selection_next, -- move to next result --- }, --- }, --- file_ignore_patterns = { --- "build/", --- "neuron/", --- "img", --- ".cache/", --- "node_modules", --- ".git", --- }, --- }, --- }, --- keys = { --- { "ff", "Telescope find_files hidden=true" }, --- { "bb", "Telescope buffers" }, --- { "tt", "Telescope file_browser hidden=true" }, --- { "gg", "Telescope live_grep hidden=true" }, --- }, --- } --- return { "nvim-telescope/telescope.nvim", tag = "v0.2.1", @@ -46,6 +10,7 @@ return { local actions = require("telescope.actions") require("telescope").setup({ defaults = { + find_command = {"fd", "--type", "f", "--hidden", "--follow", "--exclude", ".git"}, mappings = { i = { [""] = actions.move_selection_previous,