diff --git a/modules/programs/nixvim/_nixvim-config/plugins/default.nix b/modules/programs/nixvim/_nixvim-config/plugins/default.nix
index 3e350cb..e608a7b 100644
--- a/modules/programs/nixvim/_nixvim-config/plugins/default.nix
+++ b/modules/programs/nixvim/_nixvim-config/plugins/default.nix
@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./lsp.nix
+    ./formatter.nix
     ./telescope
     ./cmp
   ];
diff --git a/modules/programs/nixvim/_nixvim-config/plugins/formatter.nix b/modules/programs/nixvim/_nixvim-config/plugins/formatter.nix
new file mode 100644
index 0000000..851a0a0
--- /dev/null
+++ b/modules/programs/nixvim/_nixvim-config/plugins/formatter.nix
@@ -0,0 +1,15 @@
+{
+  plugins.conform-nvim = {
+    enable = true;
+    autoInstall.enable = true;
+    settings = {
+      formatters_by_ft = {
+        cpp = [ "clang_format" ];
+        markdown = [
+          "prettier"
+        ];
+      };
+      formatters = { };
+    };
+  };
+}
diff --git a/modules/programs/nixvim/_nixvim-config/plugins/lsp.nix b/modules/programs/nixvim/_nixvim-config/plugins/lsp.nix
index 142b838..7d84517 100644
--- a/modules/programs/nixvim/_nixvim-config/plugins/lsp.nix
+++ b/modules/programs/nixvim/_nixvim-config/plugins/lsp.nix
@@ -20,6 +20,8 @@
         enable = true;
       };
       rnix.enable = true;
+
+      basedpyright.enable = true;
     };
 
     keymaps = [