Compare commits

..

4 Commits

4 changed files with 20 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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