diff options
| -rw-r--r-- | alacritty.yml | 4 | ||||
| -rw-r--r-- | nvim/after/plugin/ale.lua | 41 | ||||
| -rw-r--r-- | nvim/after/plugin/copilot.lua | 2 | ||||
| -rw-r--r-- | nvim/after/plugin/lsp.lua | 27 | ||||
| -rw-r--r-- | nvim/after/plugin/marksman.lua | 1 | ||||
| -rw-r--r-- | nvim/after/plugin/telescope.lua | 14 | ||||
| -rw-r--r-- | nvim/lua/lemon/packer.lua | 2 | ||||
| -rw-r--r-- | nvim/lua/lemon/set.lua | 1 | ||||
| -rw-r--r-- | tmux.conf | 3 |
9 files changed, 78 insertions, 17 deletions
diff --git a/alacritty.yml b/alacritty.yml index 575fbdf..afc2d2b 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -112,10 +112,10 @@ window: # Font configuration font: normal: - family: DejaVu Sans Mono + family: Jetbrains Mono style: Regular size: 13.0 -#font: +#font: # Normal (roman) font face #normal: # Font family diff --git a/nvim/after/plugin/ale.lua b/nvim/after/plugin/ale.lua new file mode 100644 index 0000000..da1415c --- /dev/null +++ b/nvim/after/plugin/ale.lua @@ -0,0 +1,41 @@ +-- Set the configuration options for the plugin +local linters = { + python = {'ruff'}, + ocaml = {'merlin'}, + cpp = {'clang'}, + yaml = {'yamllint'}, + c = {'clang'}, + go = {'gopls', 'golint', 'gofmt'}, +} + +local fixers = { + python = {'ruff', 'isort', 'yapf', 'black'}, + go = {'gofmt'}, + rust = {'rustfmt'}, +} + +local pyright_config = { + useLibraryCodeForTypes = 1, + disableLanguageServices = 1, + autoImportCompletions = 1, +} + +vim.api.nvim_set_var('ale_linters', linters) +vim.api.nvim_set_var('ale_python_pyright_config', pyright_config) +vim.api.nvim_set_var('ale_fix_on_save', 1) +vim.api.nvim_set_var('ale_warn_about_trailing_whitespace', 1) +vim.api.nvim_set_var('ale_disable_lsp', 1) +vim.api.nvim_set_var('ale_use_neovim_diagnostics_api', 1) +vim.api.nvim_set_var('ale_set_quickfix', 1) +vim.api.nvim_set_var('ale_echo_cursor', 1) +vim.api.nvim_set_var('ale_echo_msg_error_str', 'Error') +vim.api.nvim_set_var('ale_echo_msg_form', '%linter% - %code: %%s') +vim.api.nvim_set_var('ale_loclist_msg_format', '%linter% - %code: %%s') +vim.api.nvim_set_var('ale_echo_msg_warning_s', 'Warning') +vim.api.nvim_set_var('ale_fixers', fixers) +vim.api.nvim_set_var('ale_python_mypy_ignore_invalid_syntax', 1) +vim.api.nvim_set_var('ale_python_mypy_executable', 'mypy') +vim.api.nvim_set_var('ale_python_mypy_options', '--config-file mypy.ini') +vim.api.nvim_set_var('g:ale_sign_error', '>>') +vim.api.nvim_set_var('ale_fix_on_save', 1) +vim.api.nvim_set_var('ale_linters_explicit', 0) diff --git a/nvim/after/plugin/copilot.lua b/nvim/after/plugin/copilot.lua index f993a93..7ed6529 100644 --- a/nvim/after/plugin/copilot.lua +++ b/nvim/after/plugin/copilot.lua @@ -4,7 +4,7 @@ vim.api.nvim_set_keymap("i", "<C-J>", 'copilot#Accept("<CR>")', { silent = true, vim.g.copilot_filetypes = { ["*"] = false, - ["markdown"] = true, + ["markdown"] = false, ["javascript"] = false, ["typescript"] = false, ["lua"] = true, diff --git a/nvim/after/plugin/lsp.lua b/nvim/after/plugin/lsp.lua index 8005ccc..e6e2bda 100644 --- a/nvim/after/plugin/lsp.lua +++ b/nvim/after/plugin/lsp.lua @@ -18,24 +18,25 @@ lsp.configure('lua_ls', { }) -local cmp = require('cmp') -local cmp_select = {behavior = cmp.SelectBehavior.Select} -local cmp_mappings = lsp.defaults.cmp_mappings({ - ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), - ['<C-n>'] = cmp.mapping.select_next_item(cmp_select), - ['<C-y>'] = cmp.mapping.confirm({ select = true }), - ["<C-Space>"] = cmp.mapping.complete(), -}) +-- local cmp = require('cmp') +-- local cmp_select = {behavior = cmp.SelectBehavior.Select} +-- local cmp_mappings = lsp.defaults.cmp_mappings({ +-- ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), +-- ['<C-n>'] = cmp.mapping.select_next_item(cmp_select), +-- ['<C-y>'] = cmp.mapping.confirm({ select = true }), +-- ["<C-Space>"] = cmp.mapping.complete(), +-- }) -cmp_mappings['<Tab>'] = nil -cmp_mappings['<S-Tab>'] = nil +-- cmp_mappings['<Tab>'] = nil +-- cmp_mappings['<S-Tab>'] = nil lsp.setup_nvim_cmp({ mapping = cmp_mappings }) + lsp.set_preferences({ - suggest_lsp_servers = true, + suggest_lsp_servers = false, sign_icons = { error = 'E', warn = 'W', @@ -59,6 +60,10 @@ lsp.on_attach(function(client, bufnr) vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) end) +lsp.skip_server_setup({ + 'pylsp', +}) + lsp.setup() vim.diagnostic.config({ diff --git a/nvim/after/plugin/marksman.lua b/nvim/after/plugin/marksman.lua new file mode 100644 index 0000000..63865ef --- /dev/null +++ b/nvim/after/plugin/marksman.lua @@ -0,0 +1 @@ +require'lspconfig'.marksman.setup{} diff --git a/nvim/after/plugin/telescope.lua b/nvim/after/plugin/telescope.lua index 29f5a62..a004f9d 100644 --- a/nvim/after/plugin/telescope.lua +++ b/nvim/after/plugin/telescope.lua @@ -1,8 +1,16 @@ local builtin = require('telescope.builtin') -vim.keymap.set('n', '<leader>pf', builtin.find_files, {}) -vim.keymap.set('n', '<C-p>', builtin.git_files, {}) +vim.keymap.set('n', '<leader>ff', builtin.find_files, {}) +vim.keymap.set('n', '<leader>fg', builtin.live_grep, {}) +vim.keymap.set('n', '<leader>fb', builtin.buffers, {}) +vim.keymap.set('n', '<leader>fh', builtin.help_tags, {}) +vim.keymap.set('n', '<leader>fs', builtin.grep_string, {}) +vim.keymap.set('n', '<leader>fc', builtin.command_history, {}) +vim.keymap.set('n', '<leader>fk', builtin.keymaps, {}) +vim.keymap.set('n', '<leader>fl', builtin.diagnostics, {}) +vim.keymap.set('n', '<leader>fo', builtin.builtin, {}) + vim.keymap.set('n', '<leader>ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end) -vim.keymap.set('n', '<leader>vh', builtin.help_tags, {}) +require("telescope").load_extension("emoji") diff --git a/nvim/lua/lemon/packer.lua b/nvim/lua/lemon/packer.lua index d63cadc..b9d8782 100644 --- a/nvim/lua/lemon/packer.lua +++ b/nvim/lua/lemon/packer.lua @@ -19,6 +19,7 @@ local packer_bootstrap = ensure_packer() return require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' + use 'dense-analysis/ale' use { 'arnarg/todotxt.nvim', requires = {'MunifTanjim/nui.nvim'}, @@ -29,6 +30,7 @@ return require('packer').startup(function(use) -- or , branch = '0.1.x', requires = { {'nvim-lua/plenary.nvim'} } } + use('xiyaowong/telescope-emoji.nvim') use({ 'rose-pine/neovim', diff --git a/nvim/lua/lemon/set.lua b/nvim/lua/lemon/set.lua index 4347474..3c662a9 100644 --- a/nvim/lua/lemon/set.lua +++ b/nvim/lua/lemon/set.lua @@ -7,6 +7,7 @@ vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4 vim.opt.expandtab = true +vim.opt.autoindent = true vim.opt.smartindent = true @@ -2,6 +2,9 @@ # unbind some default keybindings unbind C-b +set-option -sa terminal-features ',screen-256color:RGB' +set-option -g focus-events on + # set shell #set -g default-shell '/bin/ksh' |