From 3d5cc86a0623ef31f3847314bb3538d0021d8a06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Sep 2024 04:21:25 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17) • Updated input 'home-manager': 'github:nix-community/home-manager/da8406a6ff556b86dc368e96ca8bd81b2704a91a?narHash=sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw%3D' (2024-09-12) → 'github:nix-community/home-manager/1786e2afdbc48e9038f7cff585069736e1d0ed44?narHash=sha256-SLorVhoorZwjM1aS04bBX4fufEXIfkMdAGkj9bu2QAQ%3D' (2024-09-19) • Updated input 'jetbrains-updater': 'gitlab:genericnerdyusername/jetbrains-updater/ee18b0b6a4c902aba996a8c5260beaf2cdea2949?narHash=sha256-de4TH07nrkn1ueIXXlZ3o6LBVfwwSjGfileU2yKAV9Q%3D' (2024-09-10) → 'gitlab:genericnerdyusername/jetbrains-updater/7b15758b35f2a1bfa2bef25ff2ba2eab28a341f5?narHash=sha256-010doOvxpFGJyKWB15U2knJm5%2Bw6o/KU%2Bh3Sl4pHcS4%3D' (2024-09-20) • Updated input 'nix-index-database': 'github:Mic92/nix-index-database/642275444c5a9defce57219c944b3179bf2adaa9?narHash=sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY%3D' (2024-09-08) → 'github:Mic92/nix-index-database/c1b0fa0bec5478185eae2fd3f39b9e906fc83995?narHash=sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs%2ByE%3D' (2024-09-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/111ed8812c10d7dc3017de46cbf509600c93f551?narHash=sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM%3D' (2024-09-12) → 'github:nixos/nixpkgs/658e7223191d2598641d50ee4e898126768fe847?narHash=sha256-zACxiQx8knB3F8%2BZe%2B1BpiYrI%2BCbhxyWpcSID9kVhkQ%3D' (2024-09-17) • Updated input 'nixvim': 'github:nix-community/nixvim/27a0dd435dd3563f4cf9d788601fadfce8c59db6?narHash=sha256-bR7LFVtMjiVlO2OpmDSuLQ2XQr%2Bh%2BJtVFYObAbThZSs%3D' (2024-09-12) → 'github:nix-community/nixvim/400d1d927d76791b46ae30d431d908c60e411a26?narHash=sha256-eEa/EHO8UKYBTcQECyzF9pZm2ualqO8mr79djYJuYWE%3D' (2024-09-19) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01) → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6?narHash=sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk%3D' (2024-08-28) → 'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528?narHash=sha256-tyMUA6NgJSvvQuzB7A1Sf8%2B0XCHyfSPRx/b00o6K0uo%3D' (2024-09-05) • Updated input 'nixvim/home-manager': 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be?narHash=sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM%3D' (2024-08-23) → 'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f?narHash=sha256-p4OrJL2weh0TRtaeu1fmNYP6%2BTOp/W2qdaIJxxQay4c%3D' (2024-09-14) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/ac5694a0b855a981e81b4d9f14052e3ff46ca39e?narHash=sha256-zv8C9RNa86CIpyHwPIVO/k%2B5TfM8ZbjGwOOpTe1grls%3D' (2024-08-25) → 'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80?narHash=sha256-Vop/VRi6uCiScg/Ic%2BYlwsdIrLabWUJc57dNczp0eBc%3D' (2024-09-13) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/5a08d691de30b6fc28d58ce71a5e420f2694e087?narHash=sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM%3D' (2024-08-25) → 'github:NuschtOS/search/97d34b70deed4878fcb2449ac89dab717d72efa1?narHash=sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7%2Bzb3tAgTiHDM%3D' (2024-09-15) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/3ffd842a5f50f435d3e603312eefa4790db46af5?narHash=sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos%3D' (2024-08-28) → 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd?narHash=sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE%3D' (2024-09-02) • Updated input 'nur': 'github:nix-community/NUR/c779218c72479aa645ea043a53a2251b6ec0682f?narHash=sha256-yoo1geP1T59yjT%2BRdEJda/FiX%2B3Qo%2BDNuGK4vuQmDXM%3D' (2024-09-13) → 'github:nix-community/NUR/47f57f38a4371f562507ab5e0966fbe5b8f30ea5?narHash=sha256-2wuVUyvNDL4LnUdMwordPK9XadK7L9yIMOITN1/Fwis%3D' (2024-09-20) --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index bca6f3bf..aad4ca12 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1726142087, - "narHash": "sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw=", + "lastModified": 1726785354, + "narHash": "sha256-SLorVhoorZwjM1aS04bBX4fufEXIfkMdAGkj9bu2QAQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "da8406a6ff556b86dc368e96ca8bd81b2704a91a", + "rev": "1786e2afdbc48e9038f7cff585069736e1d0ed44", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1726357542, + "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1725926572, - "narHash": "sha256-de4TH07nrkn1ueIXXlZ3o6LBVfwwSjGfileU2yKAV9Q=", + "lastModified": 1726790565, + "narHash": "sha256-010doOvxpFGJyKWB15U2knJm5+w6o/KU+h3Sl4pHcS4=", "owner": "genericnerdyusername", "repo": "jetbrains-updater", - "rev": "ee18b0b6a4c902aba996a8c5260beaf2cdea2949", + "rev": "7b15758b35f2a1bfa2bef25ff2ba2eab28a341f5", "type": "gitlab" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726108120, - "narHash": "sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM=", + "lastModified": 1726583932, + "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "111ed8812c10d7dc3017de46cbf509600c93f551", + "rev": "658e7223191d2598641d50ee4e898126768fe847", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726148694, - "narHash": "sha256-bR7LFVtMjiVlO2OpmDSuLQ2XQr+h+JtVFYObAbThZSs=", + "lastModified": 1726785706, + "narHash": "sha256-eEa/EHO8UKYBTcQECyzF9pZm2ualqO8mr79djYJuYWE=", "owner": "nix-community", "repo": "nixvim", - "rev": "27a0dd435dd3563f4cf9d788601fadfce8c59db6", + "rev": "400d1d927d76791b46ae30d431d908c60e411a26", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nur": { "locked": { - "lastModified": 1726200288, - "narHash": "sha256-yoo1geP1T59yjT+RdEJda/FiX+3Qo+DNuGK4vuQmDXM=", + "lastModified": 1726805210, + "narHash": "sha256-2wuVUyvNDL4LnUdMwordPK9XadK7L9yIMOITN1/Fwis=", "owner": "nix-community", "repo": "NUR", - "rev": "c779218c72479aa645ea043a53a2251b6ec0682f", + "rev": "47f57f38a4371f562507ab5e0966fbe5b8f30ea5", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1726392886, + "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { From 31b2bcf69624b7b7d40b7dfc7b81df85c5d51fbf Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Mon, 23 Sep 2024 12:47:21 +0100 Subject: [PATCH 2/3] Update from nixvim deprecations --- home/nixvim/base.nix | 2 +- home/nixvim/lsp.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/nixvim/base.nix b/home/nixvim/base.nix index f10f1fa2..c6a8d878 100644 --- a/home/nixvim/base.nix +++ b/home/nixvim/base.nix @@ -256,7 +256,7 @@ in { }; luaLoader.enable = true; plugins = { - surround.enable = true; + vim-surround.enable = true; commentary.enable = true; fugitive.enable = true; treesitter = { diff --git a/home/nixvim/lsp.nix b/home/nixvim/lsp.nix index e4eb3e7d..d1164a2d 100644 --- a/home/nixvim/lsp.nix +++ b/home/nixvim/lsp.nix @@ -33,7 +33,7 @@ in { nil-ls = { enable = true; }; - tsserver = { + ts-ls = { enable = true; extraOptions = { settings.typescript.format.indentSize = 2; From 39438112fd468d7aa06c10616547ebd12e32e4b9 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Mon, 23 Sep 2024 12:48:34 +0100 Subject: [PATCH 3/3] Unpin nix-darwin after bug fix --- flake.lock | 7 +++---- flake.nix | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aad4ca12..0982f663 100644 --- a/flake.lock +++ b/flake.lock @@ -46,17 +46,16 @@ ] }, "locked": { - "lastModified": 1726032244, - "narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=", + "lastModified": 1727003835, + "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", + "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", "type": "github" }, "original": { "owner": "lnl7", "repo": "nix-darwin", - "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b7627784..3548db03 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; - # TEMP: pin nix-darwin due to https://github.com/LnL7/nix-darwin/issues/1082 darwin = { - url = "github:lnl7/nix-darwin/f4f18f3d7229845e1c9d517457b7a0b90a38b728"; + url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; jetbrains-updater = {