diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
index b543c813..4d133ecd 100644
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -21,7 +21,6 @@ jobs:
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,13 +41,13 @@ jobs:
         with:
           name: "${{ matrix.package }}"
           path: result/share/doc/nvf
+
   flake-docs-linkcheck:
     name: Validate hyperlinks in documentation sources
     runs-on: ubuntu-latest
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8101b8b1..7a7677eb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,7 +19,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Check Flake
         run: nix flake check
@@ -33,6 +32,5 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - run: nix run nixpkgs#alejandra -- -c .
diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index e6d2e662..f8f45d05 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -26,7 +26,6 @@ jobs:
     steps:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index d411c89f..3d8ca360 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -30,7 +30,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Checking EditorConfig
         shell: bash
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index 5b66c8a6..1c8ab746 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -45,7 +45,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: |
           nix build .#docs -Lv
           cp -r result/share/doc/nvf public
diff --git a/configuration.nix b/configuration.nix
index 15138a2b..c7b0f288 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -177,6 +177,7 @@ isMaximal: {
       surround.enable = isMaximal;
       diffview-nvim.enable = true;
       yanky-nvim.enable = false;
+      leetcode-nvim.enable = isMaximal;
       motion = {
         hop.enable = true;
         leap.enable = true;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 5ff8c5f2..621e976f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -143,8 +143,12 @@
 
 [ARCIII](https://github.com/ArmandoCIII):
 
+[leetcode.nvim]: https://github.com/kawre/leetcode.nvim
+
 - Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
   Inspiration from `vim.languages.clang.dap` implementation.
+- Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`.
+
 
 [nezia1](https://github.com/nezia1)
 
@@ -162,3 +166,7 @@
 [Mr-Helpful](https://github.com/Mr-Helpful)
 
 - Corrects pin names used for nvim themes
+
+[Libadoxon](https://github.com/Libadoxon)
+
+- Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
diff --git a/flake.lock b/flake.lock
index 9221f43f..c1cda841 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "blink-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739129359,
-        "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=",
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saghen",
-        "repo": "blink.cmp",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -137,7 +121,6 @@
     },
     "root": {
       "inputs": {
-        "blink-cmp": "blink-cmp",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
diff --git a/flake.nix b/flake.nix
index 1c559bd7..30b71f80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix {inherit lib self;};
+          nvf = import ./flake/modules/home-manager.nix {inherit lib inputs;};
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
@@ -44,7 +44,7 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix {inherit lib self;};
+          nvf = import ./flake/modules/nixos.nix {inherit lib inputs;};
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''
@@ -98,10 +98,5 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-
-    blink-cmp = {
-      url = "github:saghen/blink.cmp";
-      flake = false;
-    };
   };
 }
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index d5b5aacd..33aee0e3 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  self,
+  ...
+}: {
   perSystem = {
     system,
     inputs',
@@ -9,14 +13,21 @@
       overlays = [
         inputs.self.overlays.default
 
-        (final: _: {
+        (final: prev: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
-          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
-            src = inputs.blink-cmp;
-            version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty";
-          };
+          blink-cmp = let
+            pin = self.pins.blink-cmp;
+          in
+            final.callPackage ./legacyPackages/blink-cmp.nix {
+              inherit (pin) version;
+              src = prev.fetchFromGitHub {
+                inherit (pin.repository) owner repo;
+                rev = pin.revision;
+                sha256 = pin.hash;
+              };
+            };
         })
       ];
     };
diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 002269b9..924cb4cc 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -10,16 +10,16 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
-    env = {
-      # TODO: remove this if plugin stops using nightly rust
-      RUSTC_BOOTSTRAP = true;
-    };
+    # TODO: remove this if plugin stops using nightly rust
+    env.RUSTC_BOOTSTRAP = true;
+
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";
       allowBuiltinFetchGit = true;
     };
   };
+
   libExt =
     if hostPlatform.isDarwin
     then "dylib"
diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index 715f7537..f305558b 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -1,13 +1,13 @@
 # Home Manager module
 {
-  self,
+  inputs,
   lib,
 }: {
   config,
   pkgs,
   ...
 }: let
-  inherit (self) packages inputs;
+  inherit (inputs.self) packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index ecc173a1..8f95a12a 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -1,13 +1,13 @@
 # NixOS module
 {
-  self,
+  inputs,
   lib,
 }: {
   config,
   pkgs,
   ...
 }: let
-  inherit (self) inputs packages;
+  inherit (inputs.self) packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;
diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index 3caa221f..95a36acf 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -30,17 +30,19 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = [
-        "chatgpt"
-      ];
+      startPlugins = ["chatgpt-nvim"];
+
       pluginRC.chagpt = entryAnywhere ''
         require("chatgpt").setup(${toLuaObject cfg.setupOpts})
       '';
-      maps.normal = mkMerge [
-        (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
-        maps
-      ];
-      maps.visual = maps;
+
+      maps = {
+        visual = maps;
+        normal = mkMerge [
+          (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
+          maps
+        ];
+      };
     };
   };
 }
diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix
index 525cbcf7..6ed92217 100644
--- a/modules/plugins/git/default.nix
+++ b/modules/plugins/git/default.nix
@@ -4,6 +4,7 @@ in {
   imports = [
     ./gitsigns
     ./vim-fugitive
+    ./git-conflict
   ];
 
   options.vim.git = {
@@ -13,6 +14,7 @@ in {
       Enabling this option will enable the following plugins:
       * gitsigns
       * vim-fugitive
+      * git-conflict
     '';
   };
 }
diff --git a/modules/plugins/git/git-conflict/config.nix b/modules/plugins/git/git-conflict/config.nix
new file mode 100644
index 00000000..bc9905d6
--- /dev/null
+++ b/modules/plugins/git/git-conflict/config.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.git.git-conflict;
+
+  self = import ./git-conflict.nix {inherit lib config;};
+  gcMappingDefinitions = self.options.vim.git.git-conflict.mappings;
+
+  gcMappings = addDescriptionsToMappings cfg.mappings gcMappingDefinitions;
+in {
+  config = mkIf cfg.enable (mkMerge [
+    {
+      vim = {
+        startPlugins = ["git-conflict-nvim"];
+
+        maps = {
+          normal = mkMerge [
+            (mkSetBinding gcMappings.ours "<Plug>(git-conflict-ours)")
+            (mkSetBinding gcMappings.theirs "<Plug>(git-conflict-theirs)")
+            (mkSetBinding gcMappings.both "<Plug>(git-conflict-both)")
+            (mkSetBinding gcMappings.none "<Plug>(git-conflict-none)")
+            (mkSetBinding gcMappings.prevConflict "<Plug>(git-conflict-prev-conflict)")
+            (mkSetBinding gcMappings.nextConflict "<Plug>(git-conflict-next-conflict)")
+          ];
+        };
+
+        pluginRC.git-conflict = entryAnywhere ''
+          require('git-conflict').setup(${toLuaObject ({default_mappings = false;} // cfg.setupOpts)})
+        '';
+      };
+    }
+  ]);
+}
diff --git a/modules/plugins/git/git-conflict/default.nix b/modules/plugins/git/git-conflict/default.nix
new file mode 100644
index 00000000..89093a72
--- /dev/null
+++ b/modules/plugins/git/git-conflict/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+    ./git-conflict.nix
+  ];
+}
diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix
new file mode 100644
index 00000000..bffb926c
--- /dev/null
+++ b/modules/plugins/git/git-conflict/git-conflict.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.git.git-conflict = {
+    enable = mkEnableOption "git-conflict" // {default = config.vim.git.enable;};
+    setupOpts = mkPluginSetupOption "git-conflict" {};
+
+    mappings = {
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
+      nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
+    };
+  };
+}
diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix
index 5011c5cc..af7f36e0 100644
--- a/modules/plugins/languages/csharp.nix
+++ b/modules/plugins/languages/csharp.nix
@@ -75,8 +75,8 @@
   };
 
   extraServerPlugins = {
-    omnisharp = ["omnisharp-extended"];
-    csharp_ls = ["csharpls-extended"];
+    omnisharp = ["omnisharp-extended-lsp-nvim"];
+    csharp_ls = ["csharpls-extended-lsp-nvim"];
   };
 
   cfg = config.vim.languages.csharp;
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index e2b3182e..4f8a7028 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -137,7 +137,7 @@ in {
       vim.startPlugins =
         if ftcfg.enableNoResolvePatch
         then ["flutter-tools-patched"]
-        else ["flutter-tools"];
+        else ["flutter-tools-nvim"];
 
       vim.pluginRC.flutter-tools = entryAnywhere ''
         require('flutter-tools').setup {
diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index 145746a7..f8f338b1 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -112,7 +112,7 @@ in {
     })
 
     (mkIf cfg.elixir-tools.enable {
-      vim.startPlugins = ["elixir-tools"];
+      vim.startPlugins = ["elixir-tools-nvim"];
       vim.pluginRC.elixir-tools = entryAnywhere ''
         local elixir = require("elixir")
         local elixirls = require("elixir.elixirls")
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 50e6d91c..c9070554 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -230,7 +230,7 @@ in {
 
     # Extensions
     (mkIf cfg.extensions."ts-error-translator".enable {
-      vim.startPlugins = ["ts-error-translator"];
+      vim.startPlugins = ["ts-error-translator-nvim"];
       vim.pluginRC.ts-error-translator = entryAnywhere ''
         require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts})
       '';
diff --git a/modules/plugins/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix
index 66050877..3af6b7f1 100644
--- a/modules/plugins/lsp/lspsaga/config.nix
+++ b/modules/plugins/lsp/lspsaga/config.nix
@@ -16,7 +16,7 @@
 in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim = {
-      startPlugins = ["lspsaga"];
+      startPlugins = ["lspsaga-nvim"];
 
       maps = {
         visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action";
diff --git a/modules/plugins/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix
index 36e08088..3f1b7eaf 100644
--- a/modules/plugins/notes/orgmode/config.nix
+++ b/modules/plugins/notes/orgmode/config.nix
@@ -13,9 +13,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       vim = {
-        startPlugins = [
-          "orgmode-nvim"
-        ];
+        startPlugins = ["orgmode"];
 
         binds.whichKey.register = pushDownDefault {
           "<leader>o" = "+Notes";
diff --git a/modules/plugins/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix
index 5d345c71..3585b715 100644
--- a/modules/plugins/session/nvim-session-manager/config.nix
+++ b/modules/plugins/session/nvim-session-manager/config.nix
@@ -15,7 +15,7 @@ in {
     vim = {
       startPlugins =
         [
-          "nvim-session-manager"
+          "neovim-session-manager"
           "plenary-nvim"
         ]
         ++ optionals cfg.usePicker ["dressing-nvim"];
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 65ef8680..372a4f53 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -15,5 +15,6 @@
     ./telescope
     ./wakatime
     ./yanky-nvim
+    ./leetcode-nvim
   ];
 }
diff --git a/modules/plugins/utility/leetcode-nvim/config.nix b/modules/plugins/utility/leetcode-nvim/config.nix
new file mode 100644
index 00000000..be002727
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/config.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.utility.leetcode-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = [
+        "leetcode-nvim"
+        "plenary-nvim"
+        "fzf-lua"
+        "nui-nvim"
+      ];
+
+      lazy.plugins.leetcode-nvim = {
+        package = "leetcode-nvim";
+        setupModule = "leetcode";
+        inherit (cfg) setupOpts;
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/leetcode-nvim/default.nix b/modules/plugins/utility/leetcode-nvim/default.nix
new file mode 100644
index 00000000..4dffd9f8
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./leetcode-nvim.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
new file mode 100644
index 00000000..f71da02a
--- /dev/null
+++ b/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
@@ -0,0 +1,74 @@
+{lib, ...}: let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) enum str bool;
+  inherit (lib.generators) mkLuaInline;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
+in {
+  options.vim.utility = {
+    leetcode-nvim = {
+      enable = mkEnableOption "complementary neovim plugin for leetcode.nvim";
+
+      setupOpts = mkPluginSetupOption "leetcode-nvim" {
+        logging = mkEnableOption "logging for leetcode.nvim status notifications." // {default = true;};
+        image_support = mkEnableOption "question description images using image.nvim (image-nvim must be enabled).";
+
+        lang = mkOption {
+          type = enum [
+            "cpp"
+            "java"
+            "python"
+            "python3"
+            "c"
+            "csharp"
+            "javascript"
+            "typescript"
+            "php"
+            "swift"
+            "kotlin"
+            "dart"
+            "golang"
+            "ruby"
+            "scala"
+            "rust"
+            "racket"
+            "erlang"
+            "elixir"
+            "bash"
+          ];
+          default = "python3";
+          description = "Language to start your session with";
+        };
+
+        arg = mkOption {
+          type = str;
+          default = "leetcode.nvim";
+          description = "Argument for Neovim";
+        };
+
+        cn = {
+          enabled = mkEnableOption "leetcode.cn instead of leetcode.com";
+          translator = mkEnableOption "translator" // {default = true;};
+          translate_problems = mkEnableOption "translation for problem questions" // {default = true;};
+        };
+
+        storage = {
+          home = mkOption {
+            type = luaInline;
+            default = mkLuaInline "vim.fn.stdpath(\"data\") .. \"/leetcode\"";
+            description = "Home storage directory";
+          };
+
+          cache = mkOption {
+            type = luaInline;
+            default = mkLuaInline "vim.fn.stdpath(\"cache\") .. \"/leetcode\"";
+            description = "Cache storage directory";
+          };
+        };
+
+        plugins = {
+          non_standalone = mkEnableOption "leetcode.nvim in a non-standalone mode";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/plugins/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix
index d74966af..96ff5efb 100644
--- a/modules/plugins/utility/surround/surround.nix
+++ b/modules/plugins/utility/surround/surround.nix
@@ -38,7 +38,7 @@ in {
       default = false;
       description = ''
         nvim-surround: add/change/delete surrounding delimiter pairs with ease.
-        Note that the default mappings deviate from upstreeam to avoid conflicts
+        Note that the default mappings deviate from upstream to avoid conflicts
         with nvim-leap.
       '';
     };
diff --git a/modules/plugins/visuals/cellular-automaton/config.nix b/modules/plugins/visuals/cellular-automaton/config.nix
index 2c0c4669..10c305b3 100644
--- a/modules/plugins/visuals/cellular-automaton/config.nix
+++ b/modules/plugins/visuals/cellular-automaton/config.nix
@@ -13,7 +13,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["cellular-automaton"];
+      startPlugins = ["cellular-automaton-nvim"];
 
       maps.normal = mkBinding cfg.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain";
 
diff --git a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
index a7fd3752..5b2102ce 100644
--- a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
+++ b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"];
+      startPlugins = ["tiny-devicons-auto-colors-nvim" "nvim-web-devicons"];
 
       pluginRC.tiny-devicons-auto-colors = entryAnywhere ''
         require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts})
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 64734f3b..1f14b3a6 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -59,7 +59,7 @@
         "flutter-tools.dev_tools"
       ];
     };
-    inherit (pkgs) blink-cmp;
+    inherit (inputs.self.legacyPackages.${pkgs.stdenv.system}) blink-cmp;
   };
 
   buildConfigPlugins = plugins:
diff --git a/npins/sources.json b/npins/sources.json
index 929da85c..8472bb77 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -36,6 +36,21 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
       "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
     },
+    "blink-cmp": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "saghen",
+        "repo": "blink.cmp"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v0.11.0",
+      "revision": "7a70199efe4e333a3693ba3e56ddbec3b9c9c330",
+      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.11.0",
+      "hash": "1j3sj03i72iw5npwwksc7w7axv8z0nbgi11adkfng9ak73kn1gdq"
+    },
     "blink-compat": {
       "type": "Git",
       "repository": {
@@ -216,6 +231,18 @@
       "url": "https://github.com/numToStr/Comment.nvim/archive/e30b7f2008e52442154b66f7c519bfd2f1e32acb.tar.gz",
       "hash": "0dyz78j0kj3j99y5g8wncl7794g6z2qs05gfg9ddxaa4xswhyjc7"
     },
+    "conform-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "stevearc",
+        "repo": "conform.nvim"
+      },
+      "branch": "master",
+      "revision": "363243c03102a531a8203311d4f2ae704c620d9b",
+      "url": "https://github.com/stevearc/conform.nvim/archive/363243c03102a531a8203311d4f2ae704c620d9b.tar.gz",
+      "hash": "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"
+    },
     "copilot-cmp": {
       "type": "Git",
       "repository": {
@@ -396,6 +423,18 @@
       "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
       "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
     },
+    "git-conflict-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "akinsho",
+        "repo": "git-conflict.nvim"
+      },
+      "branch": "main",
+      "revision": "a1badcd070d176172940eb55d9d59029dad1c5a6",
+      "url": "https://github.com/akinsho/git-conflict.nvim/archive/a1badcd070d176172940eb55d9d59029dad1c5a6.tar.gz",
+      "hash": "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a"
+    },
     "gitsigns-nvim": {
       "type": "Git",
       "repository": {
@@ -528,6 +567,18 @@
       "url": "https://github.com/ggandor/leap.nvim/archive/c6bfb191f1161fbabace1f36f578a20ac6c7642c.tar.gz",
       "hash": "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"
     },
+    "leetcode-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "kawre",
+        "repo": "leetcode.nvim"
+      },
+      "branch": "master",
+      "revision": "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951",
+      "url": "https://github.com/kawre/leetcode.nvim/archive/db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951.tar.gz",
+      "hash": "1d3lb7625b2qdzqm74mzrac66rxqc0qgjd3mb37l4v8wqyiyv6pp"
+    },
     "lsp-lines": {
       "type": "Git",
       "repository": {
@@ -1215,13 +1266,13 @@
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "otavioschwanck",
+        "owner": "isaacST08",
         "repo": "new-file-template.nvim"
       },
-      "branch": "main",
-      "revision": "6ac66669dbf2dc5cdee184a4fe76d22465ca67e8",
-      "url": "https://github.com/otavioschwanck/new-file-template.nvim/archive/6ac66669dbf2dc5cdee184a4fe76d22465ca67e8.tar.gz",
-      "hash": "0c7378c3w6bniclp666rq15c28akb0sjy58ayva0wpyin4k26hl3"
+      "branch": "master",
+      "revision": "dc3a58b1f490c86075c96670b9eb81370c2f2ca1",
+      "url": "https://github.com/isaacST08/new-file-template.nvim/archive/dc3a58b1f490c86075c96670b9eb81370c2f2ca1.tar.gz",
+      "hash": "0y6ip3k6bjaf32x1y1p6mmkwwdi71yvwr6klr26m252jrg8352pf"
     },
     "noice-nvim": {
       "type": "Git",
@@ -1391,6 +1442,18 @@
       "url": "https://github.com/kosayoda/nvim-lightbulb/archive/3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea.tar.gz",
       "hash": "0qc1rl45ykh9552dx5fmhdg0ncfsk2vpcmj5i7hrmdzgkd2f0avg"
     },
+    "nvim-lint": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint"
+      },
+      "branch": "master",
+      "revision": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
+      "url": "https://github.com/mfussenegger/nvim-lint/archive/6e9dd545a1af204c4022a8fcd99727ea41ffdcc8.tar.gz",
+      "hash": "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"
+    },
     "nvim-lspconfig": {
       "type": "Git",
       "repository": {