diff --git a/.stylua.toml b/.stylua.toml
deleted file mode 100644
index cee468f..0000000
--- a/.stylua.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-column_width = 120
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferDouble"
-call_parentheses = "Always"
-collapse_simple_statement = "Never"
diff --git a/flake.lock b/flake.lock
index b4de3d8..2837f2c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -666,22 +666,6 @@
         "type": "github"
       }
     },
-    "nvim-treesitter-textsubjects": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1676144693,
-        "narHash": "sha256-4jb9v0xpO17wp85dzojKUQ6hUdNBx3T2tB4fSWoANus=",
-        "owner": "RRethy",
-        "repo": "nvim-treesitter-textsubjects",
-        "rev": "b913508f503527ff540f7fe2dcf1bf1d1f259887",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RRethy",
-        "repo": "nvim-treesitter-textsubjects",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -773,7 +757,6 @@
         "neovim": "neovim",
         "nil": "nil",
         "nixpkgs": "nixpkgs_8",
-        "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
         "pre-commit-hooks": "pre-commit-hooks_3",
         "stable": "stable",
         "utils": "utils_2"
diff --git a/flake.nix b/flake.nix
index 6127709..9f6dffc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,11 +56,6 @@
     hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
     hypr-contrib.url = "github:hyprwm/contrib";
-
-    nvim-treesitter-textsubjects = {
-      url = "github:RRethy/nvim-treesitter-textsubjects";
-      flake = false;
-    };
   };
 
   outputs =
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index ed788db..5549f2b 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -1,27 +1,12 @@
 { config
 , lib
 , pkgs
-, inputs
 , ...
 }:
 
 with lib;
 let
   cfg = config.my.programs.vim;
-
-  mkDate = longDate: (lib.concatStringsSep "-" [
-    (builtins.substring 0 4 longDate)
-    (builtins.substring 4 2 longDate)
-    (builtins.substring 6 2 longDate)
-  ]);
-
-  mkVersionInput = input: mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty");
-
-  nvim-treesitter-textsubjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
-    pname = "nvim-treesitter-textsubjects";
-    version = mkVersionInput inputs.nvim-treesitter-textsubjects;
-    src = inputs.nvim-treesitter-textsubjects;
-  };
 in
 {
   options.my.programs.vim = {
@@ -48,26 +33,20 @@ in
       plugins = with pkgs.vimPlugins; [
         catppuccin-nvim
         cmp-nvim-lsp
-        cmp_luasnip
-        comment-nvim
         dashboard-nvim
-        lsp_lines-nvim
-        lualine-lsp-progress
-        lualine-nvim
-        luasnip
         neogit
         noice-nvim
         nui-nvim # for noice-nvim
         nvim-cmp
         nvim-lspconfig
-        nvim-surround
-        nvim-treesitter-textsubjects
         nvim-treesitter.withAllGrammars
-        nvim-ts-context-commentstring
         nvim-web-devicons # for dashboard-nvim
         plenary-nvim # for telescope, neogit
         telescope-nvim
         which-key-nvim
+        cmp_luasnip
+        luasnip
+        lsp_lines-nvim
       ];
     };
   };
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index 80cc9c7..4e20fbe 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -4,7 +4,7 @@ vim.g.maplocalleader = ","
 -- FIX to create spell dir if not existent
 local spelldir = vim.fn.stdpath("data") .. "/site/spell"
 if not vim.loop.fs_stat(spelldir) then
-  vim.fn.mkdir(spelldir, "p")
+	vim.fn.mkdir(spelldir, "p")
 end
 
 vim.opt.autoindent = true
@@ -34,103 +34,100 @@ vim.opt_local.spell = true
 vim.opt_local.spelllang = { "en", "de_20" } -- all English regions and new German spelling
 
 require("catppuccin").setup({
-  compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- fix issue of writing to nix store
-  integrations = {
-    which_key = true,
-  },
+	compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- fix issue of writing to nix store
+	integrations = {
+		which_key = true,
+	},
 })
 vim.cmd.colorscheme("catppuccin-macchiato")
 
 vim.o.timeout = true
-vim.o.timeoutlen = 500
+vim.o.timeoutlen = 300
 local wk = require("which-key")
 
 require("noice").setup({
-  lsp = {
-    -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
-    override = {
-      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-      ["vim.lsp.util.stylize_markdown"] = true,
-      ["cmp.entry.get_documentation"] = true,
-    },
-    progress = {
-      enabled = false,
-    },
-  },
-  -- you can enable a preset for easier configuration
-  presets = {
-    bottom_search = true, -- use a classic bottom cmdline for search
-    command_palette = true, -- position the cmdline and popupmenu together
-    long_message_to_split = true, -- long messages will be sent to a split
-    inc_rename = false, -- enables an input dialog for inc-rename.nvim
-    lsp_doc_border = false, -- add a border to hover docs and signature help
-  },
+	lsp = {
+		-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+		override = {
+			["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+			["vim.lsp.util.stylize_markdown"] = true,
+			["cmp.entry.get_documentation"] = true,
+		},
+	},
+	-- you can enable a preset for easier configuration
+	presets = {
+		bottom_search = true, -- use a classic bottom cmdline for search
+		command_palette = true, -- position the cmdline and popupmenu together
+		long_message_to_split = true, -- long messages will be sent to a split
+		inc_rename = false, -- enables an input dialog for inc-rename.nvim
+		lsp_doc_border = false, -- add a border to hover docs and signature help
+	},
 })
 
 wk.register({
-  f = {
-    name = "find",
-    f = { "<cmd>Telescope find_files<cr>", "find file" },
-    g = { "<cmd>Telescope live_grep<cr>", "live grep" },
-    b = { "<cmd>Telescope buffers<cr>", "find buffer" },
-  },
+	f = {
+		name = "find",
+		f = { "<cmd>Telescope find_files<cr>", "find file" },
+		g = { "<cmd>Telescope live_grep<cr>", "live grep" },
+		b = { "<cmd>Telescope buffers<cr>", "find buffer" },
+	},
 }, { prefix = "<leader>" })
 
 require("neogit").setup({
-  disable_commit_confirmation = true,
+	disable_commit_confirmation = true,
 })
 wk.register({
-  g = { "<cmd>Neogit<cr>", "git" },
+	g = { "<cmd>Neogit<cr>", "git" },
 }, { prefix = "<leader>" })
 
 require("nvim-treesitter.configs").setup({
-  sync_install = false,
-  auto_install = false,
-  highlight = {
-    enable = true,
-    additional_vim_regex_highlighting = true,
-  },
+	sync_install = false,
+	auto_install = false,
+	highlight = {
+		enable = true,
+		additional_vim_regex_highlighting = true,
+	},
 })
 
 local cmp = require("cmp")
 local luasnip = require("luasnip")
 cmp.setup({
-  snippet = {
-    -- REQUIRED - you must specify a snippet engine
-    expand = function(args)
-      require("luasnip").lsp_expand(args.body)
-    end,
-  },
-  mapping = cmp.mapping.preset.insert({
-    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<C-Space>"] = cmp.mapping.complete(),
-    ["<C-e>"] = cmp.mapping.abort(),
-    ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  }),
-  sources = {
-    { name = "nvim_lsp" },
-    { name = "luasnip" },
-    { name = "buffer" },
-  },
+	snippet = {
+		-- REQUIRED - you must specify a snippet engine
+		expand = function(args)
+			require("luasnip").lsp_expand(args.body)
+		end,
+	},
+	mapping = cmp.mapping.preset.insert({
+		["<C-b>"] = cmp.mapping.scroll_docs(-4),
+		["<C-f>"] = cmp.mapping.scroll_docs(4),
+		["<C-Space>"] = cmp.mapping.complete(),
+		["<C-e>"] = cmp.mapping.abort(),
+		["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+		["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_next_item()
+			elseif luasnip.expand_or_jumpable() then
+				luasnip.expand_or_jump()
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+		["<S-Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_prev_item()
+			elseif luasnip.jumpable(-1) then
+				luasnip.jump(-1)
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+	}),
+	sources = {
+		{ name = "nvim_lsp" },
+		{ name = "luasnip" },
+		{ name = "buffer" },
+	},
 })
 
 -- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
@@ -138,195 +135,99 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
 local lspconfig = require("lspconfig")
 local on_attach_def = function(_, bufnr)
-  wk.register({
-    K = { vim.lsp.buf.hover, "show info" },
-    ["<leader>l"] = {
-      name = "lsp",
-      d = { vim.diagnostic.open_float, "open diagnostic window" },
-      n = { vim.diagnostic.goto_next, "next error" },
-      p = { vim.diagnostic.goto_prev, "prev error" },
-      c = { vim.lsp.buf.code_action, "code action" },
-      r = { vim.lsp.buf.rename, "rename" },
-      f = {
-        function()
-          vim.lsp.buf.format({ async = true })
-        end,
-        "format",
-      },
-    },
-    g = {
-      name = "goto",
-      r = { vim.lsp.buf.references, "references" },
-      d = { vim.lsp.buf.definition, "definition" },
-      D = { vim.lsp.buf.declaration, "declaration" },
-      i = { vim.lsp.buf.implementation, "implementation" },
-      t = { vim.lsp.buf.type_definition, "type defininition" },
-    },
-  }, { noremap = true, silent = true, buffer = bufnr })
-end
-
----merge tables
----@param ... table[]
----@return table
-local function table_merge(...)
-  local tables_to_merge = { ... }
-  assert(#tables_to_merge > 1, "There should be at least two tables to merge them")
-
-  for k, t in ipairs(tables_to_merge) do
-    assert(type(t) == "table", string.format("Expected a table as function parameter %d", k))
-  end
-
-  local result = tables_to_merge[1]
-
-  for i = 2, #tables_to_merge do
-    local from = tables_to_merge[i]
-    for k, v in pairs(from) do
-      if type(v) == "table" then
-        result[k] = result[k] or {}
-        result[k] = table_merge(result[k], v)
-      else
-        result[k] = v
-      end
-    end
-  end
-
-  return result
-end
-
-local lspconfig_default_options = {
-  on_attach = on_attach_def,
-  capabilities = capabilities,
-  flags = {
-    debounce_text_changes = 100,
-  },
-}
-
----function to add default options to lspconfig
----@param lsp string
----@param options table
----@return nil
-local function lspconfig_setup(lsp, options)
-  local final_options = table_merge(lspconfig_default_options, options)
-  lspconfig[lsp].setup(final_options)
+	wk.register({
+		K = { vim.lsp.buf.hover, "show info" },
+		["<leader>l"] = {
+			name = "lsp",
+			d = { vim.diagnostic.open_float, "open diagnostic window" },
+			n = { vim.diagnostic.goto_next, "next error" },
+			p = { vim.diagnostic.goto_prev, "prev error" },
+			c = { vim.lsp.buf.code_action, "code action" },
+			r = { vim.lsp.buf.rename, "rename" },
+			f = {
+				function()
+					vim.lsp.buf.format({ async = true })
+				end,
+				"format",
+			},
+		},
+		g = {
+			name = "goto",
+			r = { vim.lsp.buf.references, "references" },
+			d = { vim.lsp.buf.definition, "definition" },
+			D = { vim.lsp.buf.declaration, "declaration" },
+			i = { vim.lsp.buf.implementation, "implementation" },
+			t = { vim.lsp.buf.type_definition, "type defininition" },
+		},
+	}, { noremap = true, silent = true, buffer = bufnr })
 end
 
 local servers = { "nil_ls", "pylsp" }
 for _, lsp in ipairs(servers) do
-  lspconfig_setup(lsp, {})
+	lspconfig[lsp].setup({
+		on_attach = on_attach_def,
+		capabilities = capabilities,
+		flags = {
+			debounce_text_changes = 100,
+		},
+	})
 end
 
-lspconfig_setup("lua_ls", {
-  on_attach = on_attach_def,
-  capabilities = capabilities,
-  settings = {
-    Lua = {
-      runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-        version = "LuaJIT",
-      },
-      diagnostics = {
-        -- Get the language server to recognize the `vim` global
-        globals = { "vim" },
-      },
-      workspace = {
-        -- Make the server aware of Neovim runtime files
-        library = vim.api.nvim_get_runtime_file("", true),
-        checkThirdParty = false,
-      },
-      -- Do not send telemetry data containing a randomized but unique identifier
-      telemetry = {
-        enable = false,
-      },
-      format = {
-        enable = false,
-      },
-    },
-  },
+lspconfig.sumneko_lua.setup({
+	on_attach = on_attach_def,
+	capabilities = capabilities,
+	settings = {
+		Lua = {
+			runtime = {
+				-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+				version = "LuaJIT",
+			},
+			diagnostics = {
+				-- Get the language server to recognize the `vim` global
+				globals = { "vim" },
+			},
+			workspace = {
+				-- Make the server aware of Neovim runtime files
+				library = vim.api.nvim_get_runtime_file("", true),
+				checkThirdParty = false,
+			},
+			-- Do not send telemetry data containing a randomized but unique identifier
+			telemetry = {
+				enable = false,
+			},
+			format = {
+				enable = true,
+				-- Put format options here
+				-- NOTE: the value should be STRING!!
+				defaultConfig = {
+					indent_style = "space",
+					indent_size = "2",
+				},
+			},
+		},
+	},
 })
 
 local lsp_lines = require("lsp_lines")
 lsp_lines.setup()
 -- Disable virtual_text since it's redundant due to lsp_lines.
 vim.diagnostic.config({
-  virtual_text = false,
+	virtual_text = false,
 })
 wk.register({
-  t = {
-    name = "toggle",
-    l = { lsp_lines.toggle, "lsp lines" },
-  },
-  { prefix = "<leader>" },
+	t = {
+		name = "toggle",
+		l = { lsp_lines.toggle, "lsp lines" },
+	},
+	{ prefix = "<leader>" },
 })
 
 require("dashboard").setup({
-  theme = "hyper",
-  config = {
-    packages = { enable = true },
-    week_header = {
-      enable = true,
-    },
-  },
-})
-
-require("lualine").setup({
-  options = {
-    icons_enabled = true,
-    theme = "auto",
-    component_separators = "|",
-    section_separators = { left = "", right = "" },
-    disabled_filetypes = {
-      statusline = {},
-      winbar = {},
-    },
-    ignore_focus = {},
-    always_divide_middle = true,
-    globalstatus = false,
-    refresh = {
-      statusline = 1000,
-      tabline = 1000,
-      winbar = 1000,
-    },
-  },
-  sections = {
-    lualine_a = {
-      { "mode", separator = { left = "" }, right_padding = 2 },
-    },
-    lualine_b = { "branch", "diff", "diagnostics" },
-    lualine_c = { "filename", "lsp_progress" },
-    lualine_x = { "encoding", "fileformat", "filetype" },
-    lualine_y = { "progress" },
-    lualine_z = {
-      { "location", separator = { right = "" }, left_padding = 2 },
-    },
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = { "filename" },
-    lualine_x = { "location" },
-    lualine_y = {},
-    lualine_z = {},
-  },
-  tabline = {},
-  winbar = {},
-  inactive_winbar = {},
-  extensions = {},
-})
-
-require("Comment").setup()
-
-require("nvim-treesitter.configs").setup({
-  context_commentstring = {
-    enable = true,
-  },
-})
-
-require("nvim-surround").setup({})
-
-require("nvim-treesitter.configs").setup({
-  textsubjects = {
-    enable = true,
-    prev_selection = ",", -- (Optional) keymap to select the previous selection
-    keymaps = { ["."] = "textsubjects-smart" },
-  },
+	theme = "hyper",
+	config = {
+		packages = { enable = true },
+		week_header = {
+			enable = true,
+		},
+	},
 })