diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 8e3d93e0..fe3e3166 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -235,9 +235,8 @@
 
 [alfarel](https://github.com/alfarelcynthesis):
 
-[conform.nvim]: https://github.com/stevearc/conform.nvim
-
 - Add missing `yazi.nvim` dependency (`snacks.nvim`).
+
 - Add [mkdir.nvim](https://github.com/jghauser/mkdir.nvim) plugin for automatic
   creation of parent directories when editing a nested file.
 - Add [nix-develop.nvim](https://github.com/figsoda/nix-develop.nvim) plugin for
@@ -249,8 +248,6 @@
   [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
   blink.cmp can source snippets from it.
 - Fix [blink.cmp] breaking when built-in sources were modified.
-- Fix [conform.nvim] not allowing disabling formatting on and after save.
-  Use `null` value to disable them if conform is enabled.
 
 [TheColorman](https://github.com/TheColorman):
 
@@ -283,15 +280,3 @@
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
 - Add F# support under `vim.languages.fsharp`.
-
-[venkyr77](https://github.com/venkyr77):
-
-- Add lint (luacheck) and formatting (stylua) support for Lua.
-
-[tebuevd](https://github.com/tebuevd):
-
-- Fix `pickers` configuration for `telescope` by nesting it under `setupOpts`
-- Fix `find_command` configuration for `telescope` by nesting it under
-  `setupOpts.pickers.find_files`
-- Update default `telescope.setupOpts.pickers.find_files.find_command` to only
-  include files (and therefore exclude directories from results)
diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix
index b284270b..cf9c45e2 100644
--- a/modules/plugins/diagnostics/nvim-lint/config.nix
+++ b/modules/plugins/diagnostics/nvim-lint/config.nix
@@ -31,7 +31,7 @@ in {
         '';
       };
     })
-    (mkIf (cfg.enable && cfg.lint_after_save) {
+    (mkIf cfg.lint_after_save {
       vim = {
         augroups = [{name = "nvf_nvim_lint";}];
         autocmds = [
diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
index a7e1e4af..28fd2efe 100644
--- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix
+++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix
@@ -1,9 +1,11 @@
-{lib, ...}: let
-  inherit (lib.generators) mkLuaInline;
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrs either nullOr;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) luaInline mkPluginSetupOption;
+  inherit (lib.types) attrs nullOr;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.formatter.conform-nvim = {
     enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
@@ -27,68 +29,33 @@ in {
         description = "Default values when calling `conform.format()`";
       };
 
-      format_on_save = let
-        defaultFormatOnSaveOpts = {
-          lsp_format = "fallback";
-          timeout_ms = 500;
-        };
-      in
-        mkOption {
-          type = nullOr (either attrs luaInline);
-          default =
-            mkLuaInline
-            # lua
-            ''
-              function()
-                if (not vim.g.formatsave) or (vim.b.disableFormatSave) then
-                  return
-                else
-                  return ${toLuaObject defaultFormatOnSaveOpts}
-                end
-              end
-            '';
-          description = ''
-            Table or function(lualinline) that will be passed to `conform.format()`. If this
-            is set, Conform will run the formatter on save.
+      format_on_save = mkOption {
+        type = nullOr attrs;
+        default =
+          if config.vim.lsp.formatOnSave
+          then {
+            lsp_format = "fallback";
+            timeout_ms = 500;
+          }
+          else null;
+        description = ''
+          Table that will be passed to `conform.format()`. If this
+          is set, Conform will run the formatter on save.
+        '';
+      };
 
-            Note:
-              - When config.vim.lsp.formatOnSave is set to true, internally
-                vim.g.formatsave is set to true.
-              - vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave.
-              - vim.b.disableFormatSave is toggled using the
-                mapping from config.vim.lsp.mappings.toggleFormatOnSave.
-          '';
-        };
-
-      format_after_save = let
-        defaultFormatAfterSaveOpts = {lsp_format = "fallback";};
-      in
-        mkOption {
-          type = nullOr (either attrs luaInline);
-          default =
-            mkLuaInline
-            # lua
-            ''
-              function()
-                if (not vim.g.formatsave) or (vim.b.disableFormatSave) then
-                  return
-                else
-                  return ${toLuaObject defaultFormatAfterSaveOpts}
-                end
-              end
-            '';
-          description = ''
-            Table or function(luainline) that will be passed to `conform.format()`. If this
-            is set, Conform will run the formatter asynchronously after save.
-
-            Note:
-              - When config.vim.lsp.formatOnSave is set to true, internally
-                vim.g.formatsave is set to true.
-              - vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave.
-              - vim.b.disableFormatSave is toggled using the
-                mapping from config.vim.lsp.mappings.toggleFormatOnSave.
-          '';
-        };
+      format_after_save = mkOption {
+        type = nullOr attrs;
+        default =
+          if config.vim.lsp.formatOnSave
+          then {lsp_format = "fallback";}
+          else null;
+        description = ''
+          Table that will be passed to `conform.format()`. If this
+          is set, Conform will run the formatter asynchronously after
+          save.
+        '';
+      };
     };
   };
 }
diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix
index 99927546..9aee73b7 100644
--- a/modules/plugins/git/gitsigns/config.nix
+++ b/modules/plugins/git/gitsigns/config.nix
@@ -5,7 +5,6 @@
 }: let
   inherit (builtins) toJSON;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
@@ -33,7 +32,6 @@ in {
                 return '<Ignore>'
               end
             '')
-
             (mkSetExprBinding gsMappings.previousHunk ''
               function()
                 if vim.wo.diff then return ${toJSON gsMappings.previousHunk.value} end
@@ -79,12 +77,13 @@ in {
     }
 
     (mkIf cfg.codeActions.enable {
-      vim.lsp.null-ls = {
-        enable = true;
-        setupOpts.sources.gitsigns-ca = mkLuaInline ''
-          require("null-ls").builtins.code_actions.gitsigns
-        '';
-      };
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.gitsigns-ca = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.code_actions.gitsigns
+        )
+      '';
     })
   ]);
 }
diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix
index d5be4905..4ad49784 100644
--- a/modules/plugins/languages/lua.nix
+++ b/modules/plugins/languages/lua.nix
@@ -4,30 +4,16 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
-  inherit (lib.types) bool either enum listOf package str;
-  inherit (lib.nvim.types) diagnostics mkGrammarOption;
+  inherit (lib.types) either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryBefore;
 
   cfg = config.vim.languages.lua;
-  defaultFormat = "stylua";
-  formats = {
-    stylua = {
-      package = pkgs.stylua;
-    };
-  };
-
-  defaultDiagnosticsProvider = ["luacheck"];
-  diagnosticsProviders = {
-    luacheck = {
-      package = pkgs.luajitPackages.luacheck;
-    };
-  };
 in {
   imports = [
     (lib.mkRemovedOptionModule ["vim" "languages" "lua" "lsp" "neodev"] ''
@@ -53,34 +39,6 @@ in {
 
       lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers";
     };
-
-    format = {
-      enable = mkOption {
-        type = bool;
-        default = config.vim.languages.enableFormat;
-        description = "Enable Lua formatting";
-      };
-      type = mkOption {
-        type = enum (attrNames formats);
-        default = defaultFormat;
-        description = "Lua formatter to use";
-      };
-
-      package = mkOption {
-        type = package;
-        default = formats.${cfg.format.type}.package;
-        description = "Lua formatter package";
-      };
-    };
-
-    extraDiagnostics = {
-      enable = mkEnableOption "extra Lua diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
-      types = diagnostics {
-        langDesc = "Lua";
-        inherit diagnosticsProviders;
-        inherit defaultDiagnosticsProvider;
-      };
-    };
   };
 
   config = mkMerge [
@@ -116,27 +74,6 @@ in {
           })
         '';
       })
-
-      (mkIf cfg.format.enable {
-        vim.formatter.conform-nvim = {
-          enable = true;
-          setupOpts.formatters_by_ft.lua = [cfg.format.type];
-          setupOpts.formatters.${cfg.format.type} = {
-            command = getExe cfg.format.package;
-          };
-        };
-      })
-
-      (mkIf cfg.extraDiagnostics.enable {
-        vim.diagnostics.nvim-lint = {
-          enable = true;
-          linters_by_ft.lua = cfg.extraDiagnostics.types;
-          linters = mkMerge (map (name: {
-              ${name}.cmd = getExe diagnosticsProviders.${name}.package;
-            })
-            cfg.extraDiagnostics.types);
-        };
-      })
     ]))
   ];
 }
diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix
index 63407138..0fa16e47 100644
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@@ -93,7 +93,11 @@ in {
                 })
             end
           ''
-          else ""
+          else "
+              vim.lsp.buf.format({
+                bufnr = bufnr,
+              })
+        "
         }
               end,
             })
diff --git a/modules/plugins/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix
index eb06870f..549ef0b7 100644
--- a/modules/plugins/lsp/null-ls/config.nix
+++ b/modules/plugins/lsp/null-ls/config.nix
@@ -4,12 +4,13 @@
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAfter;
+  inherit (lib.attrsets) mapAttrs;
+  inherit (lib.trivial) boolToString;
+  inherit (lib.nvim.dag) entryAnywhere entryAfter entryBetween;
 
-  cfg = config.vim.lsp.null-ls;
+  cfg = config.vim.lsp;
 in {
-  config = mkIf cfg.enable (mkMerge [
+  config = mkIf cfg.null-ls.enable (mkMerge [
     {
       vim = {
         startPlugins = [
@@ -17,14 +18,35 @@ in {
           "plenary-nvim"
         ];
 
-        # null-ls implies that LSP is already being set up
-        # as it will hook into LSPs to receive information.
+        # null-ls implies LSP already being set up
+        # since it will hook into LSPs to receive information
         lsp.enable = true;
 
-        pluginRC.null_ls = entryAfter ["lsp-setup"] ''
-          require('null-ls').setup(${toLuaObject cfg.setupOpts})
-        '';
+        pluginRC = {
+          # early setup for null-ls
+          null_ls-setup = entryAnywhere ''
+            local null_ls = require("null-ls")
+            local null_helpers = require("null-ls.helpers")
+            local null_methods = require("null-ls.methods")
+            local ls_sources = {}
+          '';
+
+          # null-ls setup
+          null_ls = entryAfter ["null_ls-setup" "lsp-setup"] ''
+            require('null-ls').setup({
+              debug = ${boolToString cfg.null-ls.debug},
+              diagnostics_format = "${cfg.null-ls.diagnostics_format}",
+              debounce = ${toString cfg.null-ls.debounce},
+              default_timeout = ${toString cfg.null-ls.default_timeout},
+              sources = ls_sources,
+              on_attach = default_on_attach
+            })
+          '';
+        };
       };
     }
+    {
+      vim.pluginRC = mapAttrs (_: v: (entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources;
+    }
   ]);
 }
diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix
index 3a10bac7..37305540 100644
--- a/modules/plugins/lsp/null-ls/null-ls.nix
+++ b/modules/plugins/lsp/null-ls/null-ls.nix
@@ -1,87 +1,34 @@
 {lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) attrsOf str int nullOr;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) luaInline mkPluginSetupOption;
-  inherit (lib.nvim.config) batchRenameOptions;
-
-  migrationTable = {
-    debug = "debug";
-    diagnostics_format = "diagnostics_format";
-    debounce = "debounce";
-    default_timeout = "default_timeout";
-    sources = "sources";
-  };
-
-  renamedSetupOpts =
-    batchRenameOptions
-    ["vim" "lsp" "null-ls"]
-    ["vim" "lsp" "null-ls" "setupOpts"]
-    migrationTable;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) attrsOf str int;
 in {
-  imports = renamedSetupOpts;
-
   options.vim.lsp.null-ls = {
-    enable = mkEnableOption ''
-      null-ls, plugin to use Neovim as a language server to inject LSP diagnostics,
-      code actions, and more via Lua.
-    '';
+    enable = mkEnableOption "null-ls, also enabled automatically";
 
-    setupOpts = mkPluginSetupOption "null-ls" {
-      debug = mkEnableOption ''
-        debugging information for null-ls.
+    debug = mkEnableOption "debugging information for `null-ls";
 
-        Displays all possible log messages and writes them to the null-ls log,
-        which you can view with the command `:NullLsLog`
-      '';
+    diagnostics_format = mkOption {
+      type = str;
+      default = "[#{m}] #{s} (#{c})";
+      description = "Diagnostic output format for null-ls";
+    };
 
-      diagnostics_format = mkOption {
-        type = str;
-        default = "[#{m}] #{s} (#{c})";
-        description = ''
-          Sets the default format used for diagnostics. null-ls will replace th
-          e following special components with the relevant diagnostic information:
+    debounce = mkOption {
+      type = int;
+      default = 250;
+      description = "Default debounce";
+    };
 
-          * `#{m}`: message
-          * `#{s}`: source name (defaults to null-ls if not specified)
-          * `#{c}`: code (if available)
-        '';
-      };
+    default_timeout = mkOption {
+      type = int;
+      default = 5000;
+      description = "Default timeout value, in milliseconds";
+    };
 
-      debounce = mkOption {
-        type = int;
-        default = 250;
-        description = ''
-          Amount of time between the last change to a buffer and the next `textDocument/didChange` notification.
-        '';
-      };
-
-      default_timeout = mkOption {
-        type = int;
-        default = 5000;
-        description = ''
-          Amount of time (in milliseconds) after which built-in sources will time out.
-
-          :::{.note}
-          Built-in sources can define their own timeout period and users can override
-          the timeout period on a per-source basis
-          :::
-        '';
-      };
-
-      sources = mkOption {
-        type = nullOr (attrsOf luaInline);
-        default = null;
-        description = "Sources for null-ls to register";
-      };
-
-      on_attach = mkOption {
-        type = nullOr luaInline;
-        default = mkLuaInline "on_attach";
-        description = ''
-          Defines an on_attach callback to run whenever null-ls attaches to a buffer.
-        '';
-      };
+    sources = mkOption {
+      description = "null-ls sources";
+      type = attrsOf str;
+      default = {};
     };
   };
 }
diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
index beacc990..0665eb11 100644
--- a/modules/plugins/utility/telescope/telescope.nix
+++ b/modules/plugins/utility/telescope/telescope.nix
@@ -8,12 +8,6 @@
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline;
   setupOptions = {
-    pickers.find_files.find_command = mkOption {
-      description = "cmd to use for finding files";
-      type = either (listOf str) luaInline;
-      default = ["${pkgs.fd}/bin/fd" "--type=file"];
-    };
-
     defaults = {
       vimgrep_arguments = mkOption {
         description = ''
@@ -33,6 +27,11 @@
           "--no-ignore"
         ];
       };
+      pickers.find_command = mkOption {
+        description = "cmd to use for finding files";
+        type = either (listOf str) luaInline;
+        default = ["${pkgs.fd}/bin/fd"];
+      };
       prompt_prefix = mkOption {
         description = "Shown in front of Telescope's prompt";
         type = str;
diff --git a/modules/plugins/visuals/nvim-scrollbar/config.nix b/modules/plugins/visuals/nvim-scrollbar/config.nix
index ce00d699..1d0ebc76 100644
--- a/modules/plugins/visuals/nvim-scrollbar/config.nix
+++ b/modules/plugins/visuals/nvim-scrollbar/config.nix
@@ -12,7 +12,8 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["nvim-scrollbar"];
-      pluginRC.nvim-scrollbar = entryAnywhere ''
+
+      pluginRC.cursorline = entryAnywhere ''
         require("scrollbar").setup(${toLuaObject cfg.setupOpts})
       '';
     };
diff --git a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
index 5a3f3084..bdf48cb4 100644
--- a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
+++ b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix
@@ -13,7 +13,7 @@ in {
     setupOpts = mkPluginSetupOption "scrollbar-nvim" {
       excluded_filetypes = mkOption {
         type = listOf str;
-        default = ["prompt" "TelescopePrompt" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy" "fastaction_popup"];
+        default = ["prompt" "TelescopePrompt" "noice" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy"];
         description = "Filetypes to hide the scrollbar on";
       };
     };