build(vscode): better nix lsp config

zakuciael · Oct 24, 2024 · c667bc5 · c667bc5
1 parent 55ae596
commit c667bc5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 96 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,15 +1,20 @@
 {
     "nix.enableLanguageServer": true,
-    "nix.serverPath": "nil",
+    "nix.serverPath": "nixd",
     "nix.serverSettings": {
-        "nil": {
-            "nix": {
-                "flake": {
-                    "autoEvalInputs": false,
-                    "nixpkgsInputName": "nixpkgs",
+        "nixd": {
+            "formatting": {
+                "command": ["alejandra"],
+            },
+            "nixpkgs": {
+                "expr": "import <nixpkgs> { }"
+            },
+            "options": {
+                "nixos": {
+                    "expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.${builtins.replaceStrings [\"\\n\"] [\"\"] (builtins.readFile \"/etc/hostname\")}.options",
                 }
             }
-        }
+        },
     },
     "[nix]": {
         "editor.insertSpaces": true,

diff --git a/configuration.nix b/configuration.nix
@@ -27,6 +27,7 @@ with lib.my; {
       !include ${config.sops.templates."nix/access_tokens.conf".path}
     '';
     package = pkgs.nixFlakes;
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
   };
 
   nixpkgs.config = {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -22,12 +22,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-    alejandra = {
-      url = "github:kamadorueda/alejandra/3.0.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.fenix.follows = "fenix";
-      inputs.flakeCompat.follows = "flake-compat";
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -48,11 +42,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-    nil = {
-      url = "github:oxalica/nil";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
     aagl = {
       url = "github:ezKEa/aagl-gtk-on-nix/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -92,8 +81,6 @@
       flakeInputs
       // {
         distro-grub-themes = flakeInputs.distro-grub-themes.packages.${system};
-        nil = flakeInputs.nil.packages.${system};
-        alejandra = flakeInputs.alejandra.packages.${system};
         rofi-jetbrains = flakeInputs.rofi-jetbrains.packages.${system};
         nostale-dev-env =
           flakeInputs.nostale-dev-env

diff --git a/modules/desktop/apps.nix b/modules/desktop/apps.nix
@@ -27,8 +27,8 @@ in {
       programs.fish.shellAliases.open = "${getBin pkgs.xdg-utils}/bin/xdg-open";
       home.packages = with pkgs; [
         # Nix
-        inputs.nil.default
-        inputs.alejandra.default
+        nixd
+        alejandra
 
         # Browser
         google-chrome