From 45b647bb31ca7983dac8a885030ef49e68d392c7 Mon Sep 17 00:00:00 2001 From: RiN Date: Wed, 20 Nov 2024 01:01:26 +0700 Subject: [PATCH] chore(lockfile): update flake.lock (#30) * chore(lockfile): update nixvim * chore(lockfile): update nixpkgs-unstable * chore(lockfile): update ocaml-overlay * chore(lockfile): update nix-darwin --- flake.lock | 95 +++++++++++++++++++++++++++-------------- nvim.nix/config/lsp.nix | 10 +++-- 2 files changed, 68 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 22743ae..4b2252a 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -191,11 +191,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -290,6 +290,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -297,11 +325,11 @@ ] }, "locked": { - "lastModified": 1731768170, - "narHash": "sha256-9Zj2baKY3KaKzs5+nqZgIwr/o/iibhENFxjOnpU+IOU=", + "lastModified": 1732016537, + "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2bcef10f4319f34ddebadb5f37eaa81ca2510730", + "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", "type": "github" }, "original": { @@ -482,11 +510,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731499077, - "narHash": "sha256-00Rmh0gM8Z6toNQibs6nFLjWgsE2fSFuGiZ4+T4pYNQ=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b4df30ab31fa4103dfc6fb8c30a8beaa0aec395", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -530,11 +558,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727089097, - "narHash": "sha256-ZMHMThPsthhUREwDebXw7GX45bJnBCVbfnH1g5iuSPc=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "568bfef547c14ca438c56a0bece08b8bb2b71a9c", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -565,11 +593,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1728428263, - "narHash": "sha256-TG/ojDMLuLJI4nEo0waZawgAq4r30n7xJ8klEKpFcd0=", + "lastModified": 1732014462, + "narHash": "sha256-6WPABLqswdWdSLd5YSbGlKaMhpSIXODasz3etxuC+K0=", "owner": "nix-community", "repo": "nixvim", - "rev": "eda14029813906b1ef355823de237d86fea59908", + "rev": "c674f10d189fcbcf961f3c19479ac44d7d2d6e50", "type": "github" }, "original": { @@ -619,17 +647,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728423244, - "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -646,11 +675,11 @@ ] }, "locked": { - "lastModified": 1718690539, - "narHash": "sha256-vBez7OQjPYRPCKfeLAhfDk3GegfjVwGB+5+Fdqtwc7g=", + "lastModified": 1731966256, + "narHash": "sha256-0Ug1mu/IkMkccbVIv8vPL3Yb//HJdBt52YGZpvAceCo=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "b01faf38ae41888031b62e5fd15665c0db092a1d", + "rev": "cd8ebfb895cf7837dac90eed136d091a6fe9c82b", "type": "github" }, "original": { @@ -784,11 +813,11 @@ "server-reason-react": { "flake": false, "locked": { - "lastModified": 1718805260, - "narHash": "sha256-pay8xthDB5KO5sXn5ASQIaOHkNV/TXtL7/kwdGBhEHA=", + "lastModified": 1731945542, + "narHash": "sha256-vdLz0T0+W78x4qPV0lUyLpPxCJAx581VPcEfSewiPuQ=", "owner": "ml-in-barcelona", "repo": "server-reason-react", - "rev": "8b900ef34efa04c8e73c90682b8d4dc5731f2c05", + "rev": "35c95b551e19fac78127e4bfc3e4895e187cf854", "type": "github" }, "original": { @@ -957,11 +986,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1731944360, + "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c", "type": "github" }, "original": { diff --git a/nvim.nix/config/lsp.nix b/nvim.nix/config/lsp.nix index 7c8bd24..153075a 100644 --- a/nvim.nix/config/lsp.nix +++ b/nvim.nix/config/lsp.nix @@ -211,10 +211,10 @@ ]; plugins.typescript-tools.enable = true; - plugins.typescript-tools.settings.codeLens = "references_only"; - plugins.typescript-tools.settings.completeFunctionCalls = true; - plugins.typescript-tools.settings.exposeAsCodeAction = "all"; - plugins.typescript-tools.handlers = { + plugins.typescript-tools.settings.code_lens = "references_only"; + plugins.typescript-tools.settings.complete_function_calls = true; + plugins.typescript-tools.settings.expose_as_code_action = "all"; + plugins.typescript-tools.settings.handlers = { "textDocument/publishDiagnostics" = # lua '' @@ -314,6 +314,7 @@ hls.enable = true; hls.autostart = true; + hls.installGhc = false; htmx.enable = !pkgs.stdenv.isDarwin; htmx.autostart = true; @@ -370,6 +371,7 @@ ocamllsp.enable = true; ocamllsp.autostart = true; + ocamllsp.package = pkgs.ocamlPackages.ocaml-lsp; ocamllsp.settings.codelens.enable = false; ocamllsp.settings.extendedHover.enable = true; ocamllsp.settings.duneDiagnostics.enable = false;