Small changes

lua/taken/core/opts.lua

@@ -1,5 +1,4 @@
 local g = vim.g
-local o = vim.o
 local opt = vim.opt
 
 opt.fillchars = "eob: "
@@ -12,7 +11,7 @@ g.maplocalleader = "."
 
 opt.foldmethod = "expr"
 opt.foldexpr = "nvim_treesitter#foldexpr()"
-vim.opt.foldenable = false
+opt.foldenable = false
 
 opt.nu = true
 opt.relativenumber = true
@@ -50,11 +49,11 @@ opt.updatetime = 50
 
 -- windows
 if vim.fn.has("win32") == 1 then
-    o.shell = "pwsh -nologo"
-    o.shellcmdflag =
+    opt.shell = "pwsh -nologo"
+    opt.shellcmdflag =
         "-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;"
-    o.shellredir = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode"
-    o.shellpipe = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode"
-    o.shellquote = ""
-    o.shellxquote = ""
+    opt.shellredir = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode"
+    opt.shellpipe = "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode"
+    opt.shellquote = ""
+    opt.shellxquote = ""
 end

lua/taken/utils/themes.lua

@@ -24,7 +24,7 @@ function M.themeselector(opts)
 
     vim.cmd("SunglassesDisable")
     pickers
-        .new(combined, {
+        :new(vim.tbl_deep_extend("force", {
             prompt_title = "Colorscheme",
             finder = finders.new_table({
                 results = themes,
@@ -58,7 +58,7 @@ function M.themeselector(opts)
                 })
                 return true
             end,
-        })
+        }, combined))
         :find()
 end