From 0f6b4b6cd8e3abfd015f50a7a7b9e220cd1dd8a1 Mon Sep 17 00:00:00 2001 From: JaeYoo-Im Date: Mon, 26 Aug 2024 13:06:22 +0900 Subject: [PATCH] change vim config lua style. --- .config/nvim/init.lua | 15 +++ .config/nvim/init.vim | 129 ------------------------ .config/nvim/lua/plugins.lua | 1 + .config/nvim/lua/plugins/etc.lua | 25 +++++ .config/nvim/lua/plugins/git.lua | 14 +++ .config/nvim/lua/plugins/lsp-config.lua | 25 +++++ .config/nvim/lua/plugins/lualine.lua | 12 +++ .config/nvim/lua/plugins/neo-tree.lua | 12 +++ .config/nvim/lua/plugins/suda.lua | 6 ++ .config/nvim/lua/plugins/themes.lua | 49 +++++++++ .config/nvim/lua/plugins/treesitter.lua | 12 +++ .config/nvim/lua/vim-options.lua | 53 ++++++++++ .config/nvim/plugList.vim | 25 ----- .zshrc | 8 +- 14 files changed, 227 insertions(+), 159 deletions(-) create mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/init.vim create mode 100644 .config/nvim/lua/plugins.lua create mode 100644 .config/nvim/lua/plugins/etc.lua create mode 100644 .config/nvim/lua/plugins/git.lua create mode 100644 .config/nvim/lua/plugins/lsp-config.lua create mode 100644 .config/nvim/lua/plugins/lualine.lua create mode 100644 .config/nvim/lua/plugins/neo-tree.lua create mode 100644 .config/nvim/lua/plugins/suda.lua create mode 100644 .config/nvim/lua/plugins/themes.lua create mode 100644 .config/nvim/lua/plugins/treesitter.lua create mode 100644 .config/nvim/lua/vim-options.lua delete mode 100644 .config/nvim/plugList.vim diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..56aacdb --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,15 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup("plugins") +require("vim-options") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index 57c4a1c..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,129 +0,0 @@ -" Vim Configuration -set nocompatible "move using arrow key -"filtype plugin on -set number -set ai "auto indent -set si "smart indent -set cindent " c style indent - -set shiftwidth=4 "shift order 4step -set tabstop=4 "tab order 4step -set hlsearch "highlight empathize the word. - -set history=1000 "history store depth -set nobackup "no generate swp file -set noswapfile -set nowritebackup -set backupdir=~/.backup/ -set directory=~/.backup/ - -set ruler "display the cursor position -set title "display the title -set showmatch "display the matched bracket -"set nowrap "no auto linefeed -set wmnu "auto word finder - -set autochdir " auto change working directory - -set hidden "buffer hidden -set updatetime=300 " 300ms -set cmdheight=2 " Better display for messages -set shortmess+=c " don't give [ins-completion-menu] messages. -set signcolumn=yes " always show signcolumns - - -set backspace=indent,eol,start -set fencs=ucs-bom,utf-8,cp949 -set clipboard^=unnamed,unnamedplus - -set mouse=a - -" PluginManager in vimrc -runtime plugList.vim - -""""""""""""""""""""""""""""""""""""""""""""""""""" -" Colorscheme -""""""""""""""""""""""""""""""""""""""""""""""""""" -"""""""""""""" One Dark -"colorscheme onedark -"""""""""""""" Grub_box -let g:gruvbox_contrast_dark='soft' -set background=dark -colorscheme gruvbox -let g:airline_theme='gruvbox' -"""""""""""""" Paper Color -"set background=light -"colorscheme PaperColor -"let g:airline_theme='hybrid' -"let g:PaperColor_Theme_Options = { -" \ 'theme': { -" \ 'default.light': { -" \ 'transparent_background': 1 -" \ } -" \ } -" \ } -"""""""""""""" Molokai -"let g:molokai_original = 1 -"colorscheme molokai -"""""""""""""" Solarized 8 -"set background=light -"colorscheme solarized8_high -"let g:airline_theme='solarized8' -"""""""""""""" Challenger Deep -"colorscheme challenger_deep -"colorscheme palenight - -""""""""""""""""""""""""""""""""""""""""""""""""""" -" Air-line -""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:airline#extensions#tabline#enabled = 1 " turn on buffer list -set laststatus=2 " turn on bottom bar - - -"""""""""""""""""""""""""""""""""""""""""""""""""" -" Git Gutter -"""""""""""""""""""""""""""""""""""""""""""""""""" -let g:gitgutter_highlight_lines = 1 -map :GitGutterLineHighlightsToggle - - -"""""""""""""""""""""""""""""""""""""""""""""""""" -" easymotion -"""""""""""""""""""""""""""""""""""""""""""""""""" -" f{char} to move to {char} -"map f (easymotion-bd-f) -"nmap f (easymotion-overwin-f) - -" s{char}{char} to move to {char}{char} -nmap s (easymotion-overwin-f2) - -" Move to line -"map L (easymotion-bd-jk) -"nmap L (easymotion-overwin-line) - -" Move to word -map w (easymotion-bd-w) -nmap w (easymotion-overwin-w) - -map "+ygv"*y -map "+p -map :cd %:p:h:term bash -map @a -map "byaw/incNumber/b -cw"bp - -"""""""""""""""""""""""""""""""""""""""""""""""""" -" Visual-star (Search using * / in visual modde) -"""""""""""""""""""""""""""""""""""""""""""""""""" -xnoremap * :call VSetSearch('/')/=@/ -xnoremap # :call VSetSearch('?')?=@/ - -function! s:VSetSearch(cmdtype) - let temp = @s - norm! gv"sy - let @/ = '\V' . substitute(escape(@s, a:cmdtype.'\'), '\n', '\\n', 'g') - let @s = temp -endfunction - - - diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/nvim/lua/plugins.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/nvim/lua/plugins/etc.lua b/.config/nvim/lua/plugins/etc.lua new file mode 100644 index 0000000..2481f00 --- /dev/null +++ b/.config/nvim/lua/plugins/etc.lua @@ -0,0 +1,25 @@ +return { + { + "tpope/vim-unimpaired", + config = function() + end + }, + { + "tpope/vim-commentary", + config = function() + end + }, + { + "tpope/vim-surround", + config = function() + end + }, + { + "easymotion/vim-easymotion", + config = function() + vim.keymap.set('n', 's', '(easymotion-overwin-f2)', {}) + vim.keymap.set('n', 'w', '(easymotion-bd-w)', {}) + -- vim.keymap.set('n', 'w', '(easymotion-bd-w)', {}) + end + }, +} diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua new file mode 100644 index 0000000..a3cfe80 --- /dev/null +++ b/.config/nvim/lua/plugins/git.lua @@ -0,0 +1,14 @@ +return { + { + "tpope/vim-fugitive", -- git wrapper + config = function() + end + }, + { + "airblade/vim-gitgutter", -- git modified view; + config = function() + vim.g.gitgutter_highlight_lines = 1 + vim.keymap.set({'n', 'v'}, '', ':GitGutterLineHighlightsToggle', {}) + end + }, +} diff --git a/.config/nvim/lua/plugins/lsp-config.lua b/.config/nvim/lua/plugins/lsp-config.lua new file mode 100644 index 0000000..f41e798 --- /dev/null +++ b/.config/nvim/lua/plugins/lsp-config.lua @@ -0,0 +1,25 @@ +return { + { + "williamboman/mason.nvim", + config = function() + require("mason").setup() + end + }, + { + "williamboman/mason-lspconfig.nvim", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = {"lua_ls", "clangd", "cmake", "cssls", "html"} + }) + end + }, + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require("lspconfig") + lspconfig.lua_ls.setup({}) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) + end + } +} + diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..dd67160 --- /dev/null +++ b/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,12 @@ +return { + 'nvim-lualine/lualine.nvim', + config = function() + require('lualine').setup({ + options = { + icons_enabled = true, + theme = 'auto' + } + }) + end +} + diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..9c09d1f --- /dev/null +++ b/.config/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,12 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set('n', '', ':Neotree filesystem reveal left', {}) + -- vim.keymap.set('n', '', ':Neotree filesystem reveal left', {}) + end +} diff --git a/.config/nvim/lua/plugins/suda.lua b/.config/nvim/lua/plugins/suda.lua new file mode 100644 index 0000000..b0c305f --- /dev/null +++ b/.config/nvim/lua/plugins/suda.lua @@ -0,0 +1,6 @@ +return { + 'lambdalisue/suda.vim', + config = function() + end +} + diff --git a/.config/nvim/lua/plugins/themes.lua b/.config/nvim/lua/plugins/themes.lua new file mode 100644 index 0000000..9a6e986 --- /dev/null +++ b/.config/nvim/lua/plugins/themes.lua @@ -0,0 +1,49 @@ +return { + { + "NLKNguyen/papercolor-theme", + config = function() + -- vim.cmd("set background=light") + -- vim.cmd.colorscheme "PaperColor" + end + }, + { + "tomasr/molokai", + config = function() + -- vim.cmd.colorscheme "molokai" + end + }, + { + "joshdick/onedark.vim", + config = function() + -- vim.cmd.colorscheme "onedark" + end + }, + { + 'morhetz/gruvbox', + config = function() + -- vim.g.gruvbox_contrast_dark='soft' + -- vim.cmd("set background=dark") + -- vim.cmd.colorscheme "gruvbox" + end + }, + { + "drewtempelmeyer/palenight.vim", + config = function() + -- vim.cmd.colorscheme "palenight" + end + }, + { + "challenger-deep-theme/vim", + name = "challenger_deep", + config = function() + -- vim.cmd.colorscheme "challenger_deep" + end + }, + { + "catppuccin/nvim", + config = function() + vim.cmd.colorscheme "catppuccin" + end + }, +} + diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..6550b68 --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,12 @@ +return { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local configs = require("nvim-treesitter.configs") + configs.setup({ + ensure_installed = {"lua", "c", "rust", "verilog"}, + highlight = { enable = true }, + indent = { enable = true } + }) + end +} diff --git a/.config/nvim/lua/vim-options.lua b/.config/nvim/lua/vim-options.lua new file mode 100644 index 0000000..b17909f --- /dev/null +++ b/.config/nvim/lua/vim-options.lua @@ -0,0 +1,53 @@ +-- Vim Configuration +vim.cmd("set nocompatible") -- move using arrow key +-- filtype plugin on +vim.cmd("set number") +vim.cmd("set ai") -- auto indent +vim.cmd("set si") -- smart indent +vim.cmd("set cindent") -- c style indent + +vim.cmd("set shiftwidth=4") -- shift order 4step +vim.cmd("set tabstop=4") -- tab order 4step +vim.cmd("set hlsearch") -- highlight empathize the word. + +vim.cmd("set history=1000") -- history store depth +vim.cmd("set nobackup") -- no generate swp file +vim.cmd("set noswapfile") +vim.cmd("set nowritebackup") +vim.cmd("set backupdir=~/.backup/") +vim.cmd("set directory=~/.backup/") + +vim.cmd("set ruler") -- display the cursor position +vim.cmd("set title") -- display the title +vim.cmd("set showmatch") -- display the matched bracket +-- set nowrap "no auto linefeed +vim.cmd("set wmnu") -- auto word finder + +vim.cmd("set autochdir") -- auto change working directory + +vim.cmd("set hidden") -- buffer hidden +vim.cmd("set updatetime=300") -- 300ms +vim.cmd("set cmdheight=2") -- Better display for messages +vim.cmd("set shortmess+=c") -- don't give [ins-completion-menu] messages. +vim.cmd("set signcolumn=yes") -- always show signcolumns + + +vim.cmd("set backspace=indent,eol,start") +vim.cmd("set fencs=ucs-bom,utf-8,cp949") +-- vim.cmd("set clipboard^=unnamed,unnamedplus") +vim.cmd("set clipboard+=unnamedplus") + +vim.cmd("set mouse=a") + +-- normal +vim.keymap.set('n', '', 'h', {}) +vim.keymap.set('n', '', 'l', {}) +vim.keymap.set('n', '', 'j', {}) +vim.keymap.set('n', '', 'k', {}) +-- vim.keymap.set('n', '', '"*y', {}) +-- vim.keymap.set('n', '', '"*p', {}) +-- +vim.keymap.set('n', '', ':cd %:p:h:term zsh', {}) +vim.keymap.set('n', '', '@a', {}) + + diff --git a/.config/nvim/plugList.vim b/.config/nvim/plugList.vim deleted file mode 100644 index 70ecdd6..0000000 --- a/.config/nvim/plugList.vim +++ /dev/null @@ -1,25 +0,0 @@ -call plug#begin('~/.vim/plugged') -Plug 'lambdalisue/suda.vim' -" color scheme -Plug 'morhetz/gruvbox' -"Plug 'lifepillar/vim-solarized8' -"Plug 'NLKNguyen/papercolor-theme' -"Plug 'tomasr/molokai' -"Plug 'joshdick/onedark.vim' -"Plug 'challenger-deep-theme/vim', { 'as': 'challenger-deep' } -Plug 'drewtempelmeyer/palenight.vim' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'tpope/vim-unimpaired' -Plug 'tpope/vim-commentary' -Plug 'tpope/vim-fugitive' " git wrapper -Plug 'airblade/vim-gitgutter' " git modified view; -Plug 'tpope/vim-surround' -Plug 'easymotion/vim-easymotion' - -"Plug 'neoclide/coc.nvim', {'branch': 'release'} - - - -call plug#end() - diff --git a/.zshrc b/.zshrc index 7c91935..ff661c1 100644 --- a/.zshrc +++ b/.zshrc @@ -35,11 +35,9 @@ alias ytv-best="youtube-dl -f bestvideo+bestaudio " alias startsv="ssh odroid startsv" alias stopsv="ssh odroid stopsv" -alias ls="exa -al --color=always --group-directories-first" -alias la="exa -a --color=always --group-directories-first" -alias ll="exa -l --color=always --group-directories-first" -alias lt="exa -aT --color=always --group-directories-first" -alias l.='exa -a | egrep "^\."' +alias ls="eza -a --icons" +alias ll="eza -al --icons" +alias lt="eza -a --tree --level=1 --icons" # WSL2 if [[ $JUPCID == "WSL" ]];then