From ec14231679cf988ad955d73c9fb3493aae30f380 Mon Sep 17 00:00:00 2001 From: jakobst1n Date: Tue, 29 Oct 2024 15:30:21 +0100 Subject: Change basic.lua to m4 file --- Common/nvim/lua/basic.lua | 35 ----------------------------------- Common/nvim/lua/basic.lua.m4 | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 35 deletions(-) delete mode 100755 Common/nvim/lua/basic.lua create mode 100755 Common/nvim/lua/basic.lua.m4 (limited to 'Common/nvim') diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua deleted file mode 100755 index 47a7ab6..0000000 --- a/Common/nvim/lua/basic.lua +++ /dev/null @@ -1,35 +0,0 @@ -vim.opt.formatoptions:remove("t") -vim.opt.path:append("**") -vim.g.netrw_banner = 0 -vim.opt.wildignore = '*.o,*~,*.pyc,*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store' -vim.opt.smartcase = true -vim.opt.showmatch = true -vim.opt.swapfile = false -vim.opt.smartindent = true -vim.opt.mouse = "" - --- Default to the "modern normal" -vim.opt.expandtab = true -vim.opt.shiftwidth = 4 -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 - --- Disable highlight when is pressed -vim.api.nvim_set_keymap('n', '', ':noh', { noremap = true, silent = true }) - --- Tab commands -vim.api.nvim_set_keymap('n', 'tp', ':tabprevious', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'tn', ':tabnext', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'tc', ':tabnew', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'tx', ':tabclose', { noremap = true, silent = true }) - --- Return to last edit position when opening files -vim.cmd [[ - au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif -]] - --- Colorscheme -vim.cmd [[ colorscheme bw ]] -vim.opt.background = "light" --- No idea why, preview in fzf does at least work extremely porly without this -vim.cmd [[ let $BAT_THEME = 'gruvbox-light' ]] diff --git a/Common/nvim/lua/basic.lua.m4 b/Common/nvim/lua/basic.lua.m4 new file mode 100755 index 0000000..70d78cc --- /dev/null +++ b/Common/nvim/lua/basic.lua.m4 @@ -0,0 +1,38 @@ +vim.opt.formatoptions:remove("t") +vim.opt.path:append("**") +vim.g.netrw_banner = 0 +vim.opt.wildignore = '*.o,*~,*.pyc,*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store' +vim.opt.smartcase = true +vim.opt.showmatch = true +vim.opt.swapfile = false +vim.opt.smartindent = true +vim.opt.mouse = "" + +-- Default to the "modern normal" +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 + +-- Disable highlight when is pressed +vim.api.nvim_set_keymap('n', '', ':noh', { noremap = true, silent = true }) + +-- Tab commands +vim.api.nvim_set_keymap('n', 'tp', ':tabprevious', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'tn', ':tabnext', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'tc', ':tabnew', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'tx', ':tabclose', { noremap = true, silent = true }) + +-- Return to last edit position when opening files +vim.cmd [[ + au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif +]] + +-- Colorscheme +vim.cmd [[ colorscheme bw ]] +vim.opt.background = "light" +-- No idea why, preview in fzf does at least work extremely porly without this +vim.cmd [[ let $BAT_THEME = 'gruvbox-light' ]] +m4_ifelse(DT_DOTFILES_TYPE, `remote', `m4_dnl +vim.opt.termguicolors = true +')m4_dnl -- cgit v1.2.3