diff --git a/README.md b/README.md
index 0bc3b13..7cc7e40 100644
--- a/README.md
+++ b/README.md
@@ -57,38 +57,24 @@ You can use Frostvim as a base configuration and extend it with your own plugins
   };
 
   outputs = { nixpkgs, nixvim, frostvim, ... }: {
-    # Import the default module and extend it
-    nixvimConfigurations.default = nixvim.lib.${system}.makeNixvimWithModule {
-      inherit (frostvim.nixvimModules) default;
-      # Override defaults or add custom plugins
-      blink.enable = true;
-      # Add a new plugin
-      plugins = {
-        todo-comments = {
-          enable = true;
-          settings = {
-            signs = true;
-            sign_priority = 8;
-            keywords = {
-              FIX = {
-                icon = " ";
-                color = "error";
-                alt = [ "FIXME" "BUG" "FIXIT" "ISSUE" ];
-              };
-              TODO = { icon = " "; color = "info"; };
-              HACK = { icon = " "; color = "warning"; };
-              WARN = { icon = " "; color = "warning"; alt = [ "WARNING" "XXX" ]; };
-              PERF = { icon = " "; alt = [ "OPTIM" "PERFORMANCE" "OPTIMIZE" ]; };
-              NOTE = { icon = " "; color = "hint"; alt = [ "INFO" ]; };
-              TEST = { icon = "⏲ "; color = "test"; alt = [ "TESTING" "PASSED" "FAILED" ]; };
-            };
-          };
-        };
-      };
-     };
    };
  }
  ```
+then in your `home.nix`:
+```nix
+imports = [
+    inputs.nixvim.homeModules.nixvim
+];
+programs.nixvim = {
+    enable = true;
+    _module.args.inputs = inputs;
+    imports = [inputs.frostvim.nixvimModules.default];
+    plugins = {
+        flash.enable = true;
+        # other plugins configs/settings
+    };
+};
+```
 
 ### Updating Keymaps
 
diff --git a/config/default.nix b/config/default.nix
index 795344f..a3858eb 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -5,7 +5,8 @@
   inputs,
   config,
   ...
-}: {
+}:
+{
   imports = [
     ./keymaps.nix
     ./plugins/blink
@@ -51,10 +52,7 @@
     opencode.enable = lib.mkDefault true;
     snacks.enable = lib.mkDefault true;
     lzn.enable = lib.mkDefault true;
-    presence.enable =
-      if !pkgs.stdenv.isDarwin
-      then lib.mkDefault true
-      else lib.mkDefault false;
+    presence.enable = if !pkgs.stdenv.isDarwin then lib.mkDefault true else lib.mkDefault false;
     sitter.enable = lib.mkDefault true;
     telekasten.enable = lib.mkDefault true;
     trouble.enable = lib.mkDefault true;
@@ -66,8 +64,8 @@
       src = pkgs.fetchFromGitHub {
         owner = "neovim";
         repo = "neovim";
-        rev = "caa9419355456e85f27006291abc6643d83f01a7";
-        hash = "sha256-dKkPsMAcfrQhJN7oSAYJpa61gQweF4uaSHpIq+uGJmQ=";
+        rev = "03d6cf7aae4a72c7221a4fb8ebb14a7c8603ba18";
+        hash = "sha256-RkQKSCqEsTxPc1i7RsDDbOCJObVdq7R9YJ94UrI1k8w=";
       };
     };
     luaLoader.enable = false;
diff --git a/config/plugins/cmp/default.nix b/config/plugins/cmp/default.nix
index b427e0a..130fb83 100644
--- a/config/plugins/cmp/default.nix
+++ b/config/plugins/cmp/default.nix
@@ -17,6 +17,7 @@
       luasnip.enable = true;
       cmp-omni.enable = true;
       cmp-dap.enable = true;
+      dap.enable = true;
       dap-go.enable = true;
       dap-ui.enable = true;
       cmp-nvim-lsp.enable = true;
diff --git a/flake.lock b/flake.lock
index 36c3dd2..1da7aa2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1762980239,
-        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762980239,
-        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763421233,
-        "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1763464769,
-        "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=",
+        "lastModified": 1764230294,
+        "narHash": "sha256-Z63xl5Scj3Y/zRBPAWq1eT68n2wBWGCIEF4waZ0bQBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "rev": "0d59e0290eefe0f12512043842d7096c4070f30e",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1763638001,
-        "narHash": "sha256-Y1SPkwcPaUjrqPff49J4f1t7npRUDuYazccUsNF9XSQ=",
+        "lastModified": 1764443358,
+        "narHash": "sha256-bd9I02P/Mp9yYGcSWgLLdI/Zt0JqF8igSTAfUzknVHk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f4b9a7122425c56d65466fcafb99053730b2646a",
+        "rev": "6094d2a4396c0ff4e94b22315cc43f55db626c32",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1763319842,
-        "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
+        "lastModified": 1763988335,
+        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
+        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
         "type": "github"
       },
       "original": {