Skip to content

Commit

Permalink
Clean a bunch of stuff up
Browse files Browse the repository at this point in the history
  • Loading branch information
awseward committed Jun 5, 2024
1 parent d47d577 commit 33a3d7b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 70 deletions.
1 change: 0 additions & 1 deletion tag-macos/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ brew "btop"
brew "cmake"
brew "coreutils"
brew "curl"
brew "eza"
brew "fdupes"
brew "findutils"
brew "flac"
Expand Down
35 changes: 0 additions & 35 deletions vim/vimrc.color-overrides

This file was deleted.

14 changes: 2 additions & 12 deletions vim/vimrc.plugins
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@ filetype off
call plug#begin()

" Colors
Plug 'NLKNguyen/papercolor-theme'
Plug 'chriskempson/base16-vim'
Plug 'croaky/vim-colors-github'
Plug 'flazz/vim-colorschemes'
Plug 'w0ng/vim-hybrid'
Plug 'xolox/vim-colorscheme-switcher'
Plug 'frazrepo/vim-rainbow'
Plug 'cideM/yui'
Plug 'aditya-azad/candle-grey'
Plug 'nikolvs/vim-sunbather'
Plug 'reedes/vim-colors-pencil'
Plug 'owickstrom/vim-colors-paramount' " Current favorite

" Editor Utils
Plug 'bronson/vim-trailing-whitespace'
Expand All @@ -26,12 +22,10 @@ Plug 'tpope/vim-commentary'
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-rhubarb'
Plug 'tpope/vim-surround'
" Plug 'vim-scripts/paredit.vim'
Plug 'troydm/zoomwintab.vim'

" Misc
Plug 'scrooloose/syntastic'
Plug 'xolox/vim-misc' " <-- req'd dep'cy of `xolox/vim-colorscheme-switcher`
Plug 'junegunn/goyo.vim'

" Shell Utils
Expand All @@ -41,12 +35,8 @@ endif
if executable('rg')
Plug 'jremmen/vim-ripgrep'
endif
if has('win16') || has('win32') || has('win64') || has('win32unix')
Plug 'ctrlpvim/ctrlp.vim'
else
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
endif
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
Plug 'benmills/vimux'

" Language Plugins
Expand Down
29 changes: 7 additions & 22 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -240,38 +240,27 @@ map <leader>h :History<CR>
"
" Colors
"
function! ApplyColorOverrides()
if filereadable(expand("~/.vim/vimrc.color-overrides"))
source ~/.vim/vimrc.color-overrides
endif
endfunction

function! RandomColorSchemeWithOverrides()
RandomColorScheme
call ApplyColorOverrides()
endfunction

set t_Co=256

" colorscheme paramount
colorscheme gruvbox
colorscheme noclown

if $LIGHT_SHELL != ""
set background=light
else
set background=dark
end

call ApplyColorOverrides()

" https://www.reddit.com/r/vim/comments/5416d0/true_colors_in_vim_under_tmux/
set termguicolors
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"

map <leader>m :call RandomColorSchemeWithOverrides()<CR>
" Change colorschemes on `updatetime`ms of no input (normal & insert)
" autocmd CursorHold,CursorHoldI * call RandomColorSchemeWithOverrides()
let &colorcolumn=join(range(81,999),",")
highlight ColorColumn ctermbg=235 guibg=#222222

" Line numbers
hi LineNr ctermbg=none
hi LineNr ctermfg=248

" Rename current file (Gary Bernhardt) – TODO: Find a source link for this
function! RenameFile()
Expand Down Expand Up @@ -346,10 +335,6 @@ nnor ,CF :let @*=expand("%:p")<CR> " ... (absolute)
nnor ,cd :let @*=expand("%:.:h")<CR> " Copy directory path (relative)
nnor ,CD :let @*=expand("%:p:h")<CR> " ... (absolute)

" colorscheme fight-in-the-shade
let &colorcolumn=join(range(81,999),",")
highlight ColorColumn ctermbg=235 guibg=#222222

" ¯\_(ツ)_/¯ Might be good to have this as a foothold someday
" See also: https://github.com/nanotee/nvim-lua-guide#using-lua-from-vimscript
if has('nvim')
Expand Down

0 comments on commit 33a3d7b

Please sign in to comment.