remove neovim / lunarvim configs
parent
c511f6d9e9
commit
23aebf4732
|
|
@ -1,180 +0,0 @@
|
|||
vim.opt.list = true
|
||||
vim.opt.listchars = "tab:>-,trail:-"
|
||||
vim.opt.mouse = ""
|
||||
|
||||
-- general
|
||||
lvim.log.level = "warn"
|
||||
lvim.format_on_save = true
|
||||
-- vim.o.background = "light"
|
||||
lvim.colorscheme = "base16-one-light"
|
||||
|
||||
vim.cmd [[
|
||||
" Relative numbering
|
||||
function! NumberToggle()
|
||||
if(&relativenumber == 1)
|
||||
set nornu
|
||||
set number
|
||||
else
|
||||
set rnu
|
||||
endif
|
||||
endfunc
|
||||
]]
|
||||
|
||||
-- keymappings [view all the defaults by pressing <leader>Lk]
|
||||
lvim.leader = "space"
|
||||
lvim.keys.normal_mode["<F2>"] = ":bprevious<cr>"
|
||||
lvim.keys.normal_mode["<F3>"] = ":bnext<cr>"
|
||||
lvim.keys.normal_mode["<F5>"] = ":pastetoggle<cr>"
|
||||
lvim.keys.normal_mode["<F6>"] = ":call NumberToggle()<cr>"
|
||||
lvim.keys.normal_mode["<F7>"] = ":lua vim.lsp.stop_client(vim.lsp.get_active_clients())<cr>"
|
||||
lvim.keys.normal_mode["<leader>g"] = ":Telescope live_grep<cr>"
|
||||
|
||||
-- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode.
|
||||
-- we use protected-mode (pcall) just in case the plugin wasn't loaded yet.
|
||||
-- local _, actions = pcall(require, "telescope.actions")
|
||||
-- lvim.builtin.telescope.defaults.mappings = {
|
||||
-- -- for input mode
|
||||
-- i = {
|
||||
-- ["<C-j>"] = actions.move_selection_next,
|
||||
-- ["<C-k>"] = actions.move_selection_previous,
|
||||
-- ["<C-n>"] = actions.cycle_history_next,
|
||||
-- ["<C-p>"] = actions.cycle_history_prev,
|
||||
-- },
|
||||
-- -- for normal mode
|
||||
-- n = {
|
||||
-- ["<C-j>"] = actions.move_selection_next,
|
||||
-- ["<C-k>"] = actions.move_selection_previous,
|
||||
-- },
|
||||
-- }
|
||||
|
||||
-- Use which-key to add extra bindings with the leader-key prefix
|
||||
-- lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope projects<CR>", "Projects" }
|
||||
-- lvim.builtin.which_key.mappings["t"] = {
|
||||
-- name = "+Trouble",
|
||||
-- r = { "<cmd>Trouble lsp_references<cr>", "References" },
|
||||
-- f = { "<cmd>Trouble lsp_definitions<cr>", "Definitions" },
|
||||
-- d = { "<cmd>Trouble lsp_document_diagnostics<cr>", "Diagnostics" },
|
||||
-- q = { "<cmd>Trouble quickfix<cr>", "QuickFix" },
|
||||
-- l = { "<cmd>Trouble loclist<cr>", "LocationList" },
|
||||
-- w = { "<cmd>Trouble lsp_workspace_diagnostics<cr>", "Diagnostics" },
|
||||
-- }
|
||||
|
||||
-- TODO: User Config for predefined plugins
|
||||
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
|
||||
lvim.builtin.notify.active = true
|
||||
lvim.builtin.terminal.active = true
|
||||
lvim.builtin.nvimtree.setup.view.side = "left"
|
||||
lvim.builtin.nvimtree.show_icons.git = 0
|
||||
|
||||
-- if you don't want all the parsers change this to a table of the ones you want
|
||||
lvim.builtin.treesitter.ensure_installed = {
|
||||
"bash",
|
||||
"c",
|
||||
"json",
|
||||
"lua",
|
||||
"python",
|
||||
"rust",
|
||||
"yaml",
|
||||
}
|
||||
|
||||
lvim.builtin.treesitter.ignore_install = { "haskell" }
|
||||
lvim.builtin.treesitter.highlight.enabled = true
|
||||
|
||||
-- generic LSP settings
|
||||
|
||||
-- ---@usage disable automatic installation of servers
|
||||
-- lvim.lsp.automatic_servers_installation = false
|
||||
|
||||
-- ---@usage Select which servers should be configured manually. Requires `:LvimCacheRest` to take effect.
|
||||
-- See the full default list `:lua print(vim.inspect(lvim.lsp.override))`
|
||||
-- vim.list_extend(lvim.lsp.override, { "pyright" })
|
||||
|
||||
-- ---@usage setup a server -- see: https://www.lunarvim.org/languages/#overriding-the-default-configuration
|
||||
-- local opts = {} -- check the lspconfig documentation for a list of all possible options
|
||||
-- require("lvim.lsp.manager").setup("pylsp", opts)
|
||||
|
||||
-- -- you can set a custom on_attach function that will be used for all the language servers
|
||||
-- -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
|
||||
-- lvim.lsp.on_attach_callback = function(client, bufnr)
|
||||
-- local function buf_set_option(...)
|
||||
-- vim.api.nvim_buf_set_option(bufnr, ...)
|
||||
-- end
|
||||
-- --Enable completion triggered by <c-x><c-o>
|
||||
-- buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
|
||||
-- end
|
||||
|
||||
-- -- set a formatter, this will override the language server formatting capabilities (if it exists)
|
||||
-- local formatters = require "lvim.lsp.null-ls.formatters"
|
||||
-- formatters.setup {
|
||||
-- { command = "black", filetypes = { "python" } },
|
||||
-- { command = "isort", filetypes = { "python" } },
|
||||
-- {
|
||||
-- -- each formatter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
|
||||
-- command = "prettier",
|
||||
-- ---@usage arguments to pass to the formatter
|
||||
-- -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
|
||||
-- extra_args = { "--print-with", "100" },
|
||||
-- ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
|
||||
-- filetypes = { "typescript", "typescriptreact" },
|
||||
-- },
|
||||
-- }
|
||||
|
||||
-- -- set additional linters
|
||||
-- local linters = require "lvim.lsp.null-ls.linters"
|
||||
-- linters.setup {
|
||||
-- { command = "flake8", filetypes = { "python" } },
|
||||
-- {
|
||||
-- -- each linter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
|
||||
-- command = "shellcheck",
|
||||
-- ---@usage arguments to pass to the formatter
|
||||
-- -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
|
||||
-- extra_args = { "--severity", "warning" },
|
||||
-- },
|
||||
-- {
|
||||
-- command = "codespell",
|
||||
-- ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
|
||||
-- filetypes = { "javascript", "python" },
|
||||
-- },
|
||||
-- }
|
||||
|
||||
-- Additional Plugins
|
||||
lvim.plugins = {
|
||||
{ "RRethy/nvim-base16" },
|
||||
{ "rebelot/kanagawa.nvim" },
|
||||
{ "LunarVim/Colorschemes" },
|
||||
{ "nathom/filetype.nvim" },
|
||||
{
|
||||
'wfxr/minimap.vim',
|
||||
run = "cargo install --locked code-minimap",
|
||||
-- cmd = {"Minimap", "MinimapClose", "MinimapToggle", "MinimapRefresh", "MinimapUpdateHighlight"},
|
||||
config = function()
|
||||
vim.cmd("let g:minimap_width = 10")
|
||||
vim.cmd("let g:minimap_auto_start = 1")
|
||||
vim.cmd("let g:minimap_auto_start_win_enter = 1")
|
||||
end,
|
||||
},
|
||||
}
|
||||
-- {"folke/tokyonight.nvim"},
|
||||
-- {
|
||||
-- "folke/trouble.nvim",
|
||||
-- cmd = "TroubleToggle",
|
||||
-- },
|
||||
-- }
|
||||
|
||||
-- Autocommands (https://neovim.io/doc/user/autocmd.html)
|
||||
-- lvim.autocommands.custom_groups = {
|
||||
-- { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" },
|
||||
-- }
|
||||
lvim.autocommands.custom_groups = {
|
||||
{ "FileType", "make", "set noexpandtab shiftwidth=8 softtabstop=0" },
|
||||
{ "FileType", "justfile", "set expandtab tabstop=4 shiftwidth=4 softtabstop=4" }
|
||||
}
|
||||
|
||||
local filetype = require("filetype")
|
||||
filetype.setup({
|
||||
overrides = {
|
||||
literal = {
|
||||
["justfile.nix"] = "just",
|
||||
},
|
||||
},
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,276 +0,0 @@
|
|||
call plug#begin('~/.config/nvim/autoload/plugged')
|
||||
Plug 'junegunn/vim-easy-align'
|
||||
Plug 'ntpeters/vim-better-whitespace'
|
||||
Plug 'itchyny/vim-gitbranch'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'kyazdani42/nvim-web-devicons'
|
||||
Plug 'kyazdani42/nvim-tree.lua'
|
||||
Plug 'svermeulen/vimpeccable'
|
||||
Plug 'NoahTheDuke/vim-just'
|
||||
Plug 'dewyze/vim-tada'
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': 'TSUpdate'}
|
||||
call plug#end()
|
||||
|
||||
set nocompatible
|
||||
set history=1000
|
||||
set title
|
||||
set encoding=utf-8
|
||||
set scrolloff=3
|
||||
set ttyfast
|
||||
set laststatus=2
|
||||
set ff=unix
|
||||
set number
|
||||
set tabstop=2
|
||||
set shiftwidth=2
|
||||
set softtabstop=2
|
||||
set nojoinspaces
|
||||
set expandtab
|
||||
set listchars=tab:>-,trail:-
|
||||
set list
|
||||
set noshowmode
|
||||
set hlsearch
|
||||
set incsearch
|
||||
set termguicolors
|
||||
set visualbell
|
||||
set noerrorbells
|
||||
set whichwrap=<,>,[,],b,
|
||||
set backspace=indent,eol,start
|
||||
set number
|
||||
set autoread
|
||||
set nobackup
|
||||
set nowritebackup
|
||||
set nowb
|
||||
set noswapfile
|
||||
set background=light
|
||||
let mapleader = " "
|
||||
|
||||
" TextEdit might fail if hidden is not set.
|
||||
set hidden
|
||||
|
||||
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
|
||||
" delays and poor user experience.
|
||||
set updatetime=300
|
||||
|
||||
" Don't pass messages to |ins-completion-menu|.
|
||||
set shortmess+=c
|
||||
|
||||
syntax on
|
||||
filetype on
|
||||
filetype plugin on
|
||||
filetype plugin indent on
|
||||
autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=0
|
||||
autocmd FileType rust set shiftwidth=4 softtabstop=4 tabstop=4
|
||||
autocmd FileType terraform set expandtab
|
||||
autocmd FileType html set shiftwidth=4 softtabstop=4 tabstop=4
|
||||
autocmd FileType javascript set shiftwidth=4 softtabstop=4 tabstop=4
|
||||
autocmd FileType htmldjango set shiftwidth=4 softtabstop=4 tabstop=4
|
||||
autocmd FileType just set shiftwidth=4 softtabstop=4 tabstop=4
|
||||
autocmd BufNewFile,BufRead *.tera set syntax=django
|
||||
" autocmd BufNewFile,BufRead justfile setf make expandtab shiftwidth=8 softtabstop=0
|
||||
autocmd FileType *.md set expandtab
|
||||
|
||||
" Center screen when scrolling search results
|
||||
nmap n nzz
|
||||
nmap N Nzz
|
||||
|
||||
" colorscheme solarized
|
||||
let g:airline_powerline_fonts=1
|
||||
let g:airline_theme='owo'
|
||||
let g:airline_theme='cobalt2'
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
|
||||
noremap <F2> :bp<CR>
|
||||
noremap <F3> :bn<CR>
|
||||
set pastetoggle=<F5>
|
||||
|
||||
" highlight trailing whitespace
|
||||
highlight ExtraWhitespace ctermbg=lightblue guibg=lightblue
|
||||
match ExtraWhitespace /\s\+$/
|
||||
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
|
||||
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
|
||||
autocmd InsertLeave * match ExtraWhitespace /\s\+$/
|
||||
autocmd BufWinLeave * call clearmatches()
|
||||
|
||||
" Start interactive EasyAlign in visual mode (e.g. vipga)
|
||||
xmap ga <Plug>(EasyAlign)
|
||||
|
||||
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
|
||||
nmap ga <Plug>(EasyAlign)
|
||||
|
||||
nnoremap <silent><leader>1 :source ~/.config/nvim/init.vim \| :PlugInstall<CR>
|
||||
map <Leader>s :StripWhitespace<CR>
|
||||
|
||||
nnoremap <leader>g :Rg<CR>
|
||||
nnoremap <leader>f :Files<CR>
|
||||
nnoremap <silent><leader>l :Buffers<CR>
|
||||
|
||||
nnoremap <F8> :call SetNewPassword()<CR>
|
||||
function! SetNewPassword()
|
||||
let cur_word = expand('<cword>')
|
||||
let cmd = 'pwgen ' . strlen(cur_word) . ' 1'
|
||||
let new_password = system(cmd)[:-2]
|
||||
" Replace current word with a new random password of the same length
|
||||
call setline(line('.'), substitute(getline('.'), cur_word, new_password, ""))
|
||||
endfunction
|
||||
|
||||
" Relative numbering
|
||||
function! NumberToggle()
|
||||
if(&relativenumber == 1)
|
||||
set nornu
|
||||
set number
|
||||
else
|
||||
set rnu
|
||||
endif
|
||||
endfunc
|
||||
|
||||
" Toggle between normal and relative numbering.
|
||||
noremap <F6> :call NumberToggle()<cr>
|
||||
|
||||
" File Browser
|
||||
nnoremap <leader>e :NvimTreeToggle<CR>
|
||||
nnoremap <leader>r :NvimTreeRefresh<CR>
|
||||
|
||||
let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.7 } }
|
||||
|
||||
lua << EOF
|
||||
require("nvim-tree").setup({
|
||||
sort_by = "case_sensitive",
|
||||
view = {
|
||||
adaptive_size = true,
|
||||
mappings = {
|
||||
list = {
|
||||
{ key = "u", action = "dir_up" },
|
||||
},
|
||||
},
|
||||
},
|
||||
renderer = {
|
||||
group_empty = true,
|
||||
highlight_git = true,
|
||||
},
|
||||
filters = {
|
||||
dotfiles = true,
|
||||
},
|
||||
actions = {
|
||||
open_file = {
|
||||
quit_on_open = true,
|
||||
},
|
||||
},
|
||||
})
|
||||
EOF
|
||||
|
||||
lua << EOF
|
||||
require('nvim-treesitter.configs').setup {
|
||||
highlight = {
|
||||
enable = true,
|
||||
disable = {},
|
||||
},
|
||||
indent = {
|
||||
enable = false,
|
||||
disable = {},
|
||||
},
|
||||
ensure_installed = {
|
||||
"tsx",
|
||||
"typescript",
|
||||
"bash",
|
||||
"vim",
|
||||
"json",
|
||||
"yaml",
|
||||
"html",
|
||||
"css",
|
||||
"scss",
|
||||
"lua",
|
||||
"ruby",
|
||||
"rust",
|
||||
}
|
||||
}
|
||||
|
||||
local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
|
||||
-- parser_config.tsx.parser_to_fil = { "javascript", "typescript.tsx" }
|
||||
EOF
|
||||
|
||||
lua << EOF
|
||||
local nvim_lsp = require('lspconfig')
|
||||
local protocol = require('vim.lsp.protocol')
|
||||
|
||||
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
|
||||
|
||||
-- Mappings
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
--buf_set_keymap('i', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>lwa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>lwr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>lwl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>d', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
|
||||
--buf_set_keymap('n', '<C-j>', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>lgn', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
|
||||
buf_set_keymap('n', 'td', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
|
||||
--if client.name == 'tsserver' then
|
||||
-- client.resolved_capabilities.document_formatting = false
|
||||
--end
|
||||
|
||||
if client.resolved_capabilities.document_formatting then
|
||||
vim.api.nvim_command [[augroup Format]]
|
||||
vim.api.nvim_command [[autocmd! * <buffer>]]
|
||||
vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()]]
|
||||
vim.api.nvim_command [[augroup END]]
|
||||
end
|
||||
|
||||
protocol.CompletionItemKind = {
|
||||
'', -- Text
|
||||
'', -- Method
|
||||
'', -- Function
|
||||
'', -- Constructor
|
||||
'', -- Field
|
||||
'', -- Variable
|
||||
'', -- Class
|
||||
'ﰮ', -- Interface
|
||||
'', -- Module
|
||||
'', -- Property
|
||||
'', -- Unit
|
||||
'', -- Value
|
||||
'', -- Enum
|
||||
'', -- Keyword
|
||||
'', -- Snippet
|
||||
'', -- Color
|
||||
'', -- File
|
||||
'', -- Reference
|
||||
'', -- Folder
|
||||
'', -- EnumMember
|
||||
'', -- Constant
|
||||
'', -- Struct
|
||||
'', -- Event
|
||||
'ﬦ', -- Operator
|
||||
'', -- TypeParameter
|
||||
}
|
||||
end
|
||||
|
||||
nvim_lsp.tsserver.setup {
|
||||
on_attach = on_attach,
|
||||
filetypes = { "typescript", "typescriptreact", "typescript.tsx" }
|
||||
}
|
||||
|
||||
nvim_lsp.solargraph.setup {
|
||||
on_attach = on_attach,
|
||||
flags = {
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
}
|
||||
EOF
|
||||
Loading…
Reference in New Issue