Skip to content

Commit 4a4b754

Browse files
committed
got gruvbox-baby working now. just need to use iterm2 as opposed to default mac terminal
1 parent d439f19 commit 4a4b754

File tree

11 files changed

+67
-72
lines changed

11 files changed

+67
-72
lines changed

.config/nvim/init.vim

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' } " If you
155155
Plug 'junegunn/limelight.vim' " focus text currently being written
156156
Plug 'junegunn/goyo.vim' " basically vs-code zen mode
157157

158-
Plug 'HerringtonDarkholme/vim-worksheet'
159-
158+
" Plug 'HerringtonDarkholme/vim-worksheet'
160159

161160
Plug 'tpope/vim-surround'
162161
Plug 'tpope/vim-repeat' " use . to get repeat behavior w/ plugins. requires remap
@@ -433,17 +432,16 @@ if has('gui_running')
433432
"set guifont=Roboto Mono Nerd Font
434433
endif
435434

435+
set background=dark
436+
filetype on
437+
filetype plugin on
438+
syntax enable
436439

437440
"colorscheme dracula
438441
colorscheme gruvbox-baby
439442
"colorscheme gruvbox
440443
"colorscheme colorful256
441444

442-
set background=dark
443-
filetype on
444-
filetype plugin on
445-
syntax on
446-
447445
" highlight pink in visual to match lightline
448446
highlight Visual guifg=#454545 guibg=#D4BFFF
449447

.config/nvim/plugins/coc.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ else
6868
endif
6969
" Make <CR> auto-select the first completion item and notify coc.nvim to
7070
" format on enter, <cr> could be remapped by other vim plugin
71-
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
72-
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
71+
" inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
72+
inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm() : "\<C-y>"
7373
7474
" Symbol renaming. rename variables/functions. does not work across files unless open across buffers
7575
nmap <leader>rn <Plug>(coc-rename)

.vimrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
set noerrorbells visualbell t_vb=
33
if has('autocmd')
4+
autocmd!
45
autocmd GUIEnter * set visualbell t_vb=
56
endif
67

@@ -16,6 +17,10 @@ set expandtab
1617
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
1718
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
1819

20+
if has("termguicolors")
21+
set termguicolors
22+
endif
23+
1924
set exrc " `vim .` -> sources any .vimrc in the dir -> custom executions for various projects. building/running linting/etc
2025
"set guicursor=
2126
set relativenumber
@@ -31,7 +36,6 @@ set nobackup
3136
set undodir=~/.vim/undodir
3237
set undofile
3338
set incsearch
34-
set termguicolors
3539
set scrolloff=8
3640
set noshowmode
3741
set completeopt=menuone,noinsert,noselect

.zshrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ zstyle ':omz:update' frequency 13
228228
# Example format: plugins=(rails git textmate ruby lighthouse)
229229
# Add wisely, as too many plugins slow down shell startup.
230230
# Plugins first -> PATH to oh-my-zsh -> source oh-my-zsh.sh
231-
plugins=(git npm node 1password colored-man-pages colorize)
231+
# plugins=(git npm node 1password colored-man-pages colorize)
232+
plugins=(colored-man-pages)
232233

233234

234235
source $ZSH/oh-my-zsh.sh
@@ -269,10 +270,14 @@ fi
269270
# install additional dependencies
270271
bash $HOME/scripts/bash/dotfiles/setup_dependencies
271272

273+
ln -sf $HOME/.config/nvim/init.vim $HOME
274+
272275
# set default editor
273276
# export EDITOR="code -w" # vscode
274277
export EDITOR="vi" # vi
275278
alias v="nvim"
279+
alias vi="nvim"
280+
alias vim="nvim"
276281
# fix_wsl2_interop() {
277282
# for i in $(pstree -np -s $$ | grep -o -E '[0-9]+'); do
278283
# if [[ -e "/run/WSL/${i}_interop" ]]; then
@@ -310,7 +315,6 @@ unsetopt LIST_BEEP
310315
alias myip="curl http://ipecho.net/plain; echo"
311316
# open file explorer gui
312317
alias e="explorer.exe ."
313-
alias vi="vim"
314318

315319
# enter postgres user
316320
# sudo -u postgres -i

scripts/bash/dotfiles/install

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
# bash setup_bare_ubuntu
44
# bash install_brew
5-
bash chsh_to_zsh
5+
# bash chsh_to_zsh
66
# bash setup_dotfiles
77
# bash install_brew
88

99
# echo SHELL: $SHELL
1010

1111
# bash setup_dependencies
12-

scripts/bash/dotfiles/install_brew

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ else
88
brew update
99
fi
1010

11-
if [[ $(arch) == 'arm64' ]]
12-
then
13-
echo M1 Mac detected. Finishing install...
14-
# Append to .zprofile + eval for current session
15-
echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
16-
eval "$(/opt/homebrew/bin/brew shellenv)"
17-
echo Homebrew installed.
18-
else
19-
# echo "~/.profile on Debian/Ubuntu or ~/.bash_profile on CentOS/Fedora/Red Hat."
20-
# test -d ~/.linuxbrew && eval "$(~/.linuxbrew/bin/brew shellenv)"
21-
# test -d /home/linuxbrew/.linuxbrew && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
22-
# test -r ~/.bash_profile && echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.bash_profile
23-
# echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.profile
24-
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
25-
fi
11+
# if [[ $(arch) == 'arm64' ]]
12+
# then
13+
# echo M1 Mac detected. Preparing install...
14+
# # Append to .zprofile + eval for current session
15+
# # echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
16+
# eval "$(/opt/homebrew/bin/brew shellenv)"
17+
# echo Homebrew installed.
18+
# else
19+
# # echo "~/.profile on Debian/Ubuntu or ~/.bash_profile on CentOS/Fedora/Red Hat."
20+
# # test -d ~/.linuxbrew && eval "$(~/.linuxbrew/bin/brew shellenv)"
21+
# # test -d /home/linuxbrew/.linuxbrew && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
22+
# # test -r ~/.bash_profile && echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.bash_profile
23+
# # echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.profile
24+
# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
25+
# fi

scripts/bash/dotfiles/setup_dependencies

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#
66
# setup_dependencies
77

8+
# permanently turn off analytics tracking
9+
brew analytics off
10+
811
# cowsay
912
if ! command -v cowsay &> /dev/null
1013
then
@@ -17,10 +20,35 @@ then
1720
brew install zoxide
1821
fi
1922

20-
# fzf
21-
# if ! command -v fzf &> /dev/null
23+
# neovim
24+
if ! command -v nvim &> /dev/null
25+
then
26+
brew install neovim
27+
fi
28+
29+
# check if `vim-plug` is installed
30+
# this could be maintained with dotfiles, but better to get a current `plug.vim` file
31+
if [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim ]; then
32+
echo "Installing vim-plug for Neovim..."
33+
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
34+
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
35+
echo "`vim-plug` for Neovim installed."
36+
fi
37+
38+
# install vim/neovim plugins
39+
if [ ! -d "$HOME/.vim/plugged" ]; then
40+
echo Installing plugins...
41+
nvim +'PlugInstall --sync' +qa
42+
echo Plugins installed.
43+
fi
44+
45+
# if ! command -v node &> /dev/null
2246
# then
23-
# brew install fzf
24-
# # To install useful key bindings and fuzzy completion:
25-
# $(brew --prefix)/opt/fzf/install
47+
2648
# fi
49+
50+
if ! command -v python3 &> /dev/null
51+
then
52+
brew install python
53+
python3 -m pip install --user --upgrade pynvim
54+
fi

scripts/bash/install_fortune.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

scripts/bash/svg_to_png.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

scripts/bash/tt_config.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)