diff --git a/home/base/desktop/neovim/astronvim_user/init.lua b/home/base/desktop/neovim/astronvim_user/init.lua
index c43b7727..fb0ef01a 100644
--- a/home/base/desktop/neovim/astronvim_user/init.lua
+++ b/home/base/desktop/neovim/astronvim_user/init.lua
@@ -152,12 +152,14 @@ return {
       "gopls",          -- go
       "rust_analyzer",  -- rust
       "pyright",        -- python
+      "ruff_lsp",       -- extremely fast Python linter and code transformation
       "jdtls",          -- java
       "nil_ls",         -- nix language server
       "bufls",          -- protocol buffer language server
+      "zls",            -- zig language server
       ---- Operation & Cloud Native
       "bashls",       -- bash
-      "clojure_lsp",  -- cmake
+      "cmake",        -- cmake language server
       "clangd",       -- c/c++
       "dockerls",     -- dockerfile
       "jsonnet_ls",   -- jsonnet language server
diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix
index b7f3d5ae..8325b1ab 100644
--- a/home/base/desktop/neovim/default.nix
+++ b/home/base/desktop/neovim/default.nix
@@ -28,6 +28,8 @@
 #    Next Buffer(Tab):              `]b`
 #    Previous Buffer(Tab):          `[b`
 #    Close Buffer:	                `<Space> + c`
+#
+#    
 #    ......
 #    See https://astronvim.com/Basic%20Usage/walkthrough
 #
@@ -79,6 +81,7 @@
     packages = with pkgs; [
       #-- c/c++
       cmake
+      cmake-language-server
       gnumake
       gcc # c/c++ compiler, required by nvim-treesitter!
       llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
@@ -94,6 +97,9 @@
       rust-analyzer
       cargo  # rust package manager
       rustfmt
+  
+      #-- zig
+      zls
 
       #-- nix
       nil
@@ -102,7 +108,6 @@
       statix     # Lints and suggestions for the nix programming language
       deadnix    # Find and remove unused code in .nix source files
       alejandra  # Nix Code Formatter
-      # nixpkgs-fmt
 
       #-- golang
       go