Merge pull request #805 from kachick/replace-nil-with-nixd

Refine use of nixd

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 
-[{Makefile,*.mk,*.go,.gitmodules,*.*sh,.*shrc,*shenv,.bash_*}]
+[{Makefile,*.mk,*.go,.gitmodules,*.*sh,.*shrc,*shenv,.bash_*,*.envrc}]
 indent_style = tab
 indent_size = 4
 

.envrc

@@ -1,7 +1,3 @@
 #!/usr/bin/env -S bash
 
 use flake
-
-# To avoid absolute path for Nix and typos-lsp in vscode settings
-TYPOS_LSP_PATH="$(command -v typos-lsp)"
-export TYPOS_LSP_PATH

.github/workflows/ci-nix.yml

@@ -22,7 +22,6 @@ on:
 
 jobs:
   tasks:
-    if: (github.event_name != 'pull_request') || (!github.event.pull_request.draft)
     strategy:
       fail-fast: false
       matrix:

.vscode/settings.json

@@ -16,13 +16,8 @@
   "[lua]": {
     "editor.defaultFormatter": "JohnnyMorganz.stylua"
   },
-  "nix.serverPath": "nil",
+  "nix.serverPath": "nixd",
   "nix.enableLanguageServer": true,
-  "nix.serverSettings": {
-    "nil": {
-      "formatting": { "command": ["nixfmt"] }
-    }
-  },
   "gopls": {
     "build.buildFlags": ["-tags=linux,windows,darwin"]
   },

.zed/settings.json

@@ -18,6 +18,9 @@
           "command": "nixfmt",
           "arguments": ["-"]
         }
+      },
+      "inlay_hints": {
+        "enabled": true
       }
     },
     "Go": {

cmd/lint/main.go

@@ -32,6 +32,7 @@ func main() {
 
 	if *allFlag {
 		cmds = append(cmds, runner.Cmd{Path: "trivy", Args: []string{"config", "--exit-code", "1", "."}})
+		cmds = append(cmds, runner.Cmd{Path: "nix", Args: []string{"run", ".#check_nixf"}})
 	}
 
 	cmds.ParallelRun()

flake.nix

@@ -23,8 +23,7 @@
       nixpkgs,
       edge-nixpkgs,
       home-manager,
-      nixos-wsl,
-      xremap-flake,
+      ...
     }@inputs:
     let
       inherit (self) outputs;
@@ -65,14 +64,16 @@
         in
         {
           default = pkgs.mkShellNoCC {
+            # Realize nixd pkgs version inlay hints for stable channel instead of latest
+            NIX_PATH = "nixpkgs=${pkgs.path}";
+
+            TYPOS_LSP_PATH = pkgs.lib.getExe pkgs.typos-lsp;
+
             buildInputs =
               (with pkgs; [
                 # https://github.com/NixOS/nix/issues/730#issuecomment-162323824
                 bashInteractive
                 nixfmt-rfc-style
-                # TODO: Consider to replace nil with nixd: https://github.com/oxalica/nil/issues/111
-                nil # Used in vscode Nix extension
-                nixd # Used in zed Nix extension
                 nixpkgs-lint-community
                 nix-init
                 nurl
@@ -85,12 +86,12 @@
                 dprint
                 stylua
                 typos
-                typos-lsp
                 go_1_22
                 goreleaser
                 trivy
               ])
               ++ (with edge-pkgs; [
+                nixd
                 # Don't use treefmt(treefmt1) that does not have crucial feature to cover hidden files
                 # https://github.com/numtide/treefmt/pull/250
                 treefmt2
@@ -117,6 +118,7 @@
               "bump_completions"
               "bump_gomod"
               "check_no_dirty_xz_in_nix_store"
+              "check_nixf"
               "bench_shells"
               "walk"
               "ir"

home-manager/common.nix

@@ -43,9 +43,6 @@
     enableNixpkgsReleaseCheck = true;
 
     sessionVariables = {
-      # Do NOT set GIT_EDITOR, it overrides `core.editor` in git config
-      # https://unix.stackexchange.com/questions/4859/visual-vs-editor-what-s-the-difference
-      EDITOR = lib.getExe pkgs.helix;
       PAGER = "less";
 
       # https://github.com/sharkdp/bat/blob/v0.24.0/README.md?plain=1#L201-L219

home-manager/editors.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   # Don't add unfree packages like vscode here for using in containers
@@ -12,14 +12,22 @@
   # TODO: Update since merged https://github.com/nix-community/home-manager/pull/5455
   xdg.configFile."zed/settings.json".source = ../config/zed/settings.json;
 
-  # Should have `root = true` in the file. - https://github.com/kachick/anylang-template/blob/45d7ef685ac4fd3836c3b32b8ce8fb45e909b771/.editorconfig#L1
-  # Intentionally avoided to use https://github.com/nix-community/home-manager/blob/f58889c07efa8e1328fdf93dc1796ec2a5c47f38/modules/misc/editorconfig.nix
-  home.file.".editorconfig".source =
-    pkgs.fetchFromGitHub {
-      owner = "kachick";
-      repo = "anylang-template";
-      rev = "45d7ef685ac4fd3836c3b32b8ce8fb45e909b771";
-      sha256 = "sha256-F8xP4xCIS1ybvRm1xGB2USekGWKKxz0nokpY6gRxKBE=";
-    }
-    + "/.editorconfig";
+  home = {
+    sessionVariables = {
+      # Do NOT set GIT_EDITOR, it overrides `core.editor` in git config
+      # https://unix.stackexchange.com/questions/4859/visual-vs-editor-what-s-the-difference
+      EDITOR = lib.getExe pkgs.helix;
+    };
+
+    # Should have `root = true` in the file. - https://github.com/kachick/anylang-template/blob/45d7ef685ac4fd3836c3b32b8ce8fb45e909b771/.editorconfig#L1
+    # Intentionally avoided to use https://github.com/nix-community/home-manager/blob/f58889c07efa8e1328fdf93dc1796ec2a5c47f38/modules/misc/editorconfig.nix
+    file.".editorconfig".source =
+      pkgs.fetchFromGitHub {
+        owner = "kachick";
+        repo = "anylang-template";
+        rev = "45d7ef685ac4fd3836c3b32b8ce8fb45e909b771";
+        sha256 = "sha256-F8xP4xCIS1ybvRm1xGB2USekGWKKxz0nokpY6gRxKBE=";
+      }
+      + "/.editorconfig";
+  };
 }

home-manager/fish.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   services.gpg-agent.enableFishIntegration = true;

home-manager/git.nix

@@ -2,7 +2,6 @@
   pkgs,
   homemade-pkgs,
   lib,
-  config,
   ...
 }:
 

home-manager/gnome.nix

@@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  edge-pkgs,
-  ...
-}:
+{ lib, pkgs, ... }:
 
 let
   spotify-pwa-file = "chrome-pjibgclleladliembfgfagdaldikeohf-Default.desktop";