diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim new file mode 100755 index 0000000..a44a3f7 --- /dev/null +++ b/.config/nvim/init.vim @@ -0,0 +1,143 @@ +" basic vim settings (tabs, line numbers, etc.) +set tabstop=4 +set shiftwidth=4 +set softtabstop=4 +set showtabline=2 +set mouse=a +set number +set expandtab +set cursorline + +" plugins +call plug#begin() +Plug 'sainnhe/sonokai' +Plug 'neovim/nvim-lspconfig' +Plug 'preservim/nerdtree' +Plug 'vim-airline/vim-airline' +Plug 'hrsh7th/nvim-cmp' +Plug 'hrsh7th/cmp-nvim-lsp' +Plug 'saadparwaiz1/cmp_luasnip' +Plug 'L3MON4D3/LuaSnip' +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +call plug#end() + +" color fix +if has('termguicolors') + set termguicolors +endif + +" sonokai theme configuration +let g:sonokai_style = 'shusia' +let g:sonokai_enable_italic = 0 +let g:sonokai_disable_italic_comment = 1 +colorscheme sonokai + +" tabs +map :tabp +map :tabn +map :tabnew + +" save/quit +command Dw :w !doas dd of=% +nnoremap :w +nnoremap :q + +" NERDTree +nnoremap :NERDTreeToggle +let g:NERDTreeAutoDeleteBuffer = 1 +let g:NERDTreeMinimalUI = 1 +let g:NERDTreeQuitOnOpen = 1 +let g:NERDTreeDirArrowExpandable = '>' +let g:NERDTreeDirArrowCollapsible = '<' + +" LSP stuff +lua << EOF + +local nvim_lsp = require('lspconfig') +local on_attach = function(client, bufnr) + local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + local opts = { noremap=true, silent=true } + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) + buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) + buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) + buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) + buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) +end +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + +nvim_lsp.clangd.setup { + on_attach = on_attach; + capabilities = capabilities; +} +nvim_lsp.rust_analyzer.setup { + on_attach = on_attach; + capabilities = capabilities; +} + +vim.o.completeopt = 'menuone,noselect' +local luasnip = require 'luasnip' +local cmp = require 'cmp' +cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, +} +require'nvim-treesitter.configs'.setup { + ensure_installed = { "c", "toml" }, + highlight = { + enable = true, + } +} +EOF + diff --git a/lemondwm/config.def.h b/lemondwm/config.def.h index 3473d6f..9f1d5b7 100644 --- a/lemondwm/config.def.h +++ b/lemondwm/config.def.h @@ -26,8 +26,8 @@ static const int vertpadtab = 33; static const int horizpadtabi = 15; static const int horizpadtabo = 15; static const int scalepreview = 4; -static const char *fonts[] = {"Cozette:style:medium:size=12"}; -static const char dmenufont[] = "Cozette:style:medium:size=12"; +static const char *fonts[] = {"Cozette:style:medium:size=10"}; +static const char dmenufont[] = "Cozette:style:medium:size=10"; static const int colorfultag = 1; /* 0 means use SchemeSel for selected non-vacant tag */ // theme