diff --git a/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh b/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh index 11daf3d..1063780 100644 --- a/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh +++ b/home/.chezmoiscripts/run_once_after_20_install_vim_dep.sh @@ -3,7 +3,7 @@ PATH="$HOME/apps/go/bin:$HOME/apps/node/bin:$PATH" if command -v npm > /dev/null; then - npm i -g typescript typescript-language-server dockerfile-language-server-nodejs + npm i -g typescript typescript-language-server dockerfile-language-server-nodejs svelte-language-server fi if command -v go > /dev/null; then diff --git a/home/dot_config/nvim/lua/basic/setup.lua b/home/dot_config/nvim/lua/basic/setup.lua index abdaf42..82421ef 100644 --- a/home/dot_config/nvim/lua/basic/setup.lua +++ b/home/dot_config/nvim/lua/basic/setup.lua @@ -59,5 +59,9 @@ vim.api.nvim_create_autocmd("BufWritePost", { command = [[ ! chezmoi apply --source-path % ]], }) -vim.diagnostic.config({virtual_text = false, signs = false}) +vim.diagnostic.get(0, { severity = { + vim.diagnostic.severity.ERROR, + vim.diagnostic.severity.WARN, +} }) +vim.diagnostic.config({virtual_text = false, signs = true}) diff --git a/home/dot_config/nvim/lua/plugins/list.lua b/home/dot_config/nvim/lua/plugins/list.lua index 240d373..3d8963f 100644 --- a/home/dot_config/nvim/lua/plugins/list.lua +++ b/home/dot_config/nvim/lua/plugins/list.lua @@ -24,7 +24,7 @@ return { require('plugins.ale'), "mattn/emmet-vim", require('plugins.go'), - + { "pangloss/vim-javascript", config = function () @@ -53,7 +53,7 @@ return { "inkarkat/vim-mark", "rking/ag.vim", - + { "terryma/vim-multiple-cursors", config = function () @@ -109,9 +109,22 @@ return { "vim-scripts/TaskList.vim", "google/vim-jsonnet", + { + "github/copilot.vim", + keys = { + {'', 'copilot#Accept("")', mode = 'i', silent = true, expr = true, noremap = true, replace_keycodes = false}, + }, + lazy = false, + init = function () + vim.g.copilot_no_tab_map = true + end + }, + -- temp plugins "elkowar/yuck.vim", + "evanleck/vim-svelte", + -- themes "tomasr/molokai", } diff --git a/home/dot_config/nvim/lua/plugins/lsp.lua b/home/dot_config/nvim/lua/plugins/lsp.lua index 4abd662..c116fb9 100644 --- a/home/dot_config/nvim/lua/plugins/lsp.lua +++ b/home/dot_config/nvim/lua/plugins/lsp.lua @@ -35,8 +35,9 @@ return { 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', 'ge', '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', 'do', 'lua vim.lsp.diagnostic.open_float()', 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 @@ -59,6 +60,10 @@ return { capabilities = capabilities, on_attach = on_attach, } + nvlsp['svelte'].setup{ + capabilities = capabilities, + on_attach = on_attach, + } end } diff --git a/home/dot_config/sway/wallpaper.png b/home/dot_config/sway/wallpaper.png index 8735296..3131cc6 100644 Binary files a/home/dot_config/sway/wallpaper.png and b/home/dot_config/sway/wallpaper.png differ diff --git a/home/dot_config/sway/wallpaper_old.png b/home/dot_config/sway/wallpaper_old.png new file mode 100644 index 0000000..8735296 Binary files /dev/null and b/home/dot_config/sway/wallpaper_old.png differ diff --git a/home/dot_zsh/50_setopt.zsh b/home/dot_zsh/50_setopt.zsh index ff76434..813d46f 100644 --- a/home/dot_zsh/50_setopt.zsh +++ b/home/dot_zsh/50_setopt.zsh @@ -123,7 +123,7 @@ setopt share_history setopt hist_reduce_blanks # Write to the history file immediately, not when the shell exits. -setopt inc_append_history +# setopt inc_append_history # Remove comannd of 'hostory' or 'fc -l' from history list setopt hist_no_store @@ -138,7 +138,7 @@ setopt extended_history setopt hist_ignore_space # Append to history file -setopt append_history +# setopt append_history # Edit history file during call history before executing setopt hist_verify diff --git a/home/dot_zshrc.tmpl b/home/dot_zshrc.tmpl index f57de2e..5e47b68 100644 --- a/home/dot_zshrc.tmpl +++ b/home/dot_zshrc.tmpl @@ -3,6 +3,10 @@ export ZSH_TMUX_AUTOSTART=true export ZSH_TMUX_AUTOSTART_ONCE=true export ZSH_TMUX_AUTOCONNECT=true {{ end }} +export HISTFILE="$HOME/.zsh_history" +#export HISTFILESIZE=100000 +export HISTSIZE=100000 +export SAVEHIST=100 # install zinit # git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin