From 31b3681b9bda267d540552ef12c7bcf279f95569 Mon Sep 17 00:00:00 2001 From: notohh Date: Wed, 17 Jul 2024 23:52:55 -0400 Subject: [PATCH] helix: update flake & enable inline diagnostics --- flake.lock | 57 +++++++++++------------ flake.nix | 2 +- home/programs/editors/helix/default.nix | 4 ++ home/programs/editors/helix/languages.nix | 4 -- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index ea0d9df..2cc68b9 100644 --- a/flake.lock +++ b/flake.lock @@ -185,11 +185,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1719958572, - "narHash": "sha256-ZyH7OU3y/m8TBqvNMIYPQzG8AFQcFvxDaSTdXdgaLAE=", + "lastModified": 1721266719, + "narHash": "sha256-pGJWjuCmJ7jo7N8WKkJssC+5P2dB9EyEDkhQ7s9E2Vo=", "ref": "refs/heads/master", - "rev": "f712b59df10e7e6340134276df39a4e1ed31ab31", - "revCount": 33, + "rev": "c3f297deaa6d31d38b06f249c81da07ce141a1df", + "revCount": 35, "type": "git", "url": "https://git.flake.sh/notohh/botoh" }, @@ -310,11 +310,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1717223092, - "narHash": "sha256-ih8NPk3Jn5EAILOGQZ+KS5NLmu6QmwohJX+36MaTAQE=", + "lastModified": 1719815435, + "narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=", "owner": "nix-community", "repo": "fenix", - "rev": "9a025daf6799e3af80b677f0af57ef76432c3fcf", + "rev": "ebfe2c639111d7e82972a12711206afaeeda2450", "type": "github" }, "original": { @@ -716,16 +716,15 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1712452625, - "narHash": "sha256-30VCYDyEk2onSvf8BaXyI9IlgDNaUB6nbrmUZwbYuP0=", - "owner": "SoraTenshi", + "lastModified": 1721268519, + "narHash": "sha256-9DTQZDUKdoUNohsOLT/sN9dp5WNvqWlpwn+ME84J/3A=", + "owner": "helix-editor", "repo": "helix", - "rev": "fca5a8c846ff225ecdd50d20ab5a5cd2739aa66c", + "rev": "b927985cd0f8b68f9a7f177353e96d8aaabf1b06", "type": "github" }, "original": { - "owner": "SoraTenshi", - "ref": "new-daily-driver", + "owner": "helix-editor", "repo": "helix", "type": "github" } @@ -1321,16 +1320,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1593,11 +1592,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -1609,11 +1608,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1719379843, - "narHash": "sha256-u+D+IOAMMl70+CJ9NKB+RMrASjInuIWMHzjLWQjPZ6c=", + "lastModified": 1721116560, + "narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3f3c1b13fb08f3828442ee86630362e81136bbc", + "rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93", "type": "github" }, "original": { @@ -1710,11 +1709,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1793,11 +1792,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1717169693, - "narHash": "sha256-qBruki5NHrSqIw5ulxtwFmVsb6W/aOKOMjsCJjfalA4=", + "lastModified": 1719760370, + "narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d6d735e6f20ef78b16a79886fe28bd69cf059504", + "rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 408f290..aa937e1 100755 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ attic.url = "github:zhaofengli/attic"; nur.url = "github:nix-community/NUR"; yazi.url = "github:sxyazi/yazi"; - helix.url = "github:SoraTenshi/helix/new-daily-driver"; + helix.url = "github:helix-editor/helix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; atuin.url = "github:atuinsh/atuin"; diff --git a/home/programs/editors/helix/default.nix b/home/programs/editors/helix/default.nix index ebab682..c39fa94 100644 --- a/home/programs/editors/helix/default.nix +++ b/home/programs/editors/helix/default.nix @@ -31,6 +31,10 @@ _: { select = "SEL"; }; }; + inline-diagnostics = { + cursor-line = "hint"; + other-lines = "error"; + }; cursor-shape = { insert = "bar"; normal = "block"; diff --git a/home/programs/editors/helix/languages.nix b/home/programs/editors/helix/languages.nix index ec18951..3515591 100644 --- a/home/programs/editors/helix/languages.nix +++ b/home/programs/editors/helix/languages.nix @@ -94,10 +94,6 @@ nil = { command = lib.getExe nil; }; - vscode-css-language-server = with pkgs.nodePackages; { - command = lib.getExe vscode-css-languageserver-bin; - args = ["--stdio"]; - }; typescript-language-server = with pkgs.nodePackages; { command = lib.getExe typescript-language-server; args = ["--stdio"];