feat: Various improvements

Author: dotunwrap

config/keymaps.nix

@@ -6,5 +6,6 @@ in
   keymaps = [
     (mkKeymap "v" "<Tab>" ">gv" "Indent selection right")
     (mkKeymap "v" "<S-Tab>" "<gv" "Indent selection left")
+    # (mkKeymap "n" "<ESC>" "<CMD>noh<CR><ESC>" "Clear highlight")
   ];
 }

config/langs/astro.nix

@@ -1,6 +1,19 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.astro.enable = true;
   plugins = {
-    lsp.servers.astro.enable = true;
     treesitter.settings.ensure_installed = [ "astro" ];
+    conform-nvim.settings = {
+      formatters_by_ft.astro = {
+        __unkeyed-1 = "prettierd";
+        __unkeyed-2 = "prettier";
+        timeout_ms = 2000;
+        stop_after_first = true;
+      };
+      formatters = {
+        prettierd.command = lib.getExe pkgs.prettierd;
+        prettier.command = lib.getExe pkgs.prettier;
+      };
+    };
   };
 }

config/langs/bash.nix

@@ -1,6 +1,20 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.bashls.enable = true;
+
   plugins = {
-    lsp.servers.bashls.enable = true;
     treesitter.settings.ensure_installed = [ "bash" ];
+    conform-nvim.settings = {
+      formatters_by_ft.bash = [
+        "shellcheck"
+        "shellharden"
+        "shfmt"
+      ];
+      formatters = {
+        shellcheck.command = lib.getExe pkgs.shellcheck;
+        shellharden.command = lib.getExe pkgs.shellharden;
+        shfmt.command = lib.getExe pkgs.shfmt;
+      };
+    };
   };
 }

config/langs/cpp.nix

@@ -1,7 +1,7 @@
 {
-  plugins = {
-    lsp.servers.clangd = {
-      enable = true;
+  lsp.servers.clangd = {
+    enable = true;
+    config = {
       cmd = [
         "clangd"
         "--background-index"
@@ -11,6 +11,12 @@
         "cpp"
       ];
     };
-    treesitter.settings.ensure_installed = [ "c" "cpp" ];
+  };
+  plugins = {
+    treesitter.settings.ensure_installed = [
+      "c"
+      "cpp"
+    ];
+    conform-nvim.settings.formatters_by_ft.cpp = [ "clang_format" ];
   };
 }

config/langs/css.nix

@@ -1,6 +1,19 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.cssls.enable = true;
   plugins = {
-    lsp.servers.cssls.enable = true;
     treesitter.settings.ensure_installed = [ "css" ];
+    conform-nvim.settings = {
+      formatters_by_ft.css = {
+        __unkeyed-1 = "prettierd";
+        __unkeyed-2 = "prettier";
+        timeout_ms = 2000;
+        stop_after_first = true;
+      };
+      formatters = {
+        prettierd.command = lib.getExe pkgs.prettierd;
+        prettier.command = lib.getExe pkgs.prettier;
+      };
+    };
   };
 }

config/langs/default.nix

@@ -6,4 +6,42 @@
     map (fn: ./${fn}) (
       filter (fn: (fn != "default.nix" && hasSuffix ".nix" "${fn}")) (attrNames (readDir ./.))
     );
+
+  lsp = {
+    inlayHints.enable = true;
+    keymaps = [
+      {
+        key = "gd";
+        lspBufAction = "definition";
+      }
+      {
+        key = "gD";
+        lspBufAction = "declaration";
+      }
+      {
+        key = "gr";
+        lspBufAction = "references";
+      }
+      {
+        key = "gt";
+        lspBufAction = "type_definition";
+      }
+      {
+        key = "gi";
+        lspBufAction = "implementation";
+      }
+      {
+        key = "K";
+        lspBufAction = "hover";
+      }
+      {
+        action = lib.nixvim.mkRaw "require('telescope.builtin').lsp_definitions";
+        key = "gd";
+      }
+      {
+        action = "<CMD>Lspsaga hover_doc<Enter>";
+        key = "K";
+      }
+    ];
+  };
 }

config/langs/go.nix

@@ -1,6 +1,7 @@
 {
+  lsp.servers.gopls.enable = true;
   plugins = {
-    lsp.servers.gopls.enable = true;
     treesitter.settings.ensure_installed = [ "go" ];
+    conform-nvim.settings.formatters_by_ft.go = [ "gofmt" ];
   };
 }

config/langs/html.nix

@@ -1,6 +1,19 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.html.enable = true;
   plugins = {
-    lsp.servers.html.enable = true;
     treesitter.settings.ensure_installed = [ "html" ];
+    conform-nvim.settings = {
+      formatters_by_ft.html = {
+        __unkeyed-1 = "prettierd";
+        __unkeyed-2 = "prettier";
+        timeout_ms = 2000;
+        stop_after_first = true;
+      };
+      formatters = {
+        prettierd.command = lib.getExe pkgs.prettierd;
+        prettier.command = lib.getExe pkgs.prettier;
+      };
+    };
   };
 }

config/langs/json.nix

@@ -1,9 +1,22 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.jsonls.enable = true;
   plugins = {
-    lsp.servers.jsonls.enable = true;
     treesitter.settings.ensure_installed = [
       "json"
       "jsonc"
     ];
+    conform-nvim.settings = {
+      formatters_by_ft.json = {
+        __unkeyed-1 = "prettierd";
+        __unkeyed-2 = "prettier";
+        timeout_ms = 2000;
+        stop_after_first = true;
+      };
+      formatters = {
+        prettierd.command = lib.getExe pkgs.prettierd;
+        prettier.command = lib.getExe pkgs.prettier;
+      };
+    };
   };
 }

config/langs/just.nix

@@ -1,6 +1,18 @@
+{ lib, pkgs, ... }:
 {
+  lsp.servers.just.enable = true;
   plugins = {
-    lsp.servers.just.enable = true;
     treesitter.settings.ensure_installed = [ "just" ];
+    conform-nvim.settings = {
+      formatters_by_ft.just = [ "just" ];
+      formatters.just = {
+        command = lib.getExe pkgs.just;
+        args = [
+          "--fmt"
+          "--stdin"
+        ];
+        stdin = true;
+      };
+    };
   };
 }