1
0
Fork 0

lotsa changes I will probably roll back, wezterm and nvim added

This commit is contained in:
Von Random 2022-09-03 19:30:19 +03:00
parent 4d85fbdca7
commit 8a05339c71
14 changed files with 220 additions and 68 deletions

32
nvim/lua/maps.lua Normal file
View file

@ -0,0 +1,32 @@
vim.g.mapleader = ' '
function unmap(key)
vim.api.nvim_set_keymap('', key, '', {})
end
function map(mode, key, action)
vim.api.nvim_set_keymap(mode, key, action, {noremap = true})
end
-- some unmaps
unmap(' ')
unmap('q')
map('', '<F1>', '<Esc>')
map('!', '<F1>', '<Esc>')
-- option control
map('n', '<Leader>c', ':setlocal cursorline!<CR>')
map('n', '<Leader>l', ':setlocal list!<CR>')
map('n', '<Leader>w', ':setlocal wrap!<CR>')
-- search
map('n', '<Leader>/', ':noh<CR>')
-- copy / paste
map('n', '<Leader>y', '"+y')
map('n', '<Leader>d', '"+d')
map('n', '<Leader>p', '"+p')
map('n', '<Leader>P', '"+P')
-- keymap switch
map('!', '<C-Space>', '<C-^>')
map('!', '<C-@>', '<C-^>')

36
nvim/lua/plugins.lua Normal file
View file

@ -0,0 +1,36 @@
require('paq') {
'savq/paq-nvim',
'mhinz/vim-signify',
'tpope/vim-commentary',
'tpope/vim-fugitive',
'tpope/vim-rsi',
'tpope/vim-vinegar',
'hoob3rt/lualine.nvim',
'w0rp/ale',
'lifepillar/vim-gruvbox8',
'lifepillar/vim-solarized8',
'NLKNguyen/papercolor-theme'
}
require('lualine').setup{
options = {
icons_enabled = false,
section_separators = { left = '', right = ''},
component_separators = { left = '', right = ''}
}
}
vim.g.vimwiki_list = {{path='$HOME/vimwiki/', syntax='markdown', ext='.md'}}
vim.g.PaperColor_Theme_Options = {
theme = {
["default.dark"] = { allow_bold = 1, allow_italic = 1 },
["default.light"] = { allow_bold = 1, allow_italic = 1 }
}
}
vim.o.bg = 'dark'
vim.o.termguicolors = true
vim.g.gruvbox_filetype_hi_groups = 1
vim.cmd('colorscheme gruvbox8')

31
nvim/lua/settings.lua Normal file
View file

@ -0,0 +1,31 @@
vim.o.modeline = false
vim.o.foldmethod = 'marker'
vim.o.cursorline = true
vim.o.colorcolumn = '80'
vim.o.relativenumber = true
vim.o.breakindent = true
vim.o.guicursor = false
vim.o.list = true
vim.o.listchars = 'tab:|_,nbsp:x,trail:*'
vim.o.ignorecase = true
vim.o.smartcase = true
vim.o.scrolloff = 3
vim.o.sidescrolloff = 15
vim.o.tabstop = 3
vim.o.softtabstop = 4
vim.o.shiftwidth = 4
vim.o.expandtab = true
vim.o.keymap = 'russian-jcukenwintype'
vim.o.iminsert = 0
vim.o.imsearch = 0
vim.o.title = true
vim.o.titlestring = '[%{hostname()}] %t - vim'
vim.o.statusline = '[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]'
vim.o.guifont = 'JetBrains Mono:h15'