diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix
index 8124a29..5f7cf53 100644
--- a/modules/home-manager/programs/neovim/default.nix
+++ b/modules/home-manager/programs/neovim/default.nix
@@ -59,6 +59,10 @@ in
         clang-tools
         gcc # Needed for treesitter
 
+        # C#
+        csharp-ls
+        csharpier
+
         # HTML/CSS/JSON
         emmet-ls
         vscode-langservers-extracted
diff --git a/modules/home-manager/programs/neovim/lsp.nix b/modules/home-manager/programs/neovim/lsp.nix
index e927ad7..3156bb1 100644
--- a/modules/home-manager/programs/neovim/lsp.nix
+++ b/modules/home-manager/programs/neovim/lsp.nix
@@ -59,6 +59,7 @@ in
         "basedpyright",
         "clangd",
         "cmake",
+        "csharp_ls",
         "cssls",
         "eslint",
         "html",
diff --git a/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua b/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua
index 54a1e5c..3f13da4 100644
--- a/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua
+++ b/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua
@@ -16,10 +16,11 @@ return {
     config.sources = {
       -- Set a formatter
       require("none-ls.diagnostics.flake8"),
+      require("none-ls.formatting.ruff"),
       null_ls.builtins.formatting.clang_format,
+      null_ls.builtins.formatting.csharpier,
       null_ls.builtins.formatting.nixfmt,
       null_ls.builtins.formatting.prettier,
-      require("none-ls.formatting.ruff"),
       null_ls.builtins.formatting.stylua,
     }
     return config -- return final config table
diff --git a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua
index 0244de8..ccc1240 100644
--- a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua
+++ b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua
@@ -8,6 +8,7 @@ return {
     opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
       -- Programming
       "c",
+      "c_sharp",
       "cmake",
       "cpp",
       "css",