diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index efd98c2..482c573 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -4,8 +4,7 @@ font_size 11 repaint_delay 10 # Cursor -cursor #dfdfdf -cursor_text_color #7d7d7d +cursor_text_color #4c566a cursor_shape underline cursor_underline_thickness 1.3 cursor_blink_interval 0 @@ -30,23 +29,20 @@ map ctrl+backspace change_font_size all 0 # Theming background #f6f6f6 foreground #2a2b33 -cursor #D8DEE9 - -selection_background #f0ede4 -color0 #000000 -color8 #323232 -color1 #ff3333 -color9 #ff6565 -color2 #86b200 -color10 #b8e532 -color3 #f19618 -color11 #ffc849 -color4 #41a6d9 -color12 #73d7ff -color5 #f07078 -color13 #ffa3aa -color6 #4cbe99 -color14 #7ff0cb -color7 #ffffff -color15 #ffffff -selection_foreground #fafafa +cursor #d8dee9 +color0 #3b4252 +color8 #4c566a +color1 #bf616a +color9 #bf616a +color2 #a3be8c +color10 #a3be8c +color3 #ebcb8b +color11 #ebcb8b +color4 #81a1c1 +color12 #81a1c1 +color5 #b48ead +color13 #b48ead +color6 #88c0d0 +color14 #88c0d0 +color7 #e5e9f0 +color15 #e5e9f0 diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json new file mode 100644 index 0000000..8228fb5 --- /dev/null +++ b/config/nvim/coc-settings.json @@ -0,0 +1,12 @@ +{ + "javascript.suggestionActions.enabled": false, + "html.filetypes": ["ejs", "jst"], + "languageserver": { + "golang": { + "filetypes": ["go"], + "command": "gopls", + "rootPatterns": ["go.mod"], + "disableWorkspaceFolders": true + } + } +} diff --git a/config/nvim/coc.vim b/config/nvim/coc.vim new file mode 100644 index 0000000..a96f1ab --- /dev/null +++ b/config/nvim/coc.vim @@ -0,0 +1,9 @@ +ino pumvisible() ? "\" : "\" +ino pumvisible() ? "\" : "\" +map s (coc-rename) + +let g:coc_global_config = "$HOME/.config/nvim/coc-settings.json" +let g:coc_global_extensions = [ +\ "coc-tsserver", +\ "coc-html" +\ ] diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 8f58d87..ca8cad1 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -2,6 +2,7 @@ call plug#begin('~/.vim/plugged') Plug 'Smirnov-O/nten.vim' Plug 'jiangmiao/auto-pairs' Plug 'sheerun/vim-polyglot' + Plug 'neoclide/coc.nvim' Plug 'axvr/zepl.vim' call plug#end() @@ -23,37 +24,36 @@ set scrolloff=3 set enc=utf-8 fenc=utf-8 " Encoding set list listchars=tab:\|·,trail:~,space:· -" Tab -set tabstop=4 -set shiftwidth=4 -set softtabstop=4 -set smarttab -set expandtab -set autoindent +"== Tab(or spaces) +set ts=4 sw=4 sts=4 +set sta et ai "== Netrw file tree -let g:netrw_liststyle=3 -let g:netrw_banner=0 -let g:netrw_dirhistmax=0 +let g:netrw_liststyle = 3 +let g:netrw_banner = 0 +let g:netrw_dirhistmax = 0 "== Custom setting for another files -au FileType python,elm setlocal ex sw=4 ts=4 -au FileType javascript,javascriptreact,json,yaml setlocal ex sw=2 ts=2 +au FileType python,elm setl sw=4 ts=4 +au FileType javascript,javascriptreact,json,yaml setl sw=2 ts=2 "== Custom commands -com! Term :vs|winc L|se nu! rnu!|start|term -com! Prettier :silent !prettier -w % -com! Black :silent !black % -com! ElmFmt :silent !elm-format --yes % -com! GoFmt :silent !gofmt -w % +com! -nargs=1 REpl :cal zepl#start("")|winc L|se nonu nornu +com! Prettier :sil !prettier -w % +com! Term :vs|winc L|se nonu nornu|term +com! GoFmt :sil !gofmt -w % +com! Black :sil !black % "== Mapping let mapleader=";" + nn :w nn :noh - tno + nn t :Term +nn r :REpl +nn e :Ex nn j :bn nn k :bp nn w :bd @@ -67,3 +67,6 @@ nn cpp :ReplSend vn cpp :ReplSend nn spv :vs nn sph :sp + +"== LSP(coc) +so $HOME/.config/nvim/coc.vim diff --git a/tmux.conf b/tmux.conf index 65562b6..99ffb8a 100644 --- a/tmux.conf +++ b/tmux.conf @@ -48,16 +48,13 @@ bind - split-window -h bind Tab last-window ###== Status bar -## Position -set-option -g status-position top - ## Items set -g status-right ' #{?client_prefix,*,} #S ' set -g status-left ' ' ## Colors set -g status-bg default -set -g status-fg white +set -g status-fg black set -g status-style fg=colour110 ###== Pane border colors diff --git a/vscode/settings.json b/vscode/settings.json index 4a50cb9..61df50f 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -21,10 +21,8 @@ "git.enableSmartCommit": true, "prettier.semi": false, - "tabnine.experimentalAutoImports": true, - "emmet.includeLanguages": { "javascript": "javascriptreact" }, @@ -34,7 +32,5 @@ "[javascriptreact]":{ "editor.defaultFormatter": "esbenp.prettier-vscode", }, - "workbench.startupEditor": "newUntitledFile", - "editor.suggestSelection": "first", - "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", + "html.format.enable": false, } diff --git a/zshrc b/zshrc index 32a55c1..38921fb 100644 --- a/zshrc +++ b/zshrc @@ -1,4 +1,4 @@ -export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.n/bin:$HOME/.golang/bin:$HOME/go/bin:$PATH" +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$HOME/go/bin:$PATH" export GOPATH="$HOME/go" export EDITOR="nvim" @@ -12,18 +12,22 @@ export FZF_DEFAULT_COMMAND="rg --files --ignore-vcs" export OMH="$HOME/.oh-my-zsh" # ZSH_THEME="simple" DISABLE_AUTO_TITLE="true" -plugins=(docker npm) +plugins=(docker nvm npm) source $OMH/oh-my-zsh.sh ### Aliases -source ~/.aliases.sh alias cls="clear" alias mkdir="mkdir -p" alias cp="cp -r" alias vim="nvim" alias vi="vim" -alias vimfzf='vim $(fzf)' -alias e="$EDITOR" alias tmux="tmux -2" +alias e="$EDITOR" alias :q="exit" alias ...="cd ../.." +alias .3="cd ../../.." +alias gog="go get" +alias gor="go run" +alias gob="go build" +alias pacs="sudo pacman -S" +alias pacr="sudo pacman -R"