mirror of
https://github.com/jessebot/dot_files.git
synced 2025-10-01 01:48:43 +00:00
updating themeing to be in it's own repo and adding some fixes for tmux and powerline
This commit is contained in:
parent
d5cd245c09
commit
e34c009da9
8 changed files with 59 additions and 224 deletions
|
|
@ -1,21 +1,18 @@
|
|||
../.config/nvim/init.vimset runtimepath^=~/.vim runtimepath+=~/.vim/after
|
||||
set runtimepath^=~/.vim runtimepath+=~/.vim/after
|
||||
let &packpath = &runtimepath
|
||||
source ~/.vimrc
|
||||
|
||||
" disable netrw at the very start of your init.lua (strongly advised)
|
||||
let g:loaded_netrw = 1
|
||||
let g:loaded_netrwPlugin = 1
|
||||
|
||||
v:lua.require'nvim-tree'.setup()
|
||||
|
||||
source ~/.vimrc
|
||||
|
||||
call plug#begin()
|
||||
|
||||
" Dashboard for neovim start screen
|
||||
Plug 'glepnir/dashboard-nvim'
|
||||
|
||||
" cute halloween dashboard for neovim start screen :3
|
||||
Plug 'folke/drop.nvim'
|
||||
" Plug 'folke/drop.nvim'
|
||||
|
||||
" this is helpful for python highlighting
|
||||
Plug 'numirias/semshi', { 'do': ':UpdateRemotePlugins' }
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"dividers": {
|
||||
"left": {
|
||||
"hard": " ",
|
||||
"soft": " "
|
||||
"hard": " ",
|
||||
"soft": " "
|
||||
},
|
||||
"right": {
|
||||
"hard": " ",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"dividers": {
|
||||
"left": {
|
||||
"hard": " ",
|
||||
"soft": " "
|
||||
"hard": " ",
|
||||
"soft": " "
|
||||
},
|
||||
"right": {
|
||||
"hard": " ",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
{
|
||||
"function": "powerline.segments.common.env.cwd",
|
||||
"before": " ",
|
||||
"before": " ",
|
||||
"priority": 30,
|
||||
"args": {
|
||||
"use_shortened_path": true
|
||||
|
|
@ -32,8 +32,8 @@
|
|||
"changed": " {}",
|
||||
"staged": " {}",
|
||||
"stashed": " {}",
|
||||
"ahead": " {}",
|
||||
"behind": " {}"
|
||||
"ahead": " {}",
|
||||
"behind": " {}"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
source "/home/linuxbrew/.linuxbrew/lib/python3.10/site-packages/powerline/bindings/tmux/powerline.conf"
|
||||
set -g default-terminal "screen-256color"
|
||||
set-option -g default-terminal "xterm-256color"
|
||||
set-option -ga terminal-overrides ',xterm-256color:Tc'
|
||||
|
|
|
|||
|
|
@ -1,176 +0,0 @@
|
|||
" Vim color scheme
|
||||
"
|
||||
" Name: spaceChalk.vim
|
||||
" Maintainer: @jessebot - Jesse Hitch
|
||||
" Last Change: 2022-10-29 12:11:06.0 +0200
|
||||
" License: GPLv3
|
||||
" Notes: Use :help command to check vim help on what variables are called, e.g.
|
||||
" Open a python file in vim and then type the following:
|
||||
" :syntax list
|
||||
" That will give you all the syntax variable names and their colors as
|
||||
" three x's, like: pythonInclude xxx from import
|
||||
" It may also be helpful to check out more about syntax/colors with:
|
||||
" :help syntax
|
||||
"
|
||||
" Finally, useful tool for learning what highlight variables are called:
|
||||
" http://bytefluent.com/vivify/ to find variables of colors
|
||||
|
||||
" Colours in use
|
||||
" --------------
|
||||
" #CAEAFF chalky white
|
||||
" #ffaff9 light pink
|
||||
" #f289f9 neon magenta
|
||||
" #f2748a pale dark red
|
||||
" #ff8d87 soft redish orange
|
||||
" #fdcd36 light orange
|
||||
" #f7fb53 bright yellow
|
||||
" #f6f76a soft yellow
|
||||
" #a8fd57 lime green
|
||||
" #5ac4b9 teal (this color feels weird)
|
||||
" #5cc9fd blue
|
||||
" #5f87ff cornflower blue
|
||||
" #a3a8f8 medium purple
|
||||
"
|
||||
" #232336 blueish black
|
||||
" #1d2652 navy blue
|
||||
" #2569aa darker blue
|
||||
" #585858 gray
|
||||
" #323232 grayish black
|
||||
|
||||
hi clear
|
||||
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
set background=dark
|
||||
|
||||
let g:colors_name = "spaceChalk"
|
||||
|
||||
" GUI Colors
|
||||
"
|
||||
" this is the general background of the whole editor and the plain text color
|
||||
" #E8FBFF
|
||||
highlight Normal guibg=#232336 guifg=#CAEAFF
|
||||
highlight Cursor guibg=#a3a8f8 guifg=Black
|
||||
highlight CursorLine guibg=#323232
|
||||
highlight LineNr guibg=#323232 guifg=#5f87ff
|
||||
highlight Folded guibg=#3E3E3E guifg=#ffaff9
|
||||
highlight Visual guibg=#2569aa guifg=#a8fd57
|
||||
|
||||
" this one controls the column over 80 characters
|
||||
highlight ColorColumn guibg=#2569aa
|
||||
|
||||
" this is for the split line between other windows and nerdtree
|
||||
highlight VertSplit guibg=#a8fd57 guifg=#3E3E3E
|
||||
|
||||
" these are for little popup dropdown menus, for things like tab complete
|
||||
highlight Pmenu guibg=#1d2652 guifg=#5cc9fd
|
||||
highlight PMenuSel guibg=#323232 guifg=#fdcd36
|
||||
|
||||
" General Colors
|
||||
highlight Comment guifg=#a3a8f8
|
||||
highlight Constant guifg=#f7fb53
|
||||
highlight Keyword guifg=#fdcd36
|
||||
highlight String guifg=#a8fd57
|
||||
highlight Boolean guifg=#5ac4b9
|
||||
highlight Number guifg=#f289f9
|
||||
highlight Float guifg=#f289f9
|
||||
highlight Type guifg=#5cc9fd
|
||||
highlight Identifier guifg=#fdcd36
|
||||
highlight Function guifg=#5cc9fd
|
||||
highlight PreProc guifg=#5f87ff
|
||||
highlight Todo guifg=#fdcd36 guibg=#2569aa
|
||||
|
||||
|
||||
highlight StatusLine guibg=#5cc9fd
|
||||
|
||||
" Searching
|
||||
highlight clear Search
|
||||
highlight Search guibg=#f7fb53 guifg=Black
|
||||
|
||||
" Invisible character colors
|
||||
highlight NonText guifg=#4a4a59
|
||||
highlight SpecialKey guifg=#4a4a59
|
||||
|
||||
" HTML Colors
|
||||
highlight link htmlTag Type
|
||||
highlight link htmlEndTag htmlTag
|
||||
highlight link htmlTagName htmlTag
|
||||
|
||||
highlight pythonParameters ctermfg=147 guifg=#AAAAFF
|
||||
highlight pythonParam ctermfg=175 guifg=#f289f9
|
||||
highlight pythonBrackets ctermfg=183 guifg=#d7afff
|
||||
highlight pythonLambdaExpr ctermfg=105 guifg=#8787ff
|
||||
highlight pythonBrackets guifg=#5ac4b9
|
||||
|
||||
" Ruby Colors
|
||||
highlight link rubyClass Keyword
|
||||
highlight link rubyDefine Keyword
|
||||
highlight link rubyConstant Type
|
||||
highlight link rubySymbol Constant
|
||||
highlight link rubyStringDelimiter rubyString
|
||||
highlight link rubyInclude Keyword
|
||||
highlight link rubyAttribute Keyword
|
||||
highlight link rubyInstanceVariable Normal
|
||||
|
||||
" Rails Colors
|
||||
highlight link railsMethod Type
|
||||
|
||||
" Sass colors
|
||||
highlight link sassMixin Keyword
|
||||
highlight link sassMixing Constant
|
||||
|
||||
" Outliner colors
|
||||
highlight OL1 guifg=#f289f9
|
||||
highlight OL2 guifg=#a8fd57
|
||||
highlight OL3 guifg=#5cc9fd
|
||||
highlight OL4 guifg=#f7fb53
|
||||
highlight BT1 guifg=#a3a8f8
|
||||
highlight link BT2 BT1
|
||||
highlight link BT3 BT1
|
||||
highlight link BT4 BT1
|
||||
|
||||
" Markdown colors
|
||||
highlight markdownCode guifg=#a8fd57 guibg=#232336
|
||||
highlight link markdownCodeBlock markdownCode
|
||||
|
||||
" Git colors
|
||||
highlight gitcommitSelectedFile guifg=#a8fd57
|
||||
highlight gitcommitDiscardedFile guifg=#f2748a
|
||||
highlight gitcommitWarning guifg=#f2748a
|
||||
highlight gitcommitBranch guifg=#fdcd36
|
||||
highlight gitcommitHeader guifg=#5cc9fd
|
||||
|
||||
" Gitgutter stuff
|
||||
" change sign column color for git to be the same as line number background
|
||||
highlight! link SignColumn LineNr
|
||||
" change the colors back to what they should be when there are changes
|
||||
highlight GitGutterAdd guibg=#323232 guifg=#a8fd57 ctermfg=2
|
||||
highlight GitGutterChange guibg=#323232 guifg=#f7fb53 ctermfg=3
|
||||
highlight GitGutterDelete guibg=#323232 guifg=#f2748a ctermfg=1
|
||||
|
||||
" ------------- NERDTree syntax colors for file browsing -------------------
|
||||
highlight Directory guifg=#5cc9fd
|
||||
highlight NERDTreeCWD guifg=#f6f76a
|
||||
highlight NERDTreeDirSlash guifg=#a8fd57
|
||||
highlight NERDTreeClosable guifg=#fdcd36
|
||||
highlight NERDTreeOpenable guifg=#f289f9
|
||||
|
||||
let g:WebDevIconsDefaultFolderSymbolColor = '5f87ff' " #5f87ff cornflower blue
|
||||
let g:WebDevIconsDefaultFileSymbolColor = '5cc9fd' " #5cc9fd blue
|
||||
|
||||
" set the default colors for different file types :)
|
||||
" all of these are pale purple: #a3a8f8
|
||||
let g:NERDTreeExtensionHighlightColor = {}
|
||||
let g:NERDTreeExtensionHighlightColor['md'] = 'a3a8f8'
|
||||
let g:NERDTreeExtensionHighlightColor['txt'] = 'a3a8f8'
|
||||
|
||||
" all of these are oranger: #fdcd36
|
||||
let g:NERDTreeExtensionHighlightColor['in'] = 'fdcd36'
|
||||
let g:NERDTreeExtensionHighlightColor['yml'] = 'fdcd36'
|
||||
let g:NERDTreeExtensionHighlightColor['yaml'] = 'fdcd36'
|
||||
let g:NERDTreeExtensionHighlightColor['json'] = 'fdcd36'
|
||||
let g:NERDTreeExtensionHighlightColor['cfg'] = 'fdcd36'
|
||||
let g:NERDTreeExtensionHighlightColor['py'] = '5cc9fd' " #5cc9fd blue
|
||||
let g:NERDTreeExtensionHighlightColor['sh'] = 'a8fd57' " #a8fd57 lime green
|
||||
44
.vimrc
44
.vimrc
|
|
@ -25,8 +25,6 @@ set cursorline
|
|||
" highlighted column 80, so you know when you're over 80 char
|
||||
set colorcolumn=80
|
||||
|
||||
|
||||
|
||||
" Font:
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" fonts with icons/emojis require utf-8
|
||||
|
|
@ -35,25 +33,21 @@ set encoding=utf-8
|
|||
set guifont=Mononoki\ Nerd\ Font:h15
|
||||
|
||||
|
||||
" Syntax Highlighting:
|
||||
" and
|
||||
" Colors:
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Use 24-bit (true-color) mode in Neovim 0.1.5+ and Vim 7.4+
|
||||
if (has("termguicolors"))
|
||||
set termguicolors
|
||||
if has('nvim') || has('termguicolors')
|
||||
set termguicolors
|
||||
endif
|
||||
|
||||
" custom colorscheme to be more pastel and pretty
|
||||
colorscheme spaceChalk
|
||||
" Enable syntax highlighting by default
|
||||
syntax on
|
||||
|
||||
" clap
|
||||
let g:clap_theme = 'material_design_dark'
|
||||
|
||||
|
||||
" Syntax Highlighting:
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Enable syntax highlighting by default
|
||||
syntax on
|
||||
|
||||
" this is supposed to help with syntax highlighting
|
||||
let g:ycm_enable_semantic_highlighting=1
|
||||
|
||||
|
|
@ -64,10 +58,10 @@ au BufRead,BufNewFile known_hosts,ssh_known_hosts set filetype=ssh_known_hosts
|
|||
" "A pure vim script status line for vim"
|
||||
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
|
||||
" use softer colors
|
||||
let g:airline_theme='space_chalk'
|
||||
" use powerline fonts
|
||||
let g:airline_powerline_fonts = 1
|
||||
" use softer colors
|
||||
let g:airline_theme='murmur'
|
||||
" changing separators to match personal powerline for shell
|
||||
let g:airline_left_sep=' '
|
||||
let g:airline_right_sep=''
|
||||
|
|
@ -154,6 +148,7 @@ nnoremap <space> za
|
|||
let g:SimpylFold_docstring_preview=1
|
||||
" enable folding for markdown?
|
||||
let g:markdown_folding = 1
|
||||
let g:indentLine_fileTypeExclude = ['dashboard']
|
||||
|
||||
|
||||
" BACKUPS:
|
||||
|
|
@ -406,7 +401,6 @@ noremap <Leader>w :w !sudo tee % > /dev/null
|
|||
|
||||
map <leader>n :call RenameFile()<cr>
|
||||
|
||||
|
||||
if !has('nvim')
|
||||
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
" "vim-plug"
|
||||
|
|
@ -416,19 +410,26 @@ if !has('nvim')
|
|||
call plug#begin()
|
||||
|
||||
" ------------------------- General IDE stuff ----------------------------
|
||||
" my preferred colorscheme right now
|
||||
Plug 'jessebot/space-chalk', { 'as': 'spacechalk', 'do': ':colorscheme spacechalk' }
|
||||
|
||||
" adds a pretty status line
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
|
||||
" allow collapsing of functions for python and other supported languages
|
||||
Plug 'tmhedberg/SimpylFold'
|
||||
|
||||
" indents lines and adds a line to show blocks of code
|
||||
Plug 'Yggdroot/indentLine'
|
||||
|
||||
" this is a modern fuzzy searcher
|
||||
Plug 'liuchengxu/vim-clap'
|
||||
|
||||
" NerdTree - Tree explorer plugin - use :NERDTreeToggle to try it out
|
||||
" - after nerdtree is on visible, use ? for help
|
||||
"
|
||||
" ------------------------------ NerdTree --------------------------------
|
||||
" Tree explorer plugin - use :NERDTreeToggle to try it out
|
||||
" after nerdtree is on visible, use ? for help
|
||||
|
||||
" On-demand loading of nerdtree
|
||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
" add tabs to nerdtree - experimental
|
||||
|
|
@ -440,15 +441,16 @@ if !has('nvim')
|
|||
" add git awareness to see modified, merged, etc status of file in nerdtree
|
||||
Plug 'Xuyuanp/nerdtree-git-plugin'
|
||||
|
||||
" ------------------------------ git -------------------------------------
|
||||
" git plugin for running git commands with :git
|
||||
Plug 'tpope/vim-fugitive'
|
||||
" puts a git + or - in side line to show git changes in file
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
|
||||
" ---------- Language Specific/File type Specific Stuff -------------
|
||||
" general linter - will use common linters and highlight broken code
|
||||
Plug 'dense-analysis/ale'
|
||||
|
||||
" ---------- Language Specific/File type Specific Stuff -------------
|
||||
" terraform linter
|
||||
Plug 'hashivim/vim-terraform'
|
||||
|
||||
|
|
@ -501,3 +503,7 @@ if !has('nvim')
|
|||
|
||||
call plug#end()
|
||||
endif
|
||||
|
||||
" this has to be at the end of the file because it is a plugin I guess.
|
||||
" custom colorscheme to be more pastel and pretty
|
||||
colorscheme spacechalk
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"Profiles": [
|
||||
{
|
||||
"Badge Text" : "",
|
||||
"Badge Text" : "",
|
||||
"Working Directory" : "~",
|
||||
"Prompt Before Closing 2" : false,
|
||||
"Dynamic Profile Filename" : "\/Users\/jhitch\/Library\/Application Support\/iTerm2\/DynamicProfiles\/Profiles.json",
|
||||
|
|
@ -53,6 +53,7 @@
|
|||
"slogin",
|
||||
"telnet"
|
||||
],
|
||||
"Non-ASCII Ligatures" : false,
|
||||
"Scrollback Lines" : 1000,
|
||||
"Draw Powerline Glyphs" : true,
|
||||
"Flashing Bell" : true,
|
||||
|
|
@ -65,9 +66,11 @@
|
|||
},
|
||||
"BM Growl" : true,
|
||||
"Ansi 3 Color" : {
|
||||
"Green Component" : 0.674033910034048,
|
||||
"Blue Component" : 0.29084579493154233,
|
||||
"Red Component" : 0.72714578619909509
|
||||
"Red Component" : 0.9684478997799989,
|
||||
"Color Space" : "sRGB",
|
||||
"Blue Component" : 0.41834647836003569,
|
||||
"Alpha Component" : 1,
|
||||
"Green Component" : 0.97164821624755859
|
||||
},
|
||||
"Open Password Manager Automatically" : false,
|
||||
"Icon" : 1,
|
||||
|
|
@ -267,12 +270,14 @@
|
|||
"Send Code When Idle" : false,
|
||||
"ASCII Anti Aliased" : true,
|
||||
"Tags" : [
|
||||
|
||||
"Dynamic"
|
||||
],
|
||||
"Ansi 9 Color" : {
|
||||
"Green Component" : 0.28235295414924622,
|
||||
"Blue Component" : 0.25098040699958801,
|
||||
"Red Component" : 0.94901961088180542
|
||||
"Red Component" : 0.97035980224609375,
|
||||
"Color Space" : "sRGB",
|
||||
"Blue Component" : 0.35326263905517408,
|
||||
"Alpha Component" : 1,
|
||||
"Green Component" : 0.41122192433258642
|
||||
},
|
||||
"Badge Right Margin" : 48,
|
||||
"Use Bold Font" : true,
|
||||
|
|
@ -298,9 +303,11 @@
|
|||
"Green Component" : 0.56004715856940013
|
||||
},
|
||||
"Ansi 1 Color" : {
|
||||
"Green Component" : 0.22880050174078803,
|
||||
"Blue Component" : 0.32056234871547967,
|
||||
"Red Component" : 0.69980203619909509
|
||||
"Red Component" : 0.94901960784313721,
|
||||
"Color Space" : "sRGB",
|
||||
"Blue Component" : 0.54117647058823526,
|
||||
"Alpha Component" : 1,
|
||||
"Green Component" : 0.45490196078431372
|
||||
},
|
||||
"Name" : "Solid Default",
|
||||
"Blinking Cursor" : true,
|
||||
|
|
@ -341,8 +348,8 @@
|
|||
"Green Component" : 0.1152772594
|
||||
},
|
||||
"Blur" : false,
|
||||
"Normal Font" : "mononokiNerdFontComplete-Regular 16",
|
||||
"Vertical Spacing" : 1.01,
|
||||
"Normal Font" : "mononoki-Regular 17",
|
||||
"Vertical Spacing" : 1,
|
||||
"Ansi 7 Color" : {
|
||||
"Green Component" : 0.84705883264541626,
|
||||
"Blue Component" : 0.85098040103912354,
|
||||
|
|
@ -376,11 +383,11 @@
|
|||
"Green Component" : 0.1152772594
|
||||
},
|
||||
"Screen" : -2,
|
||||
"tmux Pane Title" : "SSH",
|
||||
"tmux Pane Title" : "Solid Default",
|
||||
"Bound Hosts" : [
|
||||
|
||||
],
|
||||
"Non Ascii Font" : "HackNerdFontComplete-Regular 15",
|
||||
"Non Ascii Font" : "SymbolsNerdFontCompleteM-2048-em 19",
|
||||
"Ansi 13 Color" : {
|
||||
"Red Component" : 0.99923568964004517,
|
||||
"Color Space" : "sRGB",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue