From 0352698aff1916fd7623539394d0a9a5515d4c15 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Wed, 9 Oct 2024 22:08:20 +0200 Subject: [PATCH] update inputs, fix deprecation --- flake.lock | 128 +++++++++--------- .../nixvim/plugins/lsp/languages/default.nix | 6 +- .../nixvim/plugins/lsp/languages/emmet.nix | 2 +- modules/nixvim/plugins/lsp/languages/go.nix | 2 +- modules/nixvim/plugins/lsp/languages/nix.nix | 2 +- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 6d4d8b0..b28a549 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -368,11 +368,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -500,11 +500,11 @@ ] }, "locked": { - "lastModified": 1727370457, - "narHash": "sha256-YlTm2rgsf+UxxNnUCE/B/8bL9A3HOfPZD8l8EjlWm/Y=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "57e6b30d181ae6baff0909a61544ecbe1f642936", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1727346017, - "narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c124568e1054a62c20fbe036155cc99237633327", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1725804232, - "narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=", + "lastModified": 1727821831, + "narHash": "sha256-yfWQ6yKytu1jkWUtRZTVICslUWej6jVYv7frmSB7/6Q=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "ba35900b21921c439e676b063a79c8fad914eac9", + "rev": "afc9a37bf021acb0853e95714c4c6436e1588286", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1727331491, - "narHash": "sha256-i0tKa6Nh1IMGGQ+fifU5PQyna3lVM6DZYUaUJSkSYwc=", + "lastModified": 1728453769, + "narHash": "sha256-Y3yr9m0L2ZbVBTWIHKOSQihYe/mUXARDk0R0y8gyVlU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c914a68cbcd80f61d6eeb8152e97abf8fa684e99", + "rev": "a03b28ad890ba13be3367d0aae40c52345728fc4", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1727298068, - "narHash": "sha256-fiDn3BSRLqSRh1cPLCkFIYc0mRpAAxc4Lq89gZ+ioMg=", + "lastModified": 1728429403, + "narHash": "sha256-F8dsqHvzdCvlKk+6zMubRemPLxjImYQDKkRHy8wgV3Y=", "owner": "neovim", "repo": "neovim", - "rev": "64847fbdc908bf0a301b8f1e1814ff71bd425bae", + "rev": "e98b1b0235a5e817c00814549606631703ab2041", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1728385805, + "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -724,11 +724,11 @@ ] }, "locked": { - "lastModified": 1727091786, - "narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=", + "lastModified": 1728399236, + "narHash": "sha256-X1a4t/OkB9fH6Ao+Pqkto8mJrzlG6t8Dimn8jkbPuZc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278", + "rev": "9f4fbf5f9e381826e6d66a6f699ad30ff3122075", "type": "github" }, "original": { @@ -739,11 +739,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -755,14 +755,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-lib_2": { @@ -827,11 +827,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727366999, - "narHash": "sha256-IGzvFj3RDBkLF92pF4txAon7kJTQMhmR/HTKViKhys8=", + "lastModified": 1728485062, + "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ea7009e61ea02e08e480c94c06e71e640a59132", + "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", "type": "github" }, "original": { @@ -883,11 +883,11 @@ }, "nur": { "locked": { - "lastModified": 1727372286, - "narHash": "sha256-FzxzdW3qyQK949FM1HBYwPHck1pthknphECkxHBqbEo=", + "lastModified": 1728503449, + "narHash": "sha256-rxsnlTXxZXm2JJQXQY9v4SR8WsbBOpkEoBSpNK2BXVA=", "owner": "nix-community", "repo": "NUR", - "rev": "1cb268872ecbbb8bcdd76937b1f7536de880811b", + "rev": "f1df2359f8196cfe2edac0d1eba6bf7ea0128c9c", "type": "github" }, "original": { @@ -905,11 +905,11 @@ ] }, "locked": { - "lastModified": 1726995581, - "narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=", + "lastModified": 1728423244, + "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", "owner": "NuschtOS", "repo": "search", - "rev": "3b7dd61b365ca45380707453758a45f2e9977be3", + "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", "type": "github" }, "original": { @@ -1048,11 +1048,11 @@ ] }, "locked": { - "lastModified": 1727252110, - "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/modules/nixvim/plugins/lsp/languages/default.nix b/modules/nixvim/plugins/lsp/languages/default.nix index ed7eab9..e495358 100644 --- a/modules/nixvim/plugins/lsp/languages/default.nix +++ b/modules/nixvim/plugins/lsp/languages/default.nix @@ -13,14 +13,14 @@ eslint.enable = true; htmx.enable = true; jsonls.enable = true; - lua-ls.enable = true; + lua_ls.enable = true; phpactor.enable = true; - ruff-lsp.enable = true; + ruff_lsp.enable = true; pyright.enable = true; sqls.enable = true; tailwindcss.enable = true; templ.enable = true; - ts-ls.enable = true; + ts_ls.enable = true; yamlls.enable = true; }; } diff --git a/modules/nixvim/plugins/lsp/languages/emmet.nix b/modules/nixvim/plugins/lsp/languages/emmet.nix index d47b3ab..9d21817 100644 --- a/modules/nixvim/plugins/lsp/languages/emmet.nix +++ b/modules/nixvim/plugins/lsp/languages/emmet.nix @@ -1,7 +1,7 @@ { plugins.lsp = { servers = { - emmet-ls = { + emmet_ls = { enable = true; filetypes = [ "astro" diff --git a/modules/nixvim/plugins/lsp/languages/go.nix b/modules/nixvim/plugins/lsp/languages/go.nix index c0d9378..1bbdb10 100644 --- a/modules/nixvim/plugins/lsp/languages/go.nix +++ b/modules/nixvim/plugins/lsp/languages/go.nix @@ -2,7 +2,7 @@ plugins = { lsp = { servers = { - golangci-lint-ls = { + golangci_lint_ls = { enable = true; cmd = ["${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver" "run" "--out-format" "json"]; }; diff --git a/modules/nixvim/plugins/lsp/languages/nix.nix b/modules/nixvim/plugins/lsp/languages/nix.nix index 014a120..bf8f762 100644 --- a/modules/nixvim/plugins/lsp/languages/nix.nix +++ b/modules/nixvim/plugins/lsp/languages/nix.nix @@ -1,7 +1,7 @@ { plugins.lsp = { servers = { - nil-ls = { + nil_ls = { enable = true; settings.formatting.command = ["nixpkgs-fmt"]; };