From e39921edc1a12499946997dcd4f0e2320f74bf01 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Wed, 5 Jun 2024 18:44:12 +0100 Subject: [PATCH] Updates --- .config/alacritty.toml | 32 +++++++ .config/git/config | 6 +- .config/git/config_foxsoft | 4 +- .config/nvim/lazy-lock.json | 58 ++++++------- .config/nvim/lua/tsv/plugins/cmp.lua | 5 -- .../nvim/lua/tsv/plugins/indent-blankline.lua | 6 ++ .config/nvim/lua/tsv/plugins/lspconfig.lua | 86 +------------------ .config/nvim/lua/tsv/plugins/treesitter.lua | 1 + 8 files changed, 72 insertions(+), 126 deletions(-) create mode 100644 .config/nvim/lua/tsv/plugins/indent-blankline.lua diff --git a/.config/alacritty.toml b/.config/alacritty.toml index 4758155..793b757 100644 --- a/.config/alacritty.toml +++ b/.config/alacritty.toml @@ -18,6 +18,7 @@ padding = { x = 20, y = 20 } dynamic_padding = true opacity = 0.95 +# Gruvbox dark [colors.primary] background = '#282828' foreground = '#ebdbb2' @@ -39,3 +40,34 @@ blue = '#83a598' magenta = '#d3869b' cyan = '#8ec07c' white = '#ebdbb2' + +# Gruvbox light +# # Default colors +# [colors.primary] +# # hard contrast background = = '#f9f5d7' +# background = '#fbf1c7' +# # soft contrast background = = '#f2e5bc' +# foreground = '#3c3836' +# +# # Normal colors +# [colors.normal] +# black = '#fbf1c7' +# red = '#cc241d' +# green = '#98971a' +# yellow = '#d79921' +# blue = '#458588' +# magenta = '#b16286' +# cyan = '#689d6a' +# white = '#7c6f64' +# +# # Bright colors +# [colors.bright] +# black = '#928374' +# red = '#9d0006' +# green = '#79740e' +# yellow = '#b57614' +# blue = '#076678' +# magenta = '#8f3f71' +# cyan = '#427b58' +# white = '#3c3836' + diff --git a/.config/git/config b/.config/git/config index 5a9e306..99339c9 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,10 +1,8 @@ [user] name = Trevor Vallender email = trevor@tsvallender.co.uk -[includeIf "gitdir:~/foxsoft/"] - path = ~/.config/git/config_foxsoft -[includeIf "gitdir:~/fs/"] - path = ~/.config/git/config_foxsoft +[includeIf "gitdir:~/boxstuff/"] + path = ~/.config/git/config_boxstuff [core] autocrlf = input safecrlf = true diff --git a/.config/git/config_foxsoft b/.config/git/config_foxsoft index 7be3e3a..84bb063 100644 --- a/.config/git/config_foxsoft +++ b/.config/git/config_foxsoft @@ -1,4 +1,2 @@ [user] - email = trevor@foxsoft.co.uk -[commit] - template = ~/foxsoft/git_template + email = trevor.vallender@boxstuff.com diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index a9359f7..c2ba53b 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,41 +1,37 @@ { - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-tmux": { "branch": "main", "commit": "95b1b921802e6f60627b3e76afb9380fddd87f9a" }, - "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" }, - "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" }, - "codeium.vim": { "branch": "main", "commit": "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, + "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" }, + "codeium.vim": { "branch": "main", "commit": "289eb724e5d6fab2263e94a1ad6e54afebefafb2" }, "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" }, - "go.nvim": { "branch": "master", "commit": "9ac3e6faa32d01479973f4ca368d00b7ae328646" }, - "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, - "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "go.nvim": { "branch": "master", "commit": "1423d5d0820eeefc97d6cdaf3ae8b554676619cc" }, + "gruvbox.nvim": { "branch": "main", "commit": "96a8ec336fb48a11cefbd57508888361431aac26" }, + "guihua.lua": { "branch": "master", "commit": "a53b76514ad42d92a821d75d712ef71e71898fcf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" }, - "nvim-lspconfig": { "branch": "master", "commit": "d67715d3b746a19e951b6b0a99663fa909bb9e64" }, - "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" }, - "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, - "nvim-treesitter": { "branch": "master", "commit": "36860295919fb18e57cd637b2a5f22e16f750c2f" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" }, - "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, + "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, + "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" }, + "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, + "nvim-tree.lua": { "branch": "master", "commit": "5a87ffe35c4739ffb6b62052572583ad277a20ae" }, + "nvim-treesitter": { "branch": "master", "commit": "ea2b137f35fb1e87a6471ec311805920fdf45745" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "repl.nvim": { "branch": "master", "commit": "ec202eb5786b305c7d73b8cab5ee8fe69a2534a7" }, "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, - "vim-rails": { "branch": "master", "commit": "3a155462d1c346e291595400ca238037d02a357f" }, + "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, + "vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" }, "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } diff --git a/.config/nvim/lua/tsv/plugins/cmp.lua b/.config/nvim/lua/tsv/plugins/cmp.lua index 3fe880e..ee8513c 100644 --- a/.config/nvim/lua/tsv/plugins/cmp.lua +++ b/.config/nvim/lua/tsv/plugins/cmp.lua @@ -4,9 +4,4 @@ return { "hrsh7th/cmp-nvim-lsp-document-symbol", "hrsh7th/cmp-nvim-lsp-signature-help", "ray-x/cmp-treesitter", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "andersevenrud/cmp-tmux", - "garyhurtz/cmp_kitty", - "kdheepak/cmp-latex-symbols", } diff --git a/.config/nvim/lua/tsv/plugins/indent-blankline.lua b/.config/nvim/lua/tsv/plugins/indent-blankline.lua new file mode 100644 index 0000000..2402e03 --- /dev/null +++ b/.config/nvim/lua/tsv/plugins/indent-blankline.lua @@ -0,0 +1,6 @@ +return { + "lukas-reineke/indent-blankline.nvim", + config = function() + require'ibl'.setup() + end +} diff --git a/.config/nvim/lua/tsv/plugins/lspconfig.lua b/.config/nvim/lua/tsv/plugins/lspconfig.lua index e897ecf..88bae1f 100644 --- a/.config/nvim/lua/tsv/plugins/lspconfig.lua +++ b/.config/nvim/lua/tsv/plugins/lspconfig.lua @@ -5,87 +5,6 @@ return { "williamboman/mason-lspconfig.nvim", }, config = function() --- textDocument/diagnostic support until 0.10.0 is released -_timers = {} -local function setup_diagnostics(client, buffer) - if require("vim.lsp.diagnostic")._enable then - return - end - - local diagnostic_handler = function() - local params = vim.lsp.util.make_text_document_params(buffer) - client.request("textDocument/diagnostic", { textDocument = params }, function(err, result) - if err then - local err_msg = string.format("diagnostics error - %s", vim.inspect(err)) - vim.lsp.log.error(err_msg) - end - local diagnostic_items = {} - if result then - diagnostic_items = result.items - end - vim.lsp.diagnostic.on_publish_diagnostics( - nil, - vim.tbl_extend("keep", params, { diagnostics = diagnostic_items }), - { client_id = client.id } - ) - end) - end - - diagnostic_handler() -- to request diagnostics on buffer when first attaching - - vim.api.nvim_buf_attach(buffer, false, { - on_lines = function() - if _timers[buffer] then - vim.fn.timer_stop(_timers[buffer]) - end - _timers[buffer] = vim.fn.timer_start(200, diagnostic_handler) - end, - on_detach = function() - if _timers[buffer] then - vim.fn.timer_stop(_timers[buffer]) - end - end, - }) -end - --- adds ShowRubyDeps command to show dependencies in the quickfix list. --- add the `all` argument to show indirect dependencies as well -local function add_ruby_deps_command(client, bufnr) - vim.api.nvim_buf_create_user_command(bufnr, "ShowRubyDeps", - function(opts) - - local params = vim.lsp.util.make_text_document_params() - - local showAll = opts.args == "all" - - client.request("rubyLsp/workspace/dependencies", params, - function(error, result) - if error then - print("Error showing deps: " .. error) - return - end - - local qf_list = {} - for _, item in ipairs(result) do - if showAll or item.dependency then - table.insert(qf_list, { - text = string.format("%s (%s) - %s", - item.name, - item.version, - item.dependency), - - filename = item.path - }) - end - end - - vim.fn.setqflist(qf_list) - vim.cmd('copen') - end, bufnr) - end, {nargs = "?", complete = function() - return {"all"} - end}) -end require("mason").setup() require("mason-lspconfig").setup({ automatic_installation = true, @@ -94,8 +13,9 @@ end function(server_name) require("lspconfig")[server_name].setup({}) end, - ["ruby_ls"] = function() - require("lspconfig").ruby_ls.setup({ + ["ruby_lsp"] = function() + require("lspconfig").ruby_lsp.setup({ + cmd = {"/home/tsv/.rbenv/shims/ruby-lsp"}, on_attach = function(client, buffer) setup_diagnostics(client, buffer) add_ruby_deps_command(client, buffer) diff --git a/.config/nvim/lua/tsv/plugins/treesitter.lua b/.config/nvim/lua/tsv/plugins/treesitter.lua index e49e071..3714b4c 100644 --- a/.config/nvim/lua/tsv/plugins/treesitter.lua +++ b/.config/nvim/lua/tsv/plugins/treesitter.lua @@ -1,5 +1,6 @@ return { "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", config = function() require'nvim-treesitter.configs'.setup({ sync_install = false,