From f4c4e492c340b57e758f89fb76000bc5ab6daf74 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 21 Nov 2023 22:02:44 +0100 Subject: [PATCH] Update deps --- container/tubearchivist/default.nix | 2 +- flake.lock | 32 ++++++++++++------------ home/config/nvim/plugins/cmp.fnl | 4 +-- home/config/nvim/plugins/lsp.fnl | 5 ++-- home/programs/nvim/default.nix | 2 +- home/programs/nvim/plugins.nix | 38 ++++++++++++++--------------- home/programs/nvim/plugins.yaml | 2 +- 7 files changed, 43 insertions(+), 42 deletions(-) diff --git a/container/tubearchivist/default.nix b/container/tubearchivist/default.nix index 1e0eb69..e88d181 100644 --- a/container/tubearchivist/default.nix +++ b/container/tubearchivist/default.nix @@ -10,7 +10,7 @@ virtualisation.oci-containers.containers = { tubearchivist = { - image = "docker.io/bbilly1/tubearchivist:v0.4.3"; + image = "docker.io/bbilly1/tubearchivist:v0.4.4"; dependsOn = [ "archivist-es" "archivist-redis" ]; ports = [ "127.0.0.1:9887:8000" ]; environmentFiles = [ config.age.secrets.tubearchivist-environment-ta.path ]; diff --git a/flake.lock b/flake.lock index 88541ea..af9c4ed 100644 --- a/flake.lock +++ b/flake.lock @@ -287,11 +287,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700547945, - "narHash": "sha256-G6Rl8cz25tnC4ASNycQf2fjF4I9XkucQVIHhr4Vz9R0=", + "lastModified": 1700585179, + "narHash": "sha256-aiPGciNwiqsO1BdRrKPDx+EoyZ/m3Qa2ND7XhRAHdH8=", "owner": "neovim", "repo": "neovim", - "rev": "fec5e3ab247bcc1ced67f1d0aa7fa10f694f933b", + "rev": "7e97c773e3ba78fcddbb2a0b9b0d572c8210c83e", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1700554575, - "narHash": "sha256-keJ6/AolW7vPqtueo1fdKdtvmUdOM8GR+HiRSm+ffwk=", + "lastModified": 1700600149, + "narHash": "sha256-282a5d5O95R1K6uNRZtC3bPv/bcMoxV8n0lewwbOoUE=", "ref": "refs/heads/master", - "rev": "9313942e070900f2182f1653adfcd50eaeb0a636", - "revCount": 591, + "rev": "0ca2d5027fc456daa5a3eb10f19ac4a440029a17", + "revCount": 592, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -347,11 +347,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1700392353, - "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "lastModified": 1700559156, + "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1700506526, - "narHash": "sha256-mfjnVaF/qHpZ5iVXQZR+d7LiRQnzNCYJ2lcP1dn9bE0=", + "lastModified": 1700553648, + "narHash": "sha256-UhENpRvTgaLlfqcRNeLB0FOEhxHRvVOhRi/f9g8F3UI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "af76d9e3bb03794e4b6f41e304ef038ac65aa277", + "rev": "37e6adc926fc74e270e86a544a41aecabb0effb1", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700479617, - "narHash": "sha256-JjDbQnmFOJY386ahFfnZWkIHM6z+/L2VlWnUvZIdmDc=", + "lastModified": 1700538105, + "narHash": "sha256-uZhOCmwv8VupEmPZm3erbr9XXmyg7K67Ul3+Rx2XMe0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1f62c94f61343b1dc8e9b91e52975890884f39f", + "rev": "51a01a7e5515b469886c120e38db325c96694c2f", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/cmp.fnl b/home/config/nvim/plugins/cmp.fnl index 6eca9c0..5dd1ff6 100644 --- a/home/config/nvim/plugins/cmp.fnl +++ b/home/config/nvim/plugins/cmp.fnl @@ -26,7 +26,7 @@ {:name :treesitter :keyword_length 3} {:name :buffer :keyword_length 3} - {:name :path}]) + {:name :async_path}]) :mapping (cmp.mapping.preset.insert {: (cmp.mapping {:i (cmp.mapping.abort) :c (cmp.mapping.close)}) : (cmp.mapping {:i (cmp.mapping.abort)}) @@ -70,7 +70,7 @@ [{:name :buffer}]) :mapping (cmp.mapping.preset.cmdline)}) (cmp.setup.cmdline ":" - {:sources (cmp.config.sources [{:name :path}] + {:sources (cmp.config.sources [{:name :async_path}] [{:name :cmdline}]) :mapping (cmp.mapping.preset.cmdline)}) (cmp.event:on :confirm_done (npairs.on_confirm_done))) diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index 018a1d0..ed38041 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -1,5 +1,4 @@ (let [lsp (require :lspconfig) - lsp-configs (require :lspconfig.configs) cmp (require :cmp_nvim_lsp) navic (require :nvim-navic) diagnostic (require :nifoc.diagnostic) @@ -27,7 +26,9 @@ :desc "Automatic LSP setup"}) ;; Servers (vim.lsp.set_log_level :OFF) - (let [capabilities (cmp.default_capabilities) + (let [capabilities (vim.tbl_deep_extend :force + (vim.lsp.protocol.make_client_capabilities) + (cmp.default_capabilities)) handlers {:textDocument/hover (vim.lsp.with vim.lsp.handlers.hover {:border :rounded}) :textDocument/signatureHelp (vim.lsp.with vim.lsp.handlers.signature_help diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 6609a5f..331cfa3 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -233,7 +233,7 @@ in cmp-nvim-lsp cmp_luasnip - cmp-path + cmp-async-path cmp-buffer cmp-cmdline cmp-nvim-lsp-document-symbol diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 705dc80..dbbc456 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -106,12 +106,12 @@ in }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-20"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "1610b1aafb9b7b3a7b54c853ed45c6cb1a3d0df2"; - sha256 = "1n2c1ffgljf1ry3i6hk931q3m05f91786adfmqkxxbqf11phvj4s"; + rev = "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0"; + sha256 = "1bmr1j6s5r8ig3s2i2qgnr5if8vrqbmf34qk2g74mvqnl38gadyl"; fetchSubmodules = false; }; }; @@ -208,23 +208,23 @@ in }; nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-20"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "7fedba8b1f8d0080c775851c429b88fd2ed4c6f5"; - sha256 = "0l7lc35fixf7yhdr80f4b39rljyfvfj7alxl9kn6mc6qaffh8vg4"; + rev = "addad5176dbbe8bcc82ef91c51c5f1bf6629ec2d"; + sha256 = "166fwrhrfqr21sy1w25x2pdrk5q5g1bcnsm98j9gsd7wnabqizqg"; fetchSubmodules = false; }; }; nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-11-01"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "503a399e0d0b5d432068ab5ae24b9848891b0d53"; - sha256 = "0qq8sr32k9wv92km71h5clpmhsnck3i0dj40qapabb3iaw8iwhwf"; + rev = "44403b2ef6c6285cfd9a3b4fa9a0d746ddae4b45"; + sha256 = "0d6icxcy9rx7dcdx821apwz1mrdl3vr3s547y9xw1m7idljij1cv"; fetchSubmodules = false; }; }; @@ -327,14 +327,14 @@ in fetchSubmodules = false; }; }; - cmp-path = buildVimPlugin { - pname = "cmp-path"; - version = "2022-10-03"; + cmp-async-path = buildVimPlugin { + pname = "cmp-async-path"; + version = "2023-01-16"; src = fetchFromGitHub { - owner = "hrsh7th"; - repo = "cmp-path"; - rev = "91ff86cd9c29299a64f968ebb45846c485725f23"; - sha256 = "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"; + owner = "FelipeLema"; + repo = "cmp-async-path"; + rev = "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d"; + sha256 = "18z548v4ypby32jydq439zdi6gv7zybp8gk957iai22cnxaj403n"; fetchSubmodules = false; }; }; @@ -373,12 +373,12 @@ in }; conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-20"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "2e5866a2c412a1237a9796a2d5a62d07fe084cc5"; - sha256 = "0j9hdc9a5jm1rvgv6hqrkmq7vqaxa8lb5lhk72zqwgvsf3lbq6g6"; + rev = "a5df96556c4c895777bf53177a8704b9b3e884e1"; + sha256 = "0qg0mcy7i00p93vqycq1nx7svfn758a3qy30lkwgkydvz4g8nhzg"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index c1d36d4..1485d00 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -39,7 +39,7 @@ - src: hrsh7th/nvim-cmp - src: hrsh7th/cmp-nvim-lsp - src: saadparwaiz1/cmp_luasnip -- src: hrsh7th/cmp-path +- src: FelipeLema/cmp-async-path - src: hrsh7th/cmp-buffer - src: hrsh7th/cmp-cmdline - src: hrsh7th/cmp-nvim-lsp-document-symbol