From 05713fcece3588921c76dfb5cd35373d55783210 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Mar 2023 11:27:11 +0100 Subject: [PATCH] feat: use unstable for nvim LSPs, update deps --- flake.lock | 48 ++++++++++++++-------------- home/apps/neovim.nix | 21 ++++++------ home/apps/neovim/lazy-lock.json | 42 ++++++++++++------------ home/apps/neovim/lua/lsp/null-ls.lua | 1 + home/apps/neovim/lua/lsp/webdev.lua | 4 +++ home/apps/neovim/lua/plugins.lua | 4 +-- home/default.nix | 1 + 7 files changed, 64 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 9e589b8..b0ac5ff 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677704978, - "narHash": "sha256-3ijjQ5Vb51NdHvslbCpG8/UZ61ECcogxguRqgknlejc=", + "lastModified": 1678019241, + "narHash": "sha256-ntj0u3guaIu9dT8aZ3HtnEVhIsibtM7EaG/2VteKaTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8077880359b72bbd290ee216b105f200a6f7cc7", + "rev": "e314f6cf211e480ab8fa101a017e593a9bb9f21b", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677624842, - "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=", + "lastModified": 1677779205, + "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0", + "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1677560965, - "narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=", + "lastModified": 1677948530, + "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa", + "rev": "d51554151a91cd4543a7620843cc378e3cbc767e", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1677655566, - "narHash": "sha256-I8G8Lmpp3YduYl4+pkiIJFGT1WKw+8ZMH2QwANkTu2U=", + "lastModified": 1677995890, + "narHash": "sha256-eOnCn0o3I6LP48fAi8xWFcn49V2rL7oX5jCtJTeN1LI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae8bdd2de4c23b239b5a771501641d2ef5e027d0", + "rev": "a1240f6b4a0bcc84fc48008b396a140d9f3638f6", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677468890, - "narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", + "lastModified": 1677852945, + "narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f19c04354dec3903f614eae09327a04d297835d", + "rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1677730255, - "narHash": "sha256-wtOYHwVq620qYZyCXyZBxxg7MrOZ+UVFQIJIyN2tmew=", + "lastModified": 1678093275, + "narHash": "sha256-paOVuCTKg73Ta1pNXvhmyzcAlob6RQMrvcOSsbWfnaY=", "owner": "nix-community", "repo": "NUR", - "rev": "0ed2dfb612571bec41b21349933c141d7f5706ac", + "rev": "e077c4283fc48c0f51823132bf7140dac7dd7573", "type": "github" }, "original": { @@ -248,11 +248,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1677722096, - "narHash": "sha256-7mjVMvCs9InnrRybBfr5ohqcOz+pyEX8m22C1XsDilg=", + "lastModified": 1677832802, + "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "61a3511668891c68ebd19d40122150b98dc2fe3b", + "rev": "382bee738397ca005206eefa36922cc10df8a21c", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1677594933, - "narHash": "sha256-qUoODrgbHRDKcg5r1Wsck01zIsJyKi/G4R2YAQafXPQ=", + "lastModified": 1677987270, + "narHash": "sha256-NRqhY8jbrmP1C6oiVqv1T0T1r560eo4ZpmEdHoQmKj4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "27018a9084006b8371b1f833882adfb85bd23004", + "rev": "7cff56b43952edc5a2c212076d5fc922f764240f", "type": "github" }, "original": { diff --git a/home/apps/neovim.nix b/home/apps/neovim.nix index a26af4a..785079b 100644 --- a/home/apps/neovim.nix +++ b/home/apps/neovim.nix @@ -14,7 +14,7 @@ withNodeJs = true; - extraPackages = with pkgs; [ + extraPackages = with pkgs.unstable; [ # external deps fd ripgrep @@ -26,7 +26,7 @@ # lua stylua - sumneko-lua-language-server + lua-language-server # data taplo @@ -47,16 +47,17 @@ nodePackages.alex nodePackages.typescript nodePackages.typescript-language-server - unstable.nodePackages.vscode-langservers-extracted + nodePackages.vscode-langservers-extracted nodePackages.yaml-language-server + nodePackages.intelephense # rust - unstable.rust-analyzer - unstable.rustc - unstable.rustfmt + rust-analyzer + rustc + rustfmt # etc - unstable.deno + deno ltex-ls nodePackages.prettier rnix-lsp @@ -66,9 +67,9 @@ tree-sitter alejandra deadnix - nur.repos.nekowinston.jq-lsp - nur.repos.nekowinston.helm-ls - nur.repos.bandithedoge.nodePackages.emmet-ls + pkgs.nur.repos.nekowinston.jq-lsp + pkgs.nur.repos.nekowinston.helm-ls + pkgs.nur.repos.bandithedoge.nodePackages.emmet-ls # needed for some plugin build steps cargo diff --git a/home/apps/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json index fb54a04..088c8ca 100644 --- a/home/apps/neovim/lazy-lock.json +++ b/home/apps/neovim/lazy-lock.json @@ -1,10 +1,10 @@ { - "asyncrun.vim": { "branch": "master", "commit": "bd240b2a2ac5c975216744fda57abe5ff8f39957" }, + "asyncrun.vim": { "branch": "master", "commit": "80750a80e7999318f14d754bb68b64de7af93bc3" }, "asynctasks.vim": { "branch": "master", "commit": "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "9a7515c180c73ccbab9fce7124e49914f88cd763" }, "barbecue": { "branch": "main", "commit": "23348f3979912fb36a1442fb0d07e8d2e739aea2" }, - "bufferline.nvim": { "branch": "main", "commit": "cbb798dd2db7841550cd2c6c6dde12dfda055928" }, - "catppuccin": { "branch": "main", "commit": "06ceffdef52530e2071bb5391b991bedffe35eb7" }, + "bufferline.nvim": { "branch": "main", "commit": "3677aceb9a72630b0613e56516c8f7151b86f95c" }, + "catppuccin": { "branch": "main", "commit": "5e2c9cf8277c42fb634007126c36d765fd176f4a" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-git": { "branch": "main", "commit": "a798a25b21e7204597f56029af2e8a17d65e2518" }, @@ -17,42 +17,42 @@ "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" }, - "friendly-snippets": { "branch": "main", "commit": "543667fccf842b509bfecc80aba558f73a4e7c88" }, + "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" }, "gitsigns.nvim": { "branch": "main", "commit": "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be" }, - "go.nvim": { "branch": "master", "commit": "7d7b081bf3d3113d1d487d83a5436bd1e7215ff5" }, + "go.nvim": { "branch": "master", "commit": "1844fd11a143aba3eec644c2e2099a20f79c1ec1" }, "guihua.lua": { "branch": "master", "commit": "a19ac4447021f21383fadd7a9e1fc150d0b67e1f" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, + "lazy.nvim": { "branch": "main", "commit": "e89acede13f46a5db229133cf0c87aee74938c56" }, "lightspeed.nvim": { "branch": "main", "commit": "299eefa6a9e2d881f1194587c573dad619fdb96f" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "ltex-extra.nvim": { "branch": "master", "commit": "1d2f288ceedc70d5a9c00f55c0d0cc788b5164f2" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "neogit": { "branch": "master", "commit": "ef22fd01b6cc4bff2b83c51f376c36be86566713" }, - "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, + "neogit": { "branch": "master", "commit": "85380916cec322b1351785cac4f4e3f24de36b2a" }, + "null-ls.nvim": { "branch": "main", "commit": "456cd2754c56c991c5e4df60a807d054c1bc7148" }, "nvim-autopairs": { "branch": "master", "commit": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b" }, - "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, + "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "5b986edc95cf7b37da1db91a5c149daa3ac008d2" }, + "nvim-dap": { "branch": "master", "commit": "c1bfcd89ef440a44d02ade7e71befb1e5aa358ca" }, "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, - "nvim-lspconfig": { "branch": "master", "commit": "95b7a69bc6da2a6a740584ea3c555e5327638b7d" }, - "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, - "nvim-surround": { "branch": "main", "commit": "d06334e10e4ee0864bc404ecc478a09539c142ef" }, - "nvim-tree.lua": { "branch": "master", "commit": "362ecbeed69fae91a287004619decadcb6f7c113" }, - "nvim-treesitter": { "branch": "master", "commit": "b1450214993582d54b2fd7e0fe6b556710cae606" }, + "nvim-lspconfig": { "branch": "master", "commit": "1a2d5f5224c65b0709bf5da0ccd9cad29272083a" }, + "nvim-navic": { "branch": "master", "commit": "cdd24539bcf114a499827e9b32869fe74836efe7" }, + "nvim-surround": { "branch": "main", "commit": "8680311f6de05d45b010883db7cc1912b7f0d0e4" }, + "nvim-tree.lua": { "branch": "master", "commit": "bbb6d4891009de7dab05ad8fc2d39f272d7a751c" }, + "nvim-treesitter": { "branch": "master", "commit": "980f0816cc28c20e45715687a0a21b5b39af59eb" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "ae7d04da54c334209601d377c53da1515101411f" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "293e12e90f0928845582b9a3db7258eaa8e92a65" }, + "nvim-web-devicons": { "branch": "master", "commit": "b2060eac2fbc84e0637ea706378ff66451e7c424" }, "octo.nvim": { "branch": "master", "commit": "ab5dbe20dc276348019676e5c3e97cb391e46b1b" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "py_lsp.nvim": { "branch": "main", "commit": "5b2bd6433a2dbab76d54d58ccc1d1e89b220091c" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, - "schemastore.nvim": { "branch": "main", "commit": "e340c528bc4c0df132556cc8d8c419901fd06883" }, + "schemastore.nvim": { "branch": "main", "commit": "809c05360a0dabfc018093a090045d292d362ef4" }, "stabilize.nvim": { "branch": "master", "commit": "34069870a8e72632c5447188e638e1c6bfebc353" }, "telescope-asynctasks.nvim": { "branch": "main", "commit": "065300fb0a8ba6a1c81991da1873c73e136dcdc0" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "6eb6bb45b7a9bed94a464a3e1dadfe870459628c" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "61b3769065131129716974f7fb63f82ee409bd80" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-project.nvim": { "branch": "master", "commit": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972" }, "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, @@ -63,11 +63,11 @@ "vim-dadbod": { "branch": "master", "commit": "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f" }, "vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" }, "vim-dadbod-ui": { "branch": "master", "commit": "caf45f54dad6150970331ac115e531524e418c7c" }, - "vim-fugitive": { "branch": "master", "commit": "bba8d1beb37fe933a9f182b6bdf981e01f31499a" }, + "vim-fugitive": { "branch": "master", "commit": "caf1bc99b63a80cc3a35cc9d05320dfa75d7ebfa" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "vim-helm": { "branch": "master", "commit": "c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb" }, "vim-just": { "branch": "master", "commit": "838c9096d4c5d64d1000a6442a358746324c2123" }, "vim-table-mode": { "branch": "master", "commit": "9555a3e6e5bcf285ec181b7fc983eea90500feb4" }, "vim-vsnip": { "branch": "master", "commit": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e" }, - "which-key.nvim": { "branch": "main", "commit": "454fe081e6427fb27cd5ebd886fff999c447c859" } + "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" } } \ No newline at end of file diff --git a/home/apps/neovim/lua/lsp/null-ls.lua b/home/apps/neovim/lua/lsp/null-ls.lua index 08fe284..5ca5702 100644 --- a/home/apps/neovim/lua/lsp/null-ls.lua +++ b/home/apps/neovim/lua/lsp/null-ls.lua @@ -28,6 +28,7 @@ null.setup({ extra_args = { "-l", "-L" }, }), null.builtins.hover.dictionary, + null.builtins.hover.printenv, }, on_attach = function(client, bufnr) if client.supports_method("textDocument/formatting") then diff --git a/home/apps/neovim/lua/lsp/webdev.lua b/home/apps/neovim/lua/lsp/webdev.lua index 3b4c2e8..814d83a 100644 --- a/home/apps/neovim/lua/lsp/webdev.lua +++ b/home/apps/neovim/lua/lsp/webdev.lua @@ -11,6 +11,10 @@ M.setup = function(opts) capabilities = opts.capabilities, on_attach = opts.on_attach, }) + lspconfig.intelephense.setup({ + capabilities = opts.capabilities, + on_attach = opts.on_attach, + }) lspconfig.tailwindcss.setup({ capabilities = opts.capabilities, on_attach = opts.on_attach, diff --git a/home/apps/neovim/lua/plugins.lua b/home/apps/neovim/lua/plugins.lua index a61e3d7..a5e2284 100644 --- a/home/apps/neovim/lua/plugins.lua +++ b/home/apps/neovim/lua/plugins.lua @@ -100,10 +100,10 @@ local plugins = { { "pwntester/octo.nvim", - requires = { + dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", - "kyazdani42/nvim-web-devicons", + "nvim-tree/nvim-web-devicons", }, opts = {}, }, diff --git a/home/default.nix b/home/default.nix index ae5ec78..80dd602 100644 --- a/home/default.nix +++ b/home/default.nix @@ -52,6 +52,7 @@ in { (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) victor-mono ibm-plex + xkcd-font nur.repos.nekowinston.wezterm-nightly ] ++ lib.optionals isLinux [