From 9358d0abdceb329001f128103dd2194464cac1a3 Mon Sep 17 00:00:00 2001
From: oluceps <secinia@outlook.com>
Date: Sun, 6 Oct 2024 18:13:36 +0800
Subject: [PATCH] +

+
---
 flake.lock                |  6 +++---
 home/helix/languages.toml |  2 +-
 hosts/default.nix         |  7 +------
 hosts/dev.nix             | 23 +++++++++++++++++++++++
 misc.nix                  |  2 ++
 overlays.nix              |  1 -
 userPkgs.nix              | 25 -------------------------
 7 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9c23a2c33..569ce7b0e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2627,11 +2627,11 @@
         "treefmt-nix": "treefmt-nix_4"
       },
       "locked": {
-        "lastModified": 1724296831,
-        "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=",
+        "lastModified": 1727793617,
+        "narHash": "sha256-vZ+t0jvKZczYBB9ZAj7CQ1sBv9PE66G9/LkB6a+Iogg=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88",
+        "rev": "c38702b17580a31e84c958b5feed3d8c7407f975",
         "type": "github"
       },
       "original": {
diff --git a/home/helix/languages.toml b/home/helix/languages.toml
index 091eb99b4..a5fe46b64 100755
--- a/home/helix/languages.toml
+++ b/home/helix/languages.toml
@@ -7,7 +7,7 @@ roots = []
 scope = "source.typst"
 
 [[language]]
-language-servers = ["nil"]
+language-servers = ["nixd", "nil"]
 name = "nix"
 
 [language.formatter]
diff --git a/hosts/default.nix b/hosts/default.nix
index 22fda1aff..9cb58be22 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -8,12 +8,7 @@ let
   inherit (builtins) readFile fromTOML;
   inherit (self.lib) pipe genAttrs;
   hosts =
-    pipe ./sum.toml [
-      readFile
-      fromTOML
-      (i: i.host)
-      (map (i: i.name))
-    ]
+    (./sum.toml |> readFile |> fromTOML |> (i: i.host) |> (map (i: i.name)))
     ++ [
       "bootstrap"
       "livecd"
diff --git a/hosts/dev.nix b/hosts/dev.nix
index e36fee5da..d535115c8 100644
--- a/hosts/dev.nix
+++ b/hosts/dev.nix
@@ -135,6 +135,29 @@
               nixpkgs-review
               shfmt
             ]
+            [
+              vscode-langservers-extracted
+              bash-language-server
+            ]
+            [
+              rust-analyzer
+              # nil
+              nixd
+              nil
+              shfmt
+              nixfmt-rfc-style
+              # taplo
+              rustfmt
+              clang-tools
+              # haskell-language-server
+              cmake-language-server
+              arduino-language-server
+              typst-lsp
+              vhdl-ls
+              delve
+              python311Packages.python-lsp-server
+              tinymist
+            ]
           ];
           # wine = [
           #   # bottles
diff --git a/misc.nix b/misc.nix
index b1f44a887..def1c9f2d 100755
--- a/misc.nix
+++ b/misc.nix
@@ -39,6 +39,7 @@
 
   nix = {
     package = pkgs.nixVersions.stable;
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     channel.enable = false;
     registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
 
@@ -102,6 +103,7 @@
         "cgroups"
         "recursive-nix"
         "ca-derivations"
+        "pipe-operator"
       ];
       auto-allocate-uids = true;
       use-cgroups = true;
diff --git a/overlays.nix b/overlays.nix
index 4e0692dd7..d47596e88 100755
--- a/overlays.nix
+++ b/overlays.nix
@@ -3,7 +3,6 @@
   (
     final: prev:
     prev.lib.genAttrs [
-      "nil"
       "ragenix"
       "prismlauncher"
       "resign"
diff --git a/userPkgs.nix b/userPkgs.nix
index 164497164..e44acb2dc 100644
--- a/userPkgs.nix
+++ b/userPkgs.nix
@@ -163,31 +163,6 @@ with pkgs;
   julia-bin
   prismlauncher
 ]
-++ (with pkgs; [
-  rust-analyzer
-  # nil
-  nixd
-  nil
-  shfmt
-  nixfmt-rfc-style
-  # taplo
-  rustfmt
-  clang-tools
-  # haskell-language-server
-  cmake-language-server
-  arduino-language-server
-  typst-lsp
-  vhdl-ls
-  delve
-  python311Packages.python-lsp-server
-  tinymist
-])
-++ (with pkgs.nodePackages_latest; [
-  vscode-langservers-extracted
-  bash-language-server
-  vls
-  prettier
-])
 ++ (with pkgs; [ fluent-icon-theme ])
 ++ [
   (writeTextFile {