commit dd32e102558031c9d0538a1b79fad96bcc4d44a9 Author: mace Date: Mon Aug 14 13:14:23 2023 +0200 first structure diff --git a/lua/custom/init.lua b/lua/custom/init.lua new file mode 100644 index 0000000..e69de29 diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua new file mode 100644 index 0000000..5c37174 --- /dev/null +++ b/lua/custom/keymaps.lua @@ -0,0 +1,55 @@ +vim.g.mapleader = ' ' + +local keymap = vim.keymap + +keymap.set('i', 'jj', '') +keymap.set('n', 'nh', ':nohl', { silent = true }) + +keymap.set('n', 'to', ':tabnew', { silent = true }) -- open new tab +keymap.set('n', 'tx', ':tabclose', { silent = true }) -- close current tab +keymap.set('n', 'tn', ':tabn', { silent = true }) -- go to next tab +keymap.set('n', 'tp', ':tabp', { silent = true }) -- go to previous tab + +keymap.set('n', 'gn', ':bn', { silent = true }) +keymap.set('n', 'gp', ':bp') + +keymap.set('n', '', ':w') +keymap.set('n', 'x', ':bd', { silent = true }) + +-- primeagen +keymap.set('v', 'J', ":m '>+1gv=gv", { silent = true }) +keymap.set('v', 'K', ":m '<-2gv=gv", { silent = true }) +-- [search] +keymap.set('n', 'n', 'nzzzh', { silent = true }) +keymap.set('n', 'N', 'Nzzzh', { silent = true }) + +-- [copy/paste] +keymap.set('x', 'p', '"_dP') +keymap.set('n', 'y', '"+yy') +---------------------- +-- Plugin Keybinds +---------------------- + +-- nvim-tree +keymap.set('n', 'e', ':NvimTreeToggle', { silent = true }) -- toggle file explorer +keymap.set('n', 'gt', ':NvimTreeFindFile', { silent = true }) -- toggle file explorer + +-- telescope +keymap.set('n', 'sf', 'Telescope find_files', { silent = true }) -- find files within current working directory, respects .gitignore +keymap.set('n', 'sg', 'Telescope live_grep', { silent = true }) -- find string in current working directory as you type +keymap.set('n', 'sc', 'Telescope grep_string', { silent = true }) -- find string under cursor in current working directory +keymap.set('n', 'sb', 'Telescope buffers', { silent = true }) -- list open buffers in current neovim instance +keymap.set('n', 'sh', 'Telescope help_tags', { silent = true }) -- list available help tags +keymap.set('n', 'sk', 'Telescope keymaps', { silent = true }) -- list available help tags + +-- git merge +keymap.set('n', '1', ':diffget LOCAL') +keymap.set('n', '2', ':diffget REMOTE') + +-- toggleterm +keymap.set('n', '', 'ToggleTerm direction=horizontal', { silent = true }) +keymap.set('n', '', 'ToggleTerm direction=vertical', { silent = true }) + +-- vim-sneak +keymap.set('n', 'f', 'Sneak_s', { silent = true }) +keymap.set('n', 'F', 'Sneak_S', { silent = true }) diff --git a/lua/custom/options.lua b/lua/custom/options.lua new file mode 100644 index 0000000..763b59f --- /dev/null +++ b/lua/custom/options.lua @@ -0,0 +1,38 @@ +local opt = vim.opt + +-- cursor block +-- opt.guicursor = "" + +-- line numbers +opt.relativenumber = true +opt.number = true + +-- tabs & indentation +opt.tabstop = 4 +opt.shiftwidth = 4 +opt.softtabstop = 4 +opt.expandtab = true +opt.autoindent = true + +opt.wrap = false + +-- scroll offset +vim.opt.scrolloff = 8 + +-- search settings +opt.smartcase = true +opt.ignorecase = true + +-- appearance +opt.termguicolors = true +opt.background = 'dark' +opt.signcolumn = 'yes' + +-- clipboard +opt.clipboard:append 'unnamedplus' + +-- slipt windows +opt.splitright = true +opt.splitbelow = true + +opt.iskeyword:append '-' diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua new file mode 100644 index 0000000..be0eb9d --- /dev/null +++ b/lua/custom/plugins/init.lua @@ -0,0 +1,5 @@ +-- You can add your own plugins here or in other files in this directory! +-- I promise not to create any merge conflicts in this directory :) +-- +-- See the kickstart.nvim README for more information +return {} diff --git a/lua/custom/vimrc b/lua/custom/vimrc new file mode 100644 index 0000000..a1f010c --- /dev/null +++ b/lua/custom/vimrc @@ -0,0 +1,62 @@ +set number +set hlsearch +set incsearch +set smartcase +set ignorecase +set wrap +set linebreak +set smartindent +set tabstop=4 +set shiftwidth=4 +set expandtab +set splitright splitbelow +set timeoutlen=1000 +set number +set relativenumber +syntax on +filetype indent on +set smartindent + +let mapleader = " " +imap jj +imap +nnoremap ΓΌ "+p + +noremap :vertical resize +3 +noremap :vertical resize -3 +noremap :resize +3 +noremap :resize -3 + + +nnoremap :m .+1== +nnoremap :m .-2== +inoremap :m .+1==gi +inoremap :m .-2==gi +vnoremap :m '>+1gv=gv +vnoremap :m '<-2gv=gv +nnoremap a ggVG +" nnoremap b :Telescope buffers +nnoremap ,b :Buffers +" nnoremap t :Explorer +" use leader e instead +nnoremap y "+yy +vnoremap y "+y + +:nnoremap s :%s/\<\>/ +" xnoremap ("p", "\"_dP") +" autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab + +vnoremap "hy:%s/h//gc +let g:python3_host_prog="/usr/bin/python3" + +nnoremap +nnoremap +nnoremap +nnoremap + +nnoremap zz +nnoremap zz + + +" nnoremap :Rg +" nnoremap :Files