lua/kickstart/plugins/conform.lua

@@ -4,12 +4,12 @@ return {
     lazy = false,
     keys = {
       {
-        '<leader>fb',
+        '<leader>f',
         function()
           require('conform').format { async = true, lsp_fallback = true }
         end,
         mode = '',
-        desc = '[F]ormat [B]uffer',
+        desc = '[F]ormat buffer',
       },
     },
     opts = {
@@ -31,7 +31,7 @@ return {
         --
         -- You can use a sub-list to tell conform to run *until* a formatter
         -- is found.
-        javascript = { { 'prettierd', 'prettier' } },
+        javascript = { { "prettierd", "prettier" } },
       },
     },
   },

lua/kickstart/plugins/mini.lua

@@ -19,9 +19,6 @@ return {
 
       -- Simple file explorer with in-buffer-editing
       require('mini.files').setup()
-      vim.keymap.set({ 'n', 'v' }, '<leader>fe', function()
-        MiniFiles.open()
-      end, { desc = '[F]ile [E]xplorer' })
 
       -- Simple and easy statusline.
       --  You could remove this setup call if you don't like it,

lua/kickstart/plugins/which-key.lua

@@ -34,7 +34,6 @@ return {
         ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
         ['<leader>dn'] = { name = '[N]o', _ = 'which_key_ignore' },
         ['<leader>l'] = { name = '[L]ist', _ = 'which_key_ignore' },
-        ['<leader>f'] = { name = '[F]ormat/[F]ile', _ = 'which_key_ignore' },
       }
 
       -- register which-key VISUAL mode
@@ -48,7 +47,6 @@ return {
         ['<leader>dn'] = { name = '[N]o', _ = 'which_key_ignore' },
         ['<leader>pn'] = { name = '[N]o', _ = 'which_key_ignore' },
         ['<leader>l'] = { name = '[L]ist', _ = 'which_key_ignore' },
-        ['<leader>f'] = { name = '[F]ormat/[F]ile', _ = 'which_key_ignore' },
       }, { mode = 'v' })
     end,
   },

lua/options.lua

@@ -7,15 +7,13 @@
 vim.api.nvim_exec2('language en_US', {})
 
 -- Shell options
--- Sets the shell to use for system() and ! commands in windows
+-- Sets the shell to use for system() and ! commands
-if vim.fn.has 'win32' then
+vim.opt.shell = 'powershell.exe'
-  vim.opt.shell = 'powershell.exe'
+vim.opt.shellcmdflag = '-NonInteractive -NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command '
-  vim.opt.shellcmdflag = '-NonInteractive -NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command '
+vim.opt.shellxquote = ''
-  vim.opt.shellxquote = ''
+vim.opt.shellquote = ''
-  vim.opt.shellquote = ''
+vim.opt.shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
-  vim.opt.shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
+vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s'
-  vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s'
-end
 
 -- Format settings
 -- Make line numbers default
@@ -86,9 +84,6 @@ vim.opt.cursorline = true
 vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 12
 
--- Set cursor pointer to block
-vim.opt.guicursor = 'n-v-i-c:block-Cursor'
-
 -- Options specifically targeted at Neovide
 if vim.g.neovide then
   vim.o.guifont = 'CaskaydiaCove Nerd Font Mono:h14'