diff --git a/darwin/alacritty/alacritty.yml b/darwin/alacritty/alacritty.yml index e86c9dd..d57e933 100644 --- a/darwin/alacritty/alacritty.yml +++ b/darwin/alacritty/alacritty.yml @@ -1,5 +1,5 @@ import: - - ~/.config/alacritty/dracula.yml + - ~/.config/alacritty/base16-tomorrow.yml window: dimensions: @@ -10,11 +10,10 @@ window: x: 6 y: 6 - decorations: none font: normal: family: TerminessTTF Nerd Font size: 16.0 colors: -background_opacity: 0.9 +background_opacity: 1 diff --git a/darwin/alacritty/base16-tomorrow.yml b/darwin/alacritty/base16-tomorrow.yml new file mode 100644 index 0000000..e97004f --- /dev/null +++ b/darwin/alacritty/base16-tomorrow.yml @@ -0,0 +1,36 @@ +# Base16 Tomorrow - alacritty color config +# Chris Kempson (http://chriskempson.com) +colors: + # Default colors + primary: + background: '0xffffff' + foreground: '0x4d4d4c' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0xffffff' + cursor: '0x4d4d4c' + + # Normal colors + normal: + black: '0xffffff' + red: '0xc82829' + green: '0x718c00' + yellow: '0xeab700' + blue: '0x4271ae' + magenta: '0x8959a8' + cyan: '0x3e999f' + white: '0x4d4d4c' + + # Bright colors + bright: + black: '0x8e908c' + red: '0xf5871f' + green: '0xe0e0e0' + yellow: '0xd6d6d6' + blue: '0x969896' + magenta: '0x282a2e' + cyan: '0xa3685a' + white: '0x1d1f21' + +draw_bold_text_with_bright_colors: false diff --git a/darwin/alacritty/dracula.yml b/darwin/alacritty/dracula.yml deleted file mode 100644 index e128f82..0000000 --- a/darwin/alacritty/dracula.yml +++ /dev/null @@ -1,53 +0,0 @@ -colors: - primary: - background: '0x282a36' - foreground: '0xf8f8f2' - cursor: - text: CellBackground - cursor: CellForeground - vi_mode_cursor: - text: CellBackground - cursor: CellForeground - search: - matches: - foreground: '0x44475a' - background: '0x50fa7b' - focused_match: - foreground: '0x44475a' - background: '0xffb86c' - bar: - background: '0x282a36' - foreground: '0xf8f8f2' - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: '0x44475a' - normal: - black: '0x000000' - red: '0xff5555' - green: '0x50fa7b' - yellow: '0xf1fa8c' - blue: '0xbd93f9' - magenta: '0xff79c6' - cyan: '0x8be9fd' - white: '0xbfbfbf' - bright: - black: '0x4d4d4d' - red: '0xff6e67' - green: '0x5af78e' - yellow: '0xf4f99d' - blue: '0xcaa9fa' - magenta: '0xff92d0' - cyan: '0x9aedfe' - white: '0xe6e6e6' - dim: - black: '0x14151b' - red: '0xff2222' - green: '0x1ef956' - yellow: '0xebf85b' - blue: '0x4d5b86' - magenta: '0xff46b0' - cyan: '0x59dffc' - white: '0xe6e6d1' diff --git a/omz/vbalien.zsh-theme b/omz/vbalien.zsh-theme index 25f49e8..179a2e1 100644 --- a/omz/vbalien.zsh-theme +++ b/omz/vbalien.zsh-theme @@ -39,8 +39,6 @@ case ${SOLARIZED_THEME:-dark} in *) CURRENT_FG='black';; esac -CURRENT_FG='8' - # Special Powerline characters () { diff --git a/tmux.conf b/tmux.conf index 8f1c283..36041fa 100644 --- a/tmux.conf +++ b/tmux.conf @@ -3,7 +3,7 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-yank' -set -g @plugin 'dracula/tmux' +set -g @plugin 'mattdavis90/base16-tmux' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run -b '~/.tmux/plugins/tpm/tpm' @@ -16,6 +16,7 @@ set -g default-terminal screen-256color bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' +set -g @colors-base16 'tomorrow' # bind -n End send-key C-e # bind -n Home send-key C-a diff --git a/vimrc b/vimrc index 0898996..31c6168 100644 --- a/vimrc +++ b/vimrc @@ -7,6 +7,7 @@ Plug 'prettier/vim-prettier', { " 아이콘 폰트 사용 Plug 'ryanoasis/vim-devicons' + " NERDTree " NERDTree git Plug 'preservim/nerdtree' @@ -25,7 +26,10 @@ Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' " 컬러 테마 -Plug 'dracula/vim', { 'as': 'dracula' } +Plug 'chriskempson/base16-vim' + +" automatic closing of quotes, parenthesis, brackets, etc. +Plug 'Raimondi/delimitMate' " Language Pack Plug 'sheerun/vim-polyglot' @@ -70,6 +74,7 @@ set encoding=UTF-8 " 단축키 설정 nmap :FZF nmap :NERDTreeToggle +nmap f (coc-fix-current) inoremap pumvisible() ? "\" : "\" inoremap pumvisible() ? "\" : "\" @@ -78,9 +83,7 @@ inoremap pumvisible() ? "\" : "\" autocmd BufNewFile,BufRead *.tsx,*.jsx set filetype=typescriptreact " theme config -let g:dracula_colorterm = 0 -let g:dracula_italic = 0 -colorscheme dracula +colorscheme base16-tomorrow hi Normal guibg=NONE ctermbg=NONE hi EndOfBuffer guibg=NONE ctermbg=NONE diff --git a/zshrc b/zshrc index 4a99680..3b2ff1f 100644 --- a/zshrc +++ b/zshrc @@ -9,7 +9,7 @@ export PATH="$HOME/.yarn/bin:$PATH" # Path to your oh-my-zsh installation. export ZSH="$HOME/.oh-my-zsh" -export FZF_DEFAULT_COMMAND='fd --type f' +export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""' # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case,