From abe86d87a7ba897bb13a8fa4016e2b606bd88154 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Thu, 22 Oct 2020 13:16:44 -0500 Subject: [PATCH 1/6] chore: update alacritty and neovim config --- .config/alacritty/alacritty.yml | 8 ++++---- .config/nvim/init.vim | 36 ++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1bd7044..99eea66 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,19 +1,19 @@ # Set Default Font font: normal: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Regular bold: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Bold italic: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Italic bold_italic: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Bold Italic # Color Schemes diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 81a7e6d..723c6f5 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,5 +1,21 @@ +" Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. +" If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support +" (see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) +if (empty($TMUX)) + if (has("nvim")) + " For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > + let $NVIM_TUI_ENABLE_TRUE_COLOR=1 + endif + " For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > + " Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > + " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > + if (has("termguicolors")) + set termguicolors + endif +endif + " Shortcuts -map :NERDTreeToggle +nnoremap o :NERDTreeToggle nnoremap s :TagbarToggle " Remove Highlight @@ -29,7 +45,6 @@ inoremap coc#refresh() " coc.nvim quick fix nmap qf (coc-fix-current) - " Use tab for trigger completion with characters ahead and navigate. " Used by coc.nvim inoremap @@ -66,7 +81,7 @@ endfunction " CoC Status in LightLine " Used by coc.nvim lightline.nvim let g:lightline = { - \ 'colorscheme': 'molokai', + \ 'colorscheme': 'one', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], \ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ] @@ -94,11 +109,18 @@ nnoremap c :CocList commands " Plugged Plugins call plug#begin(stdpath('data') . '/plugged') -" Activity Tracking -" Plug 'ActivityWatch/aw-watcher-vim' + +" Blue Theme +Plug 'wadackel/vim-dogrun' + +" Indent Detection +Plug 'tpope/vim-sleuth' " One Dark Theme -Plug 'joshdick/onedark.vim' +Plug 'rakr/vim-one' + +" Activity Tracking +" Plug 'ActivityWatch/aw-watcher-vim' " Monokai Theme Plug 'tomasr/molokai' @@ -146,4 +168,4 @@ let g:rustfmt_autosave = 1 " Configuration set noshowmode " Not Needed because we have Lightline -colorscheme molokai +colorscheme one From b39a56a9eb9b04075d5438668f033b1dc2760d62 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Tue, 17 Nov 2020 20:24:48 -0600 Subject: [PATCH 2/6] chore: general update --- .zprofile | 12 ++++++++++++ .zshrc | 2 -- paoda.zsh | 6 ------ 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .zprofile diff --git a/.zprofile b/.zprofile new file mode 100644 index 0000000..280ff4b --- /dev/null +++ b/.zprofile @@ -0,0 +1,12 @@ +# Rust +export PATH="$HOME/.cargo/bin:$PATH" + +# DenoJS +export DENO_INSTALL="/home/paoda/.deno" +export PATH="$DENO_INSTALL/bin:$PATH" + +# Set Default Editor +export EDITOR="/usr/bin/nvim" + +# Make mpv XDG Compliant +export MPV_HOME=~/.local/share/mpv diff --git a/.zshrc b/.zshrc index 03d98af..608e972 100644 --- a/.zshrc +++ b/.zshrc @@ -81,8 +81,6 @@ plugins=(git) # .zhistory not .zsh_history export HISTFILE=$HOME/.zhistory - - source $ZSH/oh-my-zsh.sh # User configuration diff --git a/paoda.zsh b/paoda.zsh index 1c8b779..17c4a8b 100644 --- a/paoda.zsh +++ b/paoda.zsh @@ -22,9 +22,3 @@ dotfile() { # Re-enable reverse-i-search bindkey '^R' history-incremental-search-backward - -# Set Default Editor -export EDITOR="/usr/bin/nvim" - -# Make mpv XDG Compliant -export MPV_HOME=~/.local/share/mpv From 121b9ef7cf283ef43cd73a4d1054ae51dea69198 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Tue, 17 Nov 2020 20:26:59 -0600 Subject: [PATCH 3/6] chore: replace paoda.zsh with .paodarc --- .paodarc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .paodarc diff --git a/.paodarc b/.paodarc new file mode 100644 index 0000000..17c4a8b --- /dev/null +++ b/.paodarc @@ -0,0 +1,24 @@ +#!/usr/bin/zsh +# Make ZSH behave like vim +bindkey -v + +# Aliases +alias yay="yay --aur" +alias ls="exa" +alias ll="exa -albh" +alias cat="bat" +alias vim="nvim" +alias find="fd" +alias grep="rg" + +# Functions +dotfile() { + if [[ "$1" = "status" ]]; then + git --git-dir="$HOME"/.dotfiles/ --work-tree="$HOME" status -uno; + else + git --git-dir="$HOME"/.dotfiles/ --work-tree="$HOME" "$@"; + fi +} + +# Re-enable reverse-i-search +bindkey '^R' history-incremental-search-backward From ca511ee298f41115db14826fbb140132017be987 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Tue, 17 Nov 2020 20:30:36 -0600 Subject: [PATCH 4/6] fix: include forgotten modifications from last commit --- .zshrc | 2 +- paoda.zsh | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 paoda.zsh diff --git a/.zshrc b/.zshrc index 608e972..04a3761 100644 --- a/.zshrc +++ b/.zshrc @@ -110,7 +110,7 @@ source $ZSH/oh-my-zsh.sh # alias ohmyzsh="mate ~/.oh-my-zsh" # Source Personal Config -source ~/paoda.zsh +source ~/.paodarc # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/paoda.zsh b/paoda.zsh deleted file mode 100644 index 17c4a8b..0000000 --- a/paoda.zsh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/zsh -# Make ZSH behave like vim -bindkey -v - -# Aliases -alias yay="yay --aur" -alias ls="exa" -alias ll="exa -albh" -alias cat="bat" -alias vim="nvim" -alias find="fd" -alias grep="rg" - -# Functions -dotfile() { - if [[ "$1" = "status" ]]; then - git --git-dir="$HOME"/.dotfiles/ --work-tree="$HOME" status -uno; - else - git --git-dir="$HOME"/.dotfiles/ --work-tree="$HOME" "$@"; - fi -} - -# Re-enable reverse-i-search -bindkey '^R' history-incremental-search-backward From 6a05519b9b970d21c5ed97d32b0b2bfb65bbf478 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Tue, 17 Nov 2020 20:40:59 -0600 Subject: [PATCH 5/6] chore: remove the mpv thing --- .zprofile | 3 --- 1 file changed, 3 deletions(-) diff --git a/.zprofile b/.zprofile index 280ff4b..dbc8076 100644 --- a/.zprofile +++ b/.zprofile @@ -7,6 +7,3 @@ export PATH="$DENO_INSTALL/bin:$PATH" # Set Default Editor export EDITOR="/usr/bin/nvim" - -# Make mpv XDG Compliant -export MPV_HOME=~/.local/share/mpv From 6dd42899b1ee03fe46ad652711c7d49b8992b533 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Tue, 17 Nov 2020 20:45:35 -0600 Subject: [PATCH 6/6] chore: rename .zprofile to .zshenv so $EDITOR is set as expected --- .zprofile => .zshenv | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .zprofile => .zshenv (100%) diff --git a/.zprofile b/.zshenv similarity index 100% rename from .zprofile rename to .zshenv