From 62631072091d97c65af07c1b4026ad9720a67ff6 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sat, 11 Jan 2025 13:00:12 +0100
Subject: [PATCH] helix: switch to nixos package

---
 modules/user/default.nix       |  6 +----
 modules/user/helix/default.nix | 46 +++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/modules/user/default.nix b/modules/user/default.nix
index 7aa8b2e..0ddc39d 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: rec {
+{pkgs, ...}: rec {
   packages = {
     fish = pkgs.callPackage ./shell {};
     helix = pkgs.callPackage ./helix {};
diff --git a/modules/user/helix/default.nix b/modules/user/helix/default.nix
index a34eef5..e0a93b6 100644
--- a/modules/user/helix/default.nix
+++ b/modules/user/helix/default.nix
@@ -2,26 +2,27 @@
   symlinkJoin,
   makeWrapper,
   helix,
-  gdb,
-  black,
-  cmake-format,
-  tinymist,
-  lib,
-  marksman,
-  lldb_19,
-  stdenv,
-  shellcheck,
-  formats,
-  lazygit,
-  deno,
-  shfmt,
-  bash-language-server,
-  clang-tools,
-  cmake-language-server,
-  dprint,
-  nil,
   alejandra,
+  bash-language-server,
+  black,
+  clang-tools,
+  cmake-format,
+  cmake-language-server,
+  deno,
+  dprint,
+  formats,
+  gdb,
+  lazygit,
+  lib,
+  lldb_19,
+  marksman,
+  nil,
   pyright,
+  rust-analyzer,
+  shellcheck,
+  shfmt,
+  stdenv,
+  tinymist,
   typescript-language-server,
   ...
 }: let
@@ -34,8 +35,11 @@
       color-modes = true;
       indent-guides.render = true;
       lsp = {
+        enable = true;
+        auto-signature-help = true;
         display-inlay-hints = true;
         display-messages = true;
+        snippets = true;
       };
       line-number = "relative";
       true-color = true;
@@ -157,6 +161,11 @@
           ];
         };
       }
+      {
+        name = "c";
+        auto-format = true;
+        language-servers = ["clangd"];
+      }
       {
         name = "c";
         debugger = {
@@ -256,6 +265,7 @@
     paths = [
       helix
 
+      rust-analyzer
       # typst lsp
       tinymist