From 0a17c0ca16555c2dd2868573accd1b3cedbd643b Mon Sep 17 00:00:00 2001 From: bumpsoo Date: Tue, 9 Jan 2024 13:58:10 +0900 Subject: [PATCH] wsl -> linux --- .config/nvim/lua/bumpsoo/init.lua | 10 -- .config/nvim/lua/bumpsoo/plugins/fugitive.lua | 8 +- .../nvim/lua/bumpsoo/plugins/lspconfig.lua | 157 ++++++++---------- .../nvim/lua/bumpsoo/plugins/solarized.lua | 10 ++ .../nvim/lua/bumpsoo/plugins/telescope.lua | 16 +- .../nvim/lua/bumpsoo/plugins/tokyonight.lua | 9 - .../nvim/lua/bumpsoo/plugins/treesitter.lua | 37 ++--- .config/nvim/lua/bumpsoo/set.lua | 7 +- .tmux.conf | 5 + README.md | 18 +- 10 files changed, 121 insertions(+), 156 deletions(-) create mode 100644 .config/nvim/lua/bumpsoo/plugins/solarized.lua delete mode 100644 .config/nvim/lua/bumpsoo/plugins/tokyonight.lua diff --git a/.config/nvim/lua/bumpsoo/init.lua b/.config/nvim/lua/bumpsoo/init.lua index 4c4468f..9bff40b 100644 --- a/.config/nvim/lua/bumpsoo/init.lua +++ b/.config/nvim/lua/bumpsoo/init.lua @@ -1,13 +1,3 @@ -vim.opt.clipboard = "unnamedplus" -if vim.fn.has('wsl') == 1 then - vim.api.nvim_create_autocmd('TextYankPost', { - group = vim.api.nvim_create_augroup('Yank', { clear = true }), - callback = function() - vim.fn.system('clip.exe', vim.fn.getreg('"')) - end, - }) -end - require("bumpsoo.remap") require("bumpsoo.lazy") require("bumpsoo.set") diff --git a/.config/nvim/lua/bumpsoo/plugins/fugitive.lua b/.config/nvim/lua/bumpsoo/plugins/fugitive.lua index 858c38e..7e058e3 100644 --- a/.config/nvim/lua/bumpsoo/plugins/fugitive.lua +++ b/.config/nvim/lua/bumpsoo/plugins/fugitive.lua @@ -1,6 +1,6 @@ return { - "tpope/vim-fugitive", - config = function() - vim.keymap.set("n", "gs", vim.cmd.Git) - end + "tpope/vim-fugitive", + config = function() + vim.keymap.set("n", "gs", vim.cmd.Git) + end } diff --git a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua index 5272485..81a1aaa 100644 --- a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua +++ b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua @@ -1,93 +1,78 @@ local config = function() - -- Add additional capabilities supported by nvim-cmp - local capabilities = require("cmp_nvim_lsp").default_capabilities() - local lspconfig = 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 - -- Mappings. - local opts = { noremap=true, silent=true } - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gD', 'tab split | lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'tab split | lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'gR', 'lua vim.lsp.buf.rename()', 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', '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', 'ca', 'lua vim.lsp.buf.code_action()', opts) --- buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) --- buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - end + -- Add additional capabilities supported by nvim-cmp + local capabilities = require("cmp_nvim_lsp").default_capabilities() + local lspconfig = 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 + -- Mappings. + local opts = { noremap=true, silent=true } + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gD', 'tab split | lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'tab split | lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'gR', 'lua vim.lsp.buf.rename()', opts) + end - -- Enable some language servers with the additional - -- completion capabilities offered by nvim-cmp - local servers = { 'gopls', 'erlangls' } - for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } - end - - local luasnip = require 'luasnip' - - local cmp = require 'cmp' - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), -- Up - [''] = cmp.mapping.scroll_docs(4), -- Down - -- C-b (back) C-f (forward) for snippet placeholder navigation. - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), - }), - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - }, - } + -- Enable some language servers with the additional + -- completion capabilities offered by nvim-cmp + local servers = { 'gopls', 'erlangls' } + for _, lsp in ipairs(servers) do + lspconfig[lsp].setup { + on_attach = on_attach, + capabilities = capabilities, + } + end + local luasnip = require 'luasnip' + local cmp = require 'cmp' + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), -- Up + [''] = cmp.mapping.scroll_docs(4), -- Down + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { 'i', 's' }), + }), + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, + } end return { - "neovim/nvim-lspconfig", - dependencies = { - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-nvim-lsp', - 'saadparwaiz1/cmp_luasnip', - 'L3MON4D3/LuaSnip', - }, - config = config + "neovim/nvim-lspconfig", + dependencies = { + 'hrsh7th/nvim-cmp', + 'hrsh7th/cmp-nvim-lsp', + 'saadparwaiz1/cmp_luasnip', + 'L3MON4D3/LuaSnip', + }, + config = config } diff --git a/.config/nvim/lua/bumpsoo/plugins/solarized.lua b/.config/nvim/lua/bumpsoo/plugins/solarized.lua new file mode 100644 index 0000000..f7cff58 --- /dev/null +++ b/.config/nvim/lua/bumpsoo/plugins/solarized.lua @@ -0,0 +1,10 @@ +return { + 'maxmx03/solarized.nvim', + lazy = false, + priority = 1000, + config = function() + vim.o.background = 'light' + + vim.cmd.colorscheme 'solarized' + end, +} diff --git a/.config/nvim/lua/bumpsoo/plugins/telescope.lua b/.config/nvim/lua/bumpsoo/plugins/telescope.lua index 7b4cf98..572b9c6 100644 --- a/.config/nvim/lua/bumpsoo/plugins/telescope.lua +++ b/.config/nvim/lua/bumpsoo/plugins/telescope.lua @@ -1,10 +1,10 @@ return { - 'nvim-telescope/telescope.nvim', tag = '0.1.4', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local builtin = require('telescope.builtin') - vim.keymap.set('n', 'ff', builtin.find_files, {}) - vim.keymap.set('n', 'fg', builtin.live_grep, {}) - vim.keymap.set('n', 'ft', builtin.help_tags, {}) - end + 'nvim-telescope/telescope.nvim', tag = '0.1.4', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local builtin = require('telescope.builtin') + vim.keymap.set('n', 'ff', builtin.find_files, {}) + vim.keymap.set('n', 'fg', builtin.live_grep, {}) + vim.keymap.set('n', 'ft', builtin.help_tags, {}) + end } diff --git a/.config/nvim/lua/bumpsoo/plugins/tokyonight.lua b/.config/nvim/lua/bumpsoo/plugins/tokyonight.lua deleted file mode 100644 index 4588d2a..0000000 --- a/.config/nvim/lua/bumpsoo/plugins/tokyonight.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - config = function() - vim.cmd[[colorscheme tokyonight-day]] - end -} diff --git a/.config/nvim/lua/bumpsoo/plugins/treesitter.lua b/.config/nvim/lua/bumpsoo/plugins/treesitter.lua index 58b57e2..334ae33 100644 --- a/.config/nvim/lua/bumpsoo/plugins/treesitter.lua +++ b/.config/nvim/lua/bumpsoo/plugins/treesitter.lua @@ -1,21 +1,20 @@ - return { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function() - local cfg = require("nvim-treesitter.configs") - cfg.setup({ - highlight = { - enable = true, - }, - indent = { - enable = true, - }, - ensure_installed = { - "json", - "erlang", - "lua", - }, - }) - end + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local cfg = require("nvim-treesitter.configs") + cfg.setup({ + highlight = { + enable = true, + }, + indent = { + enable = true, + }, + ensure_installed = { + "json", + "erlang", + "lua", + }, + }) + end } diff --git a/.config/nvim/lua/bumpsoo/set.lua b/.config/nvim/lua/bumpsoo/set.lua index 022f26e..6ede3d0 100644 --- a/.config/nvim/lua/bumpsoo/set.lua +++ b/.config/nvim/lua/bumpsoo/set.lua @@ -5,13 +5,14 @@ vim.opt.colorcolumn = "80" vim.opt.list = true vim.opt.listchars = { - tab = "→ ", - space = "·", - nbsp = "+", + tab = "→ ", + space = "·", + nbsp = "+", } vim.opt.tabstop = 2 vim.opt.softtabstop = 2 vim.opt.shiftwidth = 2 vim.opt.smartindent = true +vim.opt.expandtab = true diff --git a/.tmux.conf b/.tmux.conf index f27a923..e26c8f3 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1 +1,6 @@ setw -g mode-keys vi + +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel +bind-key -T copy-mode-vi 'r' send -X rectangle-toggle + diff --git a/README.md b/README.md index fecc0c7..96d2157 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,4 @@ -### from wsl - alpine - -running [mini root fs](https://www.alpinelinux.org/downloads/) - -``` -wsl --import Alpine 'E:\alpine\' E:\alpine-minirootfs-3.18.4-x86_64.tar -``` - -dependencies - -``` -apk add neovim tmux git openssh ripgrep curl gcc go - -go install golang.org/x/tools/gopls@latest -``` - -### dev configuration for alpine linux +### dev configuration for linux - neovim (.config/nvim/\*) - git (.gitconfig ~/personal/.gitconfig)