From 033a722ec5efab1a512790a0090737f11eeade24 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Sun, 5 Jun 2022 00:24:03 +1000 Subject: [PATCH] Got a new computer * Update vim to be a functional secondary editor * Update gitconfig and zsh for new homebrew config --- liquidprompt/liquidpromptrc.symlink | 2 +- .../after/plugin/plugged_update.vim | 41 -- nvim/nvim.symlink/autoload/darkmodesocket.vim | 18 - nvim/nvim.symlink/autoload/dir.vim | 11 - nvim/nvim.symlink/colors/default-light.vim | 34 ++ nvim/nvim.symlink/colors/dim.vim | 58 +++ nvim/nvim.symlink/colors/maxbucknell_dark.erb | 355 ------------------ nvim/nvim.symlink/colors/maxbucknell_dark.vim | 214 ----------- nvim/nvim.symlink/colors/maxbucknell_neo.erb | 281 -------------- nvim/nvim.symlink/colors/maxbucknell_neo.vim | 178 --------- nvim/nvim.symlink/init.vim | 142 +------ nvim/nvim.symlink/plugin/startup.vim | 2 - zsh/zsh.symlink/fzf.zsh | 8 +- zsh/zshrc.symlink | 14 +- 14 files changed, 126 insertions(+), 1232 deletions(-) delete mode 100644 nvim/nvim.symlink/after/plugin/plugged_update.vim delete mode 100644 nvim/nvim.symlink/autoload/darkmodesocket.vim delete mode 100644 nvim/nvim.symlink/autoload/dir.vim create mode 100644 nvim/nvim.symlink/colors/default-light.vim create mode 100644 nvim/nvim.symlink/colors/dim.vim delete mode 100644 nvim/nvim.symlink/colors/maxbucknell_dark.erb delete mode 100644 nvim/nvim.symlink/colors/maxbucknell_dark.vim delete mode 100644 nvim/nvim.symlink/colors/maxbucknell_neo.erb delete mode 100644 nvim/nvim.symlink/colors/maxbucknell_neo.vim diff --git a/liquidprompt/liquidpromptrc.symlink b/liquidprompt/liquidpromptrc.symlink index 65524f4..b900a9b 100644 --- a/liquidprompt/liquidpromptrc.symlink +++ b/liquidprompt/liquidpromptrc.symlink @@ -93,7 +93,7 @@ LP_ENABLE_VCS_ROOT=0 # Enable the Git special features. # Recommended value is 1 -LP_ENABLE_GIT=1 +LP_ENABLE_GIT=0 # Enable the Subversion special features. # Recommended value is 1 diff --git a/nvim/nvim.symlink/after/plugin/plugged_update.vim b/nvim/nvim.symlink/after/plugin/plugged_update.vim deleted file mode 100644 index 3d159bc..0000000 --- a/nvim/nvim.symlink/after/plugin/plugged_update.vim +++ /dev/null @@ -1,41 +0,0 @@ -" Remind me to update my plugins every so often. Run a function at startup -" that checks when they were last updated. -let s:plug_update_file = '~/dotfiles/nvim/nvim.symlink/plugged-update' -" Update every two weeks -let s:plug_update_timeout = 60 * 60 * 24 * 14 - -function! NeedsUpdate(update_file) - let now = system('date +%s') - - if !filereadable(a:update_file) - return v:true - endif - - let contents = readfile(a:update_file) - if !exists('contents[0]') - return v:true - endif - - let updated_at = contents[0] - let updated_threshold = now - s:plug_update_timeout - - if updated_at == '' || updated_at < updated_threshold - return v:true - endif - - return v:false -endfunc - -function! UpdatePlugReminder() - let file = expand(s:plug_update_file) - let now = system('date +%s') - if NeedsUpdate(file) - let msg = "Your plugins haven't been updated for over two weeks." - let msg .= "\n" . "Update plugins now? : " - if input(msg, "Y") == "Y" - PlugUpdate - call writefile([now], file) - endif - endif -endfunc - diff --git a/nvim/nvim.symlink/autoload/darkmodesocket.vim b/nvim/nvim.symlink/autoload/darkmodesocket.vim deleted file mode 100644 index fab8442..0000000 --- a/nvim/nvim.symlink/autoload/darkmodesocket.vim +++ /dev/null @@ -1,18 +0,0 @@ -function! darkmodesocket#updateTheme() - let is_dark_mode = system("isdark") - - if is_dark_mode == "true\n" - set background=dark - colorscheme maxbucknell_dark - else - set background=light - colorscheme maxbucknell_neo - endif -endfunction - -function! darkmodesocket#listenForLights() - let pid = string(getpid()) - let socket_name = '/tmp/nvim/nvim' . pid . '.sock' - call mkdir('/tmp/nvim', 'p') - call serverstart(socket_name) -endfunction diff --git a/nvim/nvim.symlink/autoload/dir.vim b/nvim/nvim.symlink/autoload/dir.vim deleted file mode 100644 index 4b720d7..0000000 --- a/nvim/nvim.symlink/autoload/dir.vim +++ /dev/null @@ -1,11 +0,0 @@ -function dir#ensureExists() - let required_dir = expand("%:h") - if !isdirectory(required_dir) - try - call mkdir(required_dir, 'p') - catch - echom "Could not create directory" - exit - endtry - endif -endfunction diff --git a/nvim/nvim.symlink/colors/default-light.vim b/nvim/nvim.symlink/colors/default-light.vim new file mode 100644 index 0000000..d49cff2 --- /dev/null +++ b/nvim/nvim.symlink/colors/default-light.vim @@ -0,0 +1,34 @@ +highlight SpecialKey ctermfg=4 +highlight TermCursor cterm=reverse +highlight NonText ctermfg=12 +highlight Directory ctermfg=4 +highlight ErrorMsg ctermfg=15 ctermbg=1 +highlight IncSearch cterm=reverse +highlight MoreMsg ctermfg=2 +highlight ModeMsg cterm=bold +highlight Question ctermfg=2 +highlight Title ctermfg=5 +highlight WarningMsg ctermfg=1 +highlight WildMenu ctermfg=0 ctermbg=11 +highlight Conceal ctermfg=7 ctermbg=7 +highlight SpellBad ctermbg=9 +highlight SpellRare ctermbg=13 +highlight SpellLocal ctermbg=14 +highlight PmenuSbar ctermbg=8 +highlight PmenuThumb ctermbg=0 +highlight TabLine cterm=underline ctermfg=0 ctermbg=7 +highlight TabLineSel cterm=bold +highlight TabLineFill cterm=reverse +highlight CursorColumn ctermbg=7 +highlight CursorLine cterm=underline +highlight MatchParen ctermbg=14 +highlight Constant ctermfg=1 +highlight Special ctermfg=5 +highlight Identifier cterm=NONE ctermfg=6 +highlight Statement ctermfg=3 +highlight PreProc ctermfg=5 +highlight Type ctermfg=2 +highlight Underlined cterm=underline ctermfg=5 +highlight Ignore ctermfg=15 +highlight Error ctermfg=15 ctermbg=9 +highlight Todo ctermfg=0 ctermbg=11 diff --git a/nvim/nvim.symlink/colors/dim.vim b/nvim/nvim.symlink/colors/dim.vim new file mode 100644 index 0000000..4534aab --- /dev/null +++ b/nvim/nvim.symlink/colors/dim.vim @@ -0,0 +1,58 @@ +highlight clear + +if exists("syntax_on") + syntax reset +endif + +exec "source " . expand(':p:h') . "/default-light.vim" + +let colors_name = "dim" + +" In diffs, added lines are green, changed lines are yellow, deleted lines are +" red, and changed text (within a changed line) is bright yellow and bold. +highlight DiffAdd ctermfg=0 ctermbg=2 +highlight DiffChange ctermfg=0 ctermbg=3 +highlight DiffDelete ctermfg=0 ctermbg=1 +highlight DiffText ctermfg=0 ctermbg=11 cterm=bold + +" Invert selected lines in visual mode +highlight Visual ctermfg=NONE ctermbg=NONE cterm=inverse + +" Highlight search matches in black, with a yellow background +highlight Search ctermfg=0 ctermbg=11 + +highlight LineNr ctermfg=3 +highlight CursorLineNr ctermfg=7 +highlight Comment ctermfg=8 +highlight ColorColumn ctermfg=7 ctermbg=8 +highlight Folded ctermfg=7 ctermbg=8 +highlight FoldColumn ctermfg=7 ctermbg=8 +highlight Pmenu ctermfg=15 ctermbg=8 +highlight PmenuSel ctermfg=8 ctermbg=15 +highlight SpellCap ctermfg=7 ctermbg=8 +highlight StatusLine ctermfg=15 ctermbg=8 cterm=bold +highlight StatusLineNC ctermfg=7 ctermbg=8 cterm=NONE +highlight VertSplit ctermfg=7 ctermbg=8 cterm=NONE +highlight SignColumn ctermbg=8 + +highlight link DimFzfFg Normal +highlight link DimFzfBg Normal +highlight link DimFzfFgPlus PmenuSel +highlight link DimFzfBgPlus PmenuSel +highlight link DimFzfInfo Comment + +highlight DimFzfHl ctermfg=2 +highlight DimFzfPrompt ctermfg=12 +highlight DimFzfPointer ctermfg=1 +highlight DimFzfMarker ctermfg=9 + +let g:fzf_colors = { 'fg': ['fg', 'DimFzfFg'], + \ 'bg': ['bg', 'DimFzfBg'], + \ 'hl': ['fg', 'DimFzfHl'], + \ 'fg+': ['fg', 'DimFzfFgPlus'], + \ 'bg+': ['bg', 'DimFzfbgPlus'], + \ 'hl+': ['fg', 'DimFzfHl'], + \ 'info': ['fg', 'DimFzfInfo'], + \ 'prompt': ['fg', 'DimFzfPrompt'], + \ 'pointer': ['fg', 'DimFzfPointer'], + \ 'marker': ['fg', 'DimFzfMarker']} diff --git a/nvim/nvim.symlink/colors/maxbucknell_dark.erb b/nvim/nvim.symlink/colors/maxbucknell_dark.erb deleted file mode 100644 index 556bce9..0000000 --- a/nvim/nvim.symlink/colors/maxbucknell_dark.erb +++ /dev/null @@ -1,355 +0,0 @@ -<% - # RNB, A VIM COLORSCHEME TEMPLATE - # Author: Romain Lafourcade (https://github.com/romainl) - # Canonical URL: https://gist.github.com/romainl/5cd2f4ec222805f49eca - - # This template is designed to help vimmers create their own colorschemes - # without much effort. - # - # You will need Ruby to generate your colorscheme but Ruby knowledge is - # not needed at all. - # - # The process is divided in four steps: - # 1. start by editing your colorscheme's information, - # 2. define your colors, - # 3. define your highlight groups and links, - # 4. and generate your colorscheme. - - # Step 1: information - # - # Make sure the name of your colorscheme is unique and attractive. - # The description should fit in a single line with no linefeed. - # 'background' can be "light" or "dark". - information = { - author: "Max Bucknell", - email: "me@maxbucknell.com", - name: "maxbucknell_light", - description: "My colour scheme, bruh.", - background: "light", - webpage: "https://github.com/maxbucknell/dotfiles" - } - - # ANSI Dark colours, picked with hue, 80% saturation, 80% brightness - # ANSI Light colours, picked with hue, 20% saturation, 93% brightness - darkred = ["#CC4129", 1, "darkred"] # 9º - red = ["#ECC4BD", 9, "red"] - - darkgreen = ["#4FCC29", 2, "darkgreen"] # 106º - green = ["#C8ECBD", 10, "green"] - - # Actually orange - darkorange = ["#CC7229", 3, "darkyellow"] # 27º - orange = ["#EDD3BE", 15, "white"] - - darkyellow = ["#CCC129", 3, "darkyellow"] # 56º - yellow = ["#EDEABE", 15, "white"] - - darkblue = ["#29A1CC", 4, "darkblue"] # 196º - blue = ["#BEE0EC", 15, "white"] - - darkmagenta = ["#CC29C9", 5, "darkmagenta"] # 301º - magenta = ["#ECBCEB", 15, "white"] - - darkcyan = ["#29CCBA", 6, "darkcyan"] # 173º - cyan = ["#ADD3BE", 14, "cyan"] - - grey = [ - ["#ECE9ED", 15, "white"], - ["#DFDDE0", 15, "white"], - ["#D2CFD3", 15, "white"], - ["#C6C3C7", 15, "white"], - ["#B7AFB9", 15, "white"], - ["#9E92A1", 15, "white"], - ["#806D87", 15, "white"], - ["#67556E", 15, "white"], - ["#4D3A54", 15, "white"], - ["#331E3B", 15, "white"], - ["#1A0821", 15, "white"], - ] - - background = grey[10] - foreground = grey[0] - - error = red - warning = yellow - info = orange - hint = blue - - search = green - symbol = magenta - - # Step 3: highlights - # - # You can define highlight groups like this: - # - # [ "Normal", name of the highlight group - # white, the color used for background color, or use "NONE", "fg" or "bg" - # darkgray, the color used for foreground color, or use "NONE", "fg" or "bg" - # "NONE" style, can be "bold", "underline", "reverse", "italic", - # "standout", "NONE" or "undercurl" - # ] - # - # The sample above tells Vim to render normal text in dark gray against a white - # background, without any styling. - # - # or link an highlight group to another: - # - # [ "Title", "Normal" ] - # - # In GUI Vim, there is an additional color for the undercurl used to - # highlight spelling mistakes: - # - # [ "SpellBad", name of the highlight group - # "NONE", the color used for background color, or use "NONE", "fg" or "bg" - # red, the color used for foreground color, or use "NONE", "fg" or "bg" - # "undercurl", style - # red color used for the undercurl - # ] - # - # The sample above tells Vim to render badly spelled words in red against the current - # background, with a red undercurl. - # - # You can add any custom highlight group to the standard list below but you shouldn't - # remove any if you want a working colorscheme. - highlights = [ - [ "Normal", background, foreground, "NONE" ], - [ "NormalFloat", background, foreground, "NONE" ], - [ "NormalNC", grey[8], foreground, "NONE"], - [ "NonText", "NONE", "NONE", "NONE" ], - [ "Comment", "NONE", "NONE", "bold" ], - [ "Constant", "NONE", "NONE", "NONE" ], - [ "Error", "NONE", "NONE", "NONE" ], - [ "CocErrorHighlight", darkred, error, "NONE" ], - [ "CocErrorSign", darkred, red, "NONE" ], - [ "CocWarningSign", darkyellow, yellow, "NONE" ], - [ "CocHintSign", darkblue, blue, "NONE" ], - [ "CocInfoSign", darkorange, orange, "NONE" ], - [ "CocErrorVirtualText", "NONE", darkred, "NONE" ], - [ "CocWarningVirtualText", "NONE", darkyellow, "NONE" ], - [ "CocHintVirtualText", "NONE", darkblue, "NONE" ], - [ "CocInfoVirtualText", "NONE", darkorange, "NONE" ], - [ "CocWarningHighlight", darkyellow, warning, "NONE" ], - [ "CocInfoHighlight", darkorange, info, "NONE" ], - [ "CocHintHighlight", darkblue, hint, "NONE" ], - [ "CocHighlightText", darkmagenta, symbol, "NONE" ], - [ "CocCodeLens", "NONE", grey[7] ], - [ "Identifier", "NONE", "NONE", "NONE" ], - [ "Ignore", "NONE", "NONE", "NONE" ], - [ "PreProc", "NONE", "NONE", "NONE" ], - [ "Special", "NONE", "NONE", "NONE" ], - [ "Statement", "NONE", "NONE", "NONE" ], - [ "String", "Constant" ], - [ "Number", "Constant" ], - [ "Todo", "NONE", "NONE" "NONE" ], - [ "Type", "NONE", "NONE", "NONE" ], - [ "Underlined", "NONE", "NONE", "NONE" ], - [ "StatusLine", grey[9], "NONE", "NONE" ], - [ "StatusLineNC", grey[7], "NONE", "NONE" ], - [ "VertSplit", "NONE", grey[3], "NONE" ], - [ "TabLine", "NONE", "NONE", "NONE" ], - [ "TabLineFill", "NONE", "NONE", "NONE" ], - [ "TabLineSel", "NONE", "NONE", "NONE" ], - [ "Title", "NONE", "NONE", "NONE" ], - [ "CursorLine", grey[9], "NONE", "NONE" ], - [ "LineNr", "NONE", "NONE", "NONE" ], - [ "CursorLineNr", "NONE", "NONE", "NONE" ], - [ "helpLeadBlank", "NONE", "NONE", "NONE" ], - [ "helpNormal", "NONE", "NONE", "NONE" ], - [ "Visual", blue, "NONE", "NONE" ], - [ "VisualNOS", blue, "NONE", "NONE" ], - [ "Pmenu", foreground, darkblue, "NONE" ], - [ "PmenuSbar", "NONE", "NONE", "NONE" ], - [ "PmenuSel", blue, background, "NONE" ], - [ "PmenuThumb", "NONE", "NONE", "NONE" ], - [ "FoldColumn", "NONE", "NONE", "NONE" ], - [ "Folded", "NONE", "NONE", "NONE" ], - [ "WildMenu", "NONE", "NONE", "NONE" ], - [ "SpecialKey", "NONE", "NONE", "NONE" ], - [ "DiffAdd", "NONE", "NONE", "NONE" ], - [ "DiffChange", "NONE", "NONE", "NONE" ], - [ "DiffDelete", "NONE", "NONE", "NONE" ], - [ "DiffText", "NONE", "NONE", "NONE" ], - [ "IncSearch", "NONE", green, "bold" ], - [ "Search", darkgreen, green, "NONE" ], - [ "Directory", "NONE", "NONE", "NONE" ], - [ "MatchParen", darkmagenta, magenta, "NONE" ], - [ "SpellBad", "NONE", "NONE", "NONE"], - [ "SpellCap", "NONE", "NONE", "NONE"], - [ "SpellLocal", "NONE", "NONE", "NONE"], - [ "SpellRare", "NONE", "NONE", "NONE"], - [ "ColorColumn", "NONE", "NONE", "NONE" ], - [ "SignColumn", grey[9], "NONE", "NONE" ], - [ "ErrorMsg", "NONE", "NONE", "NONE" ], - [ "ModeMsg", "NONE", "NONE", "NONE" ], - [ "MoreMsg", "NONE", "NONE", "NONE" ], - [ "Question", "NONE", "NONE", "NONE" ], - [ "WarningMsg", "Error" ], - [ "Cursor", "NONE", "NONE", "NONE" ], - [ "CursorColumn", "NONE", "NONE", "NONE" ], - [ "QuickFixLine", "NONE", "NONE", "NONE" ], - [ "StatusLineTerm", background, "NONE", "NONE" ], - [ "StatusLineTermNC", background, "NONE", "NONE" ], - [ "RainbowLevel1", grey[1], "NONE", "NONE" ], - [ "RainbowLevel3", grey[1], "NONE", "NONE" ], - [ "RainbowLevel5", grey[1], "NONE", "NONE" ], - [ "RainbowLevel7", grey[1], "NONE", "NONE" ], - [ "RainbowLevel9", grey[1], "NONE", "NONE" ], - [ "RainbowLevel11", grey[1], "NONE", "NONE" ], - [ "RainbowLevel13", grey[1], "NONE", "NONE" ], - [ "RainbowLevel15", grey[1], "NONE", "NONE" ], - ] - - # Define the color palette used by :terminal when in GUI Vim - # or in TUI Vim when 'termguicolors' is enabled. If this list - # is empty or if it doesn't contain exactly 16 items, the corresponding - # Vim variable won't be set. - # - # The expected values are colors defined in step 2. - terminal_ansi_colors = [ - grey[0], - darkred, - darkgreen, - darkyellow, - darkblue, - darkmagenta, - darkcyan, - grey[10], - grey[3], - red, - green, - yellow, - blue, - magenta, - cyan, - grey[8] - ] - - # Step 4: generation - # - # From a separate shell: - # - # $ erb -T - bar.erb > bar.vim - # - # From Vim: - # - # :!erb -T - % > %<.vim - - # These online resources can help you design your colorscheme: - # - # * http://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg - # the xterm palette - # * http://whatcolor.herokuapp.com/ - # play with hexadecimal colors right in the address bar (currently down) - # * http://color.hailpixel.com/ - # similar concept, fuzzier implementation - # * http://colourco.de/ - # similar concept, fancier implementation - # * http://www.colr.org/ - # extract a palette from an image - # * http://colores.manugarri.com/ - # search for 'word', get images and color palettes - # * http://www.colourlovers.com/palettes - # user-created palettes - # * http://www.perbang.dk/color+scheme/ - # a no-nonsense colorscheme generator - # * https://color.adobe.com/ - # Adobe's fancy colorscheme generator - # * http://paletton.com/ - # The classic 'Color Scheme Designer', rebranded - # * http://vrl.cs.brown.edu/color - # A very smart palette generator - # * https://cmcenroe.me/2018/04/03/colour-scheme.html - # "I Made My Own Colour Scheme and You Can Too!" - - # A few general advices: - # - # * The Windows console is limited to the 16 so-called "ANSI" colors but it has - # a few of them interverted which makes numbers impractical. Use color names - # instead of numbers: :help cterm-colors - # * The Windows console (yeah…) doesn't do italics, underlines or bolded text; - # it is limited to normal and reverse. Keep that in mind if you want - # your colorscheme to be usable in as many environments as possible by as many - # people as possible. - # * All of the terminal emulators in use these days allow their users to - # change the 16 so-called "ANSI" colors. It is also possible on some platforms - # to change some or all of the 256 colors in the xterm palette. Don't take - # anything for granted. - # * When used against a light background, strong colors work better than muted - # ones. Light or dark doesn't really matters. Also, it is harder to discriminate - # between two similar colors on a light background. - # * Both strong and muted colors work well against a dark background. It is also - # easier to work with similar colors, but dark colors don't work at all. - # * Use as many text samples as possible. String-heavy languages may look completely - # different than keyword-heavy ones. This can have an impact on the usability - # of your colorscheme. - # * Most terminal emulators and terminal multiplexers currently in use on unix-like - # systems support 256 colors but they almost always default to a '$TERM' that tells - # Vim otherwise. Your users will need to make sure their terminal emulator/multiplexer - # is correctly set up if they want to enjoy the best possible experience. - - # Many thanks to Barry Arthur (https://github.com/dahu) for the original idea. - - # You don't need to edit anything beyond this line. --%> -" <%= information[:name] %>.vim -- Vim color scheme. -" Author: <%= information[:author] %> (<%= information[:email] %>) -" Webpage: <%= information[:webpage] %> -" Description: <%= information[:description] %> - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "<%= information[:name].downcase %>" - -if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") -<% for highlight in highlights -%> -<% if highlight.length == 4 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> -<% if highlight[0] == "Normal" -%> -<%= '' %> - set background=<%= information[:background] %> -<%= '' %> -<% end -%> -<% elsif highlight.length > 4 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> guisp=<%= highlight[4].kind_of?(String) ? highlight[4] : highlight[4][0] %> -<% end -%> -<% end -%> - -elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 - set t_Co=16 -<%= '' %> -<% for highlight in highlights -%> -<% if highlight.length > 2 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][2] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][2] %> cterm=<%= highlight[3] %> -<% if highlight[0] == "Normal" -%> -<%= '' %> - set background=<%= information[:background] %> -<%= '' %> -<% end -%> -<% end -%> -<% end -%> -endif -<% links = highlights.select do |highlight| -%> -<% highlight.length == 2 -%> -<% end -%> -<% if links.length > 0 -%> -<%= '' %> -<% for link in links -%> -hi link <%= link[0] %> <%= link[1] %> -<% end -%> -<% end -%> -<% if terminal_ansi_colors.length == 16 -%> -<%= '' %> -let g:terminal_ansi_colors = [ -<% for color in terminal_ansi_colors -%> - \ '<%= color[0] %>', -<% end -%> - \ ] -<% end -%> - - - -" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/colors/maxbucknell_dark.vim b/nvim/nvim.symlink/colors/maxbucknell_dark.vim deleted file mode 100644 index df09103..0000000 --- a/nvim/nvim.symlink/colors/maxbucknell_dark.vim +++ /dev/null @@ -1,214 +0,0 @@ -" maxbucknell_light.vim -- Vim color scheme. -" Author: Max Bucknell (me@maxbucknell.com) -" Webpage: https://github.com/maxbucknell/dotfiles -" Description: My colour scheme, bruh. - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "maxbucknell_light" - -if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") - hi Normal ctermbg=15 ctermfg=15 cterm=NONE guibg=#1A0821 guifg=#ECE9ED gui=NONE - - set background=light - - hi NormalFloat ctermbg=15 ctermfg=15 cterm=NONE guibg=#1A0821 guifg=#ECE9ED gui=NONE - hi NormalNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#4D3A54 guifg=#ECE9ED gui=NONE - hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Comment ctermbg=NONE ctermfg=NONE cterm=bold guibg=NONE guifg=NONE gui=bold - hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Error ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocErrorHighlight ctermbg=1 ctermfg=9 cterm=NONE guibg=#CC4129 guifg=#ECC4BD gui=NONE - hi CocErrorSign ctermbg=1 ctermfg=9 cterm=NONE guibg=#CC4129 guifg=#ECC4BD gui=NONE - hi CocWarningSign ctermbg=3 ctermfg=15 cterm=NONE guibg=#CCC129 guifg=#EDEABE gui=NONE - hi CocHintSign ctermbg=4 ctermfg=15 cterm=NONE guibg=#29A1CC guifg=#BEE0EC gui=NONE - hi CocInfoSign ctermbg=3 ctermfg=15 cterm=NONE guibg=#CC7229 guifg=#EDD3BE gui=NONE - hi CocErrorVirtualText ctermbg=NONE ctermfg=1 cterm=NONE guibg=NONE guifg=#CC4129 gui=NONE - hi CocWarningVirtualText ctermbg=NONE ctermfg=3 cterm=NONE guibg=NONE guifg=#CCC129 gui=NONE - hi CocHintVirtualText ctermbg=NONE ctermfg=4 cterm=NONE guibg=NONE guifg=#29A1CC gui=NONE - hi CocInfoVirtualText ctermbg=NONE ctermfg=3 cterm=NONE guibg=NONE guifg=#CC7229 gui=NONE - hi CocWarningHighlight ctermbg=3 ctermfg=15 cterm=NONE guibg=#CCC129 guifg=#EDEABE gui=NONE - hi CocInfoHighlight ctermbg=3 ctermfg=15 cterm=NONE guibg=#CC7229 guifg=#EDD3BE gui=NONE - hi CocHintHighlight ctermbg=4 ctermfg=15 cterm=NONE guibg=#29A1CC guifg=#BEE0EC gui=NONE - hi CocHighlightText ctermbg=5 ctermfg=15 cterm=NONE guibg=#CC29C9 guifg=#ECBCEB gui=NONE - hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Special ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Type ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLine ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE - hi StatusLineNC ctermbg=15 ctermfg=NONE cterm=NONE guibg=#67556E guifg=NONE gui=NONE - hi VertSplit ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#C6C3C7 gui=NONE - hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Title ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorLine ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE - hi LineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Visual ctermbg=15 ctermfg=NONE cterm=NONE guibg=#BEE0EC guifg=NONE gui=NONE - hi VisualNOS ctermbg=15 ctermfg=NONE cterm=NONE guibg=#BEE0EC guifg=NONE gui=NONE - hi Pmenu ctermbg=15 ctermfg=4 cterm=NONE guibg=#ECE9ED guifg=#29A1CC gui=NONE - hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PmenuSel ctermbg=15 ctermfg=15 cterm=NONE guibg=#BEE0EC guifg=#1A0821 gui=NONE - hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi IncSearch ctermbg=NONE ctermfg=10 cterm=bold guibg=NONE guifg=#C8ECBD gui=bold - hi Search ctermbg=2 ctermfg=10 cterm=NONE guibg=#4FCC29 guifg=#C8ECBD gui=NONE - hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi MatchParen ctermbg=5 ctermfg=15 cterm=NONE guibg=#CC29C9 guifg=#ECBCEB gui=NONE - hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SignColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE - hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Question ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLineTerm ctermbg=15 ctermfg=NONE cterm=NONE guibg=#1A0821 guifg=NONE gui=NONE - hi StatusLineTermNC ctermbg=15 ctermfg=NONE cterm=NONE guibg=#1A0821 guifg=NONE gui=NONE - hi RainbowLevel1 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel3 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel5 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel7 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel9 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel11 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel13 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - hi RainbowLevel15 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE - -elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 - set t_Co=16 - - hi Normal ctermbg=white ctermfg=white cterm=NONE - - set background=light - - hi NormalFloat ctermbg=white ctermfg=white cterm=NONE - hi NormalNC ctermbg=white ctermfg=white cterm=NONE - hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE - hi Comment ctermbg=NONE ctermfg=NONE cterm=bold - hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE - hi Error ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocErrorHighlight ctermbg=darkred ctermfg=red cterm=NONE - hi CocErrorSign ctermbg=darkred ctermfg=red cterm=NONE - hi CocWarningSign ctermbg=darkyellow ctermfg=white cterm=NONE - hi CocHintSign ctermbg=darkblue ctermfg=white cterm=NONE - hi CocInfoSign ctermbg=darkyellow ctermfg=white cterm=NONE - hi CocErrorVirtualText ctermbg=NONE ctermfg=darkred cterm=NONE - hi CocWarningVirtualText ctermbg=NONE ctermfg=darkyellow cterm=NONE - hi CocHintVirtualText ctermbg=NONE ctermfg=darkblue cterm=NONE - hi CocInfoVirtualText ctermbg=NONE ctermfg=darkyellow cterm=NONE - hi CocWarningHighlight ctermbg=darkyellow ctermfg=white cterm=NONE - hi CocInfoHighlight ctermbg=darkyellow ctermfg=white cterm=NONE - hi CocHintHighlight ctermbg=darkblue ctermfg=white cterm=NONE - hi CocHighlightText ctermbg=darkmagenta ctermfg=white cterm=NONE - hi CocCodeLens ctermbg=NONE ctermfg=white cterm= - hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE - hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE - hi Special ctermbg=NONE ctermfg=NONE cterm=NONE - hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE - hi Todo ctermbg=NONE ctermfg=NONENONE cterm= - hi Type ctermbg=NONE ctermfg=NONE cterm=NONE - hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLine ctermbg=white ctermfg=NONE cterm=NONE - hi StatusLineNC ctermbg=white ctermfg=NONE cterm=NONE - hi VertSplit ctermbg=NONE ctermfg=white cterm=NONE - hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE - hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE - hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE - hi Title ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorLine ctermbg=white ctermfg=NONE cterm=NONE - hi LineNr ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE - hi Visual ctermbg=white ctermfg=NONE cterm=NONE - hi VisualNOS ctermbg=white ctermfg=NONE cterm=NONE - hi Pmenu ctermbg=white ctermfg=darkblue cterm=NONE - hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE - hi PmenuSel ctermbg=white ctermfg=white cterm=NONE - hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE - hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE - hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE - hi IncSearch ctermbg=NONE ctermfg=green cterm=bold - hi Search ctermbg=darkgreen ctermfg=green cterm=NONE - hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE - hi MatchParen ctermbg=darkmagenta ctermfg=white cterm=NONE - hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE - hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi SignColumn ctermbg=white ctermfg=NONE cterm=NONE - hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi Question ctermbg=NONE ctermfg=NONE cterm=NONE - hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLineTerm ctermbg=white ctermfg=NONE cterm=NONE - hi StatusLineTermNC ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel1 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel3 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel5 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel7 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel9 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel11 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel13 ctermbg=white ctermfg=NONE cterm=NONE - hi RainbowLevel15 ctermbg=white ctermfg=NONE cterm=NONE -endif - -hi link String Constant -hi link Number Constant -hi link WarningMsg Error - -let g:terminal_ansi_colors = [ - \ '#ECE9ED', - \ '#CC4129', - \ '#4FCC29', - \ '#CCC129', - \ '#29A1CC', - \ '#CC29C9', - \ '#29CCBA', - \ '#1A0821', - \ '#C6C3C7', - \ '#ECC4BD', - \ '#C8ECBD', - \ '#EDEABE', - \ '#BEE0EC', - \ '#ECBCEB', - \ '#ADD3BE', - \ '#4D3A54', - \ ] - - - -" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/colors/maxbucknell_neo.erb b/nvim/nvim.symlink/colors/maxbucknell_neo.erb deleted file mode 100644 index d79e721..0000000 --- a/nvim/nvim.symlink/colors/maxbucknell_neo.erb +++ /dev/null @@ -1,281 +0,0 @@ -<% - # RNB, A VIM COLORSCHEME TEMPLATE - # Author: Romain Lafourcade (https://github.com/romainl) - # Canonical URL: https://gist.github.com/romainl/5cd2f4ec222805f49eca - - # This template is designed to help vimmers create their own colorschemes - # without much effort. - # - # You will need Ruby to generate your colorscheme but Ruby knowledge is - # not needed at all. - # - # The process is divided in four steps: - # 1. start by editing your colorscheme's information, - # 2. define your colors, - # 3. define your highlight groups and links, - # 4. and generate your colorscheme. - - # Step 1: information - # - # Make sure the name of your colorscheme is unique and attractive. - # The description should fit in a single line with no linefeed. - # 'background' can be "light" or "dark". - information = { - author: "Max Bucknell", - email: "me@maxbucknell.com", - name: "maxbucknell_neo", - description: "My colour scheme, bruh.", - background: "light", - webpage: "https://github.com/maxbucknell/dotfiles" - } - - def grey(v) - hex = v.to_s(16).rjust(2, '0') - color = "#" + hex * 3 - - return [color, 15, "white"] - end - - def color(r, g, b) - hex = [r, g, b].map { |v| v.to_s(16).rjust(2, '0') }.join("") - - return ["#" + hex, 15, "white"] - end - - background = 255 - 32 - foreground = 31 - - background_float = background + 6 - background_nc = background - 6 - - gutter = background - 12 - colorcolumn = background - 12 - - trail = foreground + 48 - virtual = background - 48 - - cursor_line = background + 12 - - pmenu_background = background - 54 - pmenu_foreground = foreground + 36 - pmenu_background_selected = background - 36 - pmenu_foreground_selected = foreground + 24 - - highlights = [ - [ "Normal", grey(background), grey(foreground), "NONE" ], - [ "NormalFloat", grey(background_float), grey(foreground), "NONE" ], - [ "NormalNC", grey(background_nc), grey(foreground), "NONE"], - [ "NonText", "NONE", trail, "NONE" ], - [ "Comment", "NONE", "NONE", "bold" ], - [ "Constant", "NONE", "NONE", "NONE" ], - [ "Error", "NONE", "NONE", "NONE" ], - [ "CocErrorSign", "NONE", "NONE", "NONE" ], - [ "CocWarningSign", "NONE", "NONE", "NONE" ], - [ "CocHintSign", "NONE", "NONE", "NONE" ], - [ "CocInfoSign", "NONE", "NONE", "NONE" ], - [ "CocErrorVirtualText", "NONE", grey(virtual), "NONE" ], - [ "CocWarningVirtualText", "NONE", grey(virtual), "NONE" ], - [ "CocHintVirtualText", "NONE", grey(virtual), "NONE" ], - [ "CocInfoVirtualText", "NONE", grey(virtual), "NONE" ], - [ "CocErrorHighlight", "NONE", "NONE", "NONE" ], - [ "CocWarningHighlight", "NONE", "NONE", "NONE" ], - [ "CocInfoHighlight", "NONE", "NONE", "NONE" ], - [ "CocHintHighlight", "NONE", "NONE", "NONE" ], - [ "CocHighlightText", "NONE", "NONE", "NONE" ], - [ "Identifier", "NONE", "NONE", "NONE" ], - [ "Ignore", "NONE", "NONE", "NONE" ], - [ "PreProc", "NONE", "NONE", "NONE" ], - [ "Special", "NONE", "NONE", "NONE" ], - [ "Statement", "NONE", "NONE", "NONE" ], - [ "String", "Constant" ], - [ "Number", "Constant" ], - [ "Todo", "NONE", "NONE" "NONE" ], - [ "Type", "NONE", "NONE", "NONE" ], - [ "Underlined", "NONE", "NONE", "NONE" ], - [ "StatusLine", grey(background), grey(foreground), "NONE" ], - [ "StatusLineNC", grey(background_nc), grey(foreground), "NONE" ], - [ "VertSplit", "NONE", grey(foreground), "NONE" ], - [ "TabLine", "NONE", "NONE", "NONE" ], - [ "TabLineFill", "NONE", "NONE", "NONE" ], - [ "TabLineSel", "NONE", "NONE", "NONE" ], - [ "Title", "NONE", "NONE", "NONE" ], - [ "CursorLine", cursor_line, "NONE", "NONE" ], - [ "LineNr", grey(gutter), "NONE", "NONE" ], - [ "CursorLineNr", "NONE", "NONE", "NONE" ], - [ "helpLeadBlank", "NONE", "NONE", "NONE" ], - [ "helpNormal", "NONE", "NONE", "NONE" ], - [ "Visual", grey(foreground), grey(background), "NONE" ], - [ "VisualNOS", "NONE", "NONE", "NONE" ], - [ "Pmenu", grey(pmenu_background), grey(pmenu_foreground), "NONE" ], - [ "PmenuSbar", "NONE", "NONE", "NONE" ], - [ "PmenuSel", grey(pmenu_background_selected), grey(pmenu_foreground_selected), "NONE" ], - [ "PmenuThumb", "NONE", "NONE", "NONE" ], - [ "FoldColumn", "NONE", "NONE", "NONE" ], - [ "Folded", "NONE", "NONE", "NONE" ], - [ "WildMenu", "NONE", "NONE", "NONE" ], - [ "SpecialKey", "NONE", "NONE", "NONE" ], - [ "DiffAdd", "NONE", "NONE", "NONE" ], - [ "DiffChange", "NONE", "NONE", "NONE" ], - [ "DiffDelete", "NONE", "NONE", "NONE" ], - [ "DiffText", "NONE", "NONE", "NONE" ], - [ "IncSearch", "NONE", "NONE", "underline" ], - [ "Search", "NONE", "NONE", "underline" ], - [ "Directory", "NONE", "NONE", "NONE" ], - [ "MatchParen", grey(background + 18), "NONE", "NONE" ], - [ "SpellBad", "NONE", "NONE", "NONE"], - [ "SpellCap", "NONE", "NONE", "NONE"], - [ "SpellLocal", "NONE", "NONE", "NONE"], - [ "SpellRare", "NONE", "NONE", "NONE"], - [ "ColorColumn", grey(colorcolumn), "NONE", "NONE" ], - [ "SignColumn", grey(gutter), "NONE", "NONE" ], - [ "ErrorMsg", "NONE", "NONE", "NONE" ], - [ "ModeMsg", "NONE", "NONE", "NONE" ], - [ "MoreMsg", "NONE", "NONE", "NONE" ], - [ "Question", "NONE", "NONE", "NONE" ], - [ "WarningMsg", "Error" ], - [ "Cursor", "NONE", "NONE", "NONE" ], - [ "CursorColumn", "NONE", "NONE", "NONE" ], - [ "QuickFixLine", "NONE", "NONE", "NONE" ], - [ "StatusLineTerm", "NONE", "NONE", "NONE" ], - [ "StatusLineTermNC", "NONE", "NONE", "NONE" ], - ] - - # Define the color palette used by :terminal when in GUI Vim - # or in TUI Vim when 'termguicolors' is enabled. If this list - # is empty or if it doesn't contain exactly 16 items, the corresponding - # Vim variable won't be set. - # - # The expected values are colors defined in step 2. - terminal_ansi_colors = [ - - ] - - # Step 4: generation - # - # From a separate shell: - # - # $ erb -T - bar.erb > bar.vim - # - # From Vim: - # - # :!erb -T - % > %<.vim - - # These online resources can help you design your colorscheme: - # - # * http://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg - # the xterm palette - # * http://whatcolor.herokuapp.com/ - # play with hexadecimal colors right in the address bar (currently down) - # * http://color.hailpixel.com/ - # similar concept, fuzzier implementation - # * http://colourco.de/ - # similar concept, fancier implementation - # * http://www.colr.org/ - # extract a palette from an image - # * http://colores.manugarri.com/ - # search for 'word', get images and color palettes - # * http://www.colourlovers.com/palettes - # user-created palettes - # * http://www.perbang.dk/color+scheme/ - # a no-nonsense colorscheme generator - # * https://color.adobe.com/ - # Adobe's fancy colorscheme generator - # * http://paletton.com/ - # The classic 'Color Scheme Designer', rebranded - # * http://vrl.cs.brown.edu/color - # A very smart palette generator - # * https://cmcenroe.me/2018/04/03/colour-scheme.html - # "I Made My Own Colour Scheme and You Can Too!" - - # A few general advices: - # - # * The Windows console is limited to the 16 so-called "ANSI" colors but it has - # a few of them interverted which makes numbers impractical. Use color names - # instead of numbers: :help cterm-colors - # * The Windows console (yeah…) doesn't do italics, underlines or bolded text; - # it is limited to normal and reverse. Keep that in mind if you want - # your colorscheme to be usable in as many environments as possible by as many - # people as possible. - # * All of the terminal emulators in use these days allow their users to - # change the 16 so-called "ANSI" colors. It is also possible on some platforms - # to change some or all of the 256 colors in the xterm palette. Don't take - # anything for granted. - # * When used against a light background, strong colors work better than muted - # ones. Light or dark doesn't really matters. Also, it is harder to discriminate - # between two similar colors on a light background. - # * Both strong and muted colors work well against a dark background. It is also - # easier to work with similar colors, but dark colors don't work at all. - # * Use as many text samples as possible. String-heavy languages may look completely - # different than keyword-heavy ones. This can have an impact on the usability - # of your colorscheme. - # * Most terminal emulators and terminal multiplexers currently in use on unix-like - # systems support 256 colors but they almost always default to a '$TERM' that tells - # Vim otherwise. Your users will need to make sure their terminal emulator/multiplexer - # is correctly set up if they want to enjoy the best possible experience. - - # Many thanks to Barry Arthur (https://github.com/dahu) for the original idea. - - # You don't need to edit anything beyond this line. --%> -" <%= information[:name] %>.vim -- Vim color scheme. -" Author: <%= information[:author] %> (<%= information[:email] %>) -" Webpage: <%= information[:webpage] %> -" Description: <%= information[:description] %> - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "<%= information[:name].downcase %>" - -if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") -<% for highlight in highlights -%> -<% if highlight.length == 4 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> -<% if highlight[0] == "Normal" -%> -<%= '' %> - set background=<%= information[:background] %> -<%= '' %> -<% end -%> -<% elsif highlight.length > 4 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> guisp=<%= highlight[4].kind_of?(String) ? highlight[4] : highlight[4][0] %> -<% end -%> -<% end -%> - -elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 - set t_Co=16 -<%= '' %> -<% for highlight in highlights -%> -<% if highlight.length > 2 -%> - hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][2] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][2] %> cterm=<%= highlight[3] %> -<% if highlight[0] == "Normal" -%> -<%= '' %> - set background=<%= information[:background] %> -<%= '' %> -<% end -%> -<% end -%> -<% end -%> -endif -<% links = highlights.select do |highlight| -%> -<% highlight.length == 2 -%> -<% end -%> -<% if links.length > 0 -%> -<%= '' %> -<% for link in links -%> -hi link <%= link[0] %> <%= link[1] %> -<% end -%> -<% end -%> -<% if terminal_ansi_colors.length == 16 -%> -<%= '' %> -let g:terminal_ansi_colors = [ -<% for color in terminal_ansi_colors -%> - \ '<%= color[0] %>', -<% end -%> - \ ] -<% end -%> - - - -" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/colors/maxbucknell_neo.vim b/nvim/nvim.symlink/colors/maxbucknell_neo.vim deleted file mode 100644 index db71aa0..0000000 --- a/nvim/nvim.symlink/colors/maxbucknell_neo.vim +++ /dev/null @@ -1,178 +0,0 @@ -" maxbucknell_neo.vim -- Vim color scheme. -" Author: Max Bucknell (me@maxbucknell.com) -" Webpage: https://github.com/maxbucknell/dotfiles -" Description: My colour scheme, bruh. - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "maxbucknell_neo" - -if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") - hi Normal ctermbg=15 ctermfg=15 cterm=NONE guibg=#dfdfdf guifg=#1f1f1f gui=NONE - - set background=light - - hi NormalFloat ctermbg=15 ctermfg=15 cterm=NONE guibg=#e5e5e5 guifg=#1f1f1f gui=NONE - hi NormalNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#d9d9d9 guifg=#1f1f1f gui=NONE - hi NonText ctermbg=NONE ctermfg=1 cterm=NONE guibg=NONE guifg=1 gui=NONE - hi Comment ctermbg=NONE ctermfg=NONE cterm=bold guibg=NONE guifg=NONE gui=bold - hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Error ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocErrorSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocWarningSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocHintSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocInfoSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocErrorVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE - hi CocWarningVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE - hi CocHintVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE - hi CocInfoVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE - hi CocErrorHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocWarningHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocInfoHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocHintHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocHighlightText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Special ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Type ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLine ctermbg=15 ctermfg=15 cterm=NONE guibg=#dfdfdf guifg=#1f1f1f gui=NONE - hi StatusLineNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#d9d9d9 guifg=#1f1f1f gui=NONE - hi VertSplit ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#1f1f1f gui=NONE - hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Title ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorLine ctermbg=1 ctermfg=NONE cterm=NONE guibg=1 guifg=NONE gui=NONE - hi LineNr ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE - hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Visual ctermbg=15 ctermfg=15 cterm=NONE guibg=#1f1f1f guifg=#dfdfdf gui=NONE - hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Pmenu ctermbg=15 ctermfg=15 cterm=NONE guibg=#a9a9a9 guifg=#434343 gui=NONE - hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PmenuSel ctermbg=15 ctermfg=15 cterm=NONE guibg=#bbbbbb guifg=#373737 gui=NONE - hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi IncSearch ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline - hi Search ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline - hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi MatchParen ctermbg=15 ctermfg=NONE cterm=NONE guibg=#f1f1f1 guifg=NONE gui=NONE - hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi ColorColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE - hi SignColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE - hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Question ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLineTerm ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLineTermNC ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - -elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 - set t_Co=16 - - hi Normal ctermbg=white ctermfg=white cterm=NONE - - set background=light - - hi NormalFloat ctermbg=white ctermfg=white cterm=NONE - hi NormalNC ctermbg=white ctermfg=white cterm=NONE - hi NonText ctermbg=NONE ctermfg=1 cterm=NONE - hi Comment ctermbg=NONE ctermfg=NONE cterm=bold - hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE - hi Error ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocErrorSign ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocWarningSign ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocHintSign ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocInfoSign ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocErrorVirtualText ctermbg=NONE ctermfg=white cterm=NONE - hi CocWarningVirtualText ctermbg=NONE ctermfg=white cterm=NONE - hi CocHintVirtualText ctermbg=NONE ctermfg=white cterm=NONE - hi CocInfoVirtualText ctermbg=NONE ctermfg=white cterm=NONE - hi CocErrorHighlight ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocWarningHighlight ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocInfoHighlight ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocHintHighlight ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocHighlightText ctermbg=NONE ctermfg=NONE cterm=NONE - hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE - hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE - hi Special ctermbg=NONE ctermfg=NONE cterm=NONE - hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE - hi Todo ctermbg=NONE ctermfg=NONENONE cterm= - hi Type ctermbg=NONE ctermfg=NONE cterm=NONE - hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLine ctermbg=white ctermfg=white cterm=NONE - hi StatusLineNC ctermbg=white ctermfg=white cterm=NONE - hi VertSplit ctermbg=NONE ctermfg=white cterm=NONE - hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE - hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE - hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE - hi Title ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorLine ctermbg=0 ctermfg=NONE cterm=NONE - hi LineNr ctermbg=white ctermfg=NONE cterm=NONE - hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE - hi Visual ctermbg=white ctermfg=white cterm=NONE - hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=NONE - hi Pmenu ctermbg=white ctermfg=white cterm=NONE - hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE - hi PmenuSel ctermbg=white ctermfg=white cterm=NONE - hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE - hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE - hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE - hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE - hi IncSearch ctermbg=NONE ctermfg=NONE cterm=underline - hi Search ctermbg=NONE ctermfg=NONE cterm=underline - hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE - hi MatchParen ctermbg=white ctermfg=NONE cterm=NONE - hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE - hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE - hi ColorColumn ctermbg=white ctermfg=NONE cterm=NONE - hi SignColumn ctermbg=white ctermfg=NONE cterm=NONE - hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE - hi Question ctermbg=NONE ctermfg=NONE cterm=NONE - hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLineTerm ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLineTermNC ctermbg=NONE ctermfg=NONE cterm=NONE -endif - -hi link String Constant -hi link Number Constant -hi link WarningMsg Error - - - -" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/init.vim b/nvim/nvim.symlink/init.vim index c01a6b4..b2a3646 100644 --- a/nvim/nvim.symlink/init.vim +++ b/nvim/nvim.symlink/init.vim @@ -1,48 +1,10 @@ -" Let's get the plugins out of the way first, shall we? -call plug#begin() - " Fuzzy finding - Plug '/usr/local/opt/fzf' - Plug 'junegunn/fzf.vim' - - " Completion - Plug 'neoclide/coc.nvim', {'do': { -> coc#util#install()}} - - " Snippets - Plug 'SirVer/ultisnips' - - " Repeating custom motions - Plug 'tpope/vim-repeat' - - " Surround - Plug 'tpope/vim-surround' - - " Git integration - Plug 'tpope/vim-fugitive' - - " Comments - Plug 'tpope/vim-commentary' - - " (Java|Type)Script - Plug 'HerringtonDarkholme/yats.vim' - - " Go - Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' } - - " Rust - Plug 'rust-lang/rust.vim' - - " CSS Colour previews - Plug 'maxbucknell/Colorizer', { 'branch': 'neovim-virtual-text' } - - " JSON with comments, just for TypeScript - Plug 'kevinoid/vim-jsonc' - - " I can't believe I'm doing this. - Plug 'camspiers/animate.vim' -call plug#end() - " I have a true colour terminal, and I will have true colours in my Vim -set termguicolors +" +" UPDATE: While true, I actually wnat to use only basic colours for Vim. I +" want it to inherit styles from my terminal, so I don't need to worry about +" changing the colorscheme when my system appearance transitions. Too much +" hassle. +" set termguicolors " Disable creation of swap files. " @@ -59,7 +21,8 @@ set colorcolumn=80 set updatetime=300 " I always want a sign column -set signcolumn=yes +" I am not using Vim as my main editor (now), so I am disabling this +" set signcolumn=yes " Trying this bizarre method of self location again. set cursorline @@ -150,15 +113,14 @@ set softtabstop=4 set autoindent " Enable highlighting for syntax -syntax on +syntax off +hi LineNr ctermfg=4 +hi CursorLineNr ctermfg=7 ctermbg=0 +hi Search ctermfg=7 ctermbg=8 " Enable file type detection. filetype plugin indent on -call darkmodesocket#updateTheme() - -let g:go_def_mapping_enabled = 0 - " Lead with the biggest button on the motherfucking keyboard let mapleader = "\" let localmapleader = "\\" @@ -179,16 +141,15 @@ let localmapleader = "\\" " " To encourage me to adopt the new style, I disable escape. That one is " sure to mess up someone not familiar with my setup. -inoremap hh -inoremap hhh h +" +" UPDATE: As a Qwerty user (now), I can use jk +inoremap jk " Terminal mode setting -tnoremap hh -tnoremap hhh h +tnoremap jk " Visual mode setting -vnoremap hh -vnoremap hhh h +vnoremap jk " Go to most recently edited file nnoremap @@ -196,28 +157,6 @@ nnoremap " Insert new lines nnoremap i -" Ultisnips, y'all -" I previously configured tab as a trigger here, but now I just -" use CoC -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" - -" Colorizer adds little colour swatches next to CSS colours -let g:colorizer_auto_filetype='css,less,scss,sass' -let g:colorizer_colornames = 0 -let g:colorizer_use_virtual_text = 1 - -" Coc -" -" I'm not sure that I like Coc, its configuration feels very "unvimmy", but it -" is the only completion engine that integrates well with language servers and -" handles other language server tasks, like linting. -" -" The alternative would be to use some completion plugin (like deoplete), and -" then a whole separate process for linting, when both require the same -" inputs. Waste of energy. - " Remap semi-colon to colon. " " Colon is the starting point of a lot of actions in Vim. And I @@ -249,50 +188,12 @@ augroup END " Focus mode nmap z ZoomOrUnzoom -" And make moving around splits just a little bit sane. +" And make moving around splits just a little bit easier nnoremap nnoremap nnoremap nnoremap -" A load of default file runners. These need to be refactored, so that they -" are in filetype plugins, and would probably be better served by being bound -" to the localleader. -function! RunTypeScript() - silent !clear - execute "!$(findroot package.json)/node_modules/.bin/mocha -r ts-node/register -R dot %" -endfunction - -function! RunJavaScript() - silent !clear - execute "!$(findroot package.json)/node_modules/.bin/mocha -R dot %" -endfunction - -function! RunPython() - silent !clear - execute "!python %" -endfunction - -function! RunRust() - silent !clear - execute "!cargo run" -endfunction - -function! OpenInMarked() - silent !clear - execute '!open "x-marked://open?file=%:p"' -endfunction - -augroup runFiles - autocmd! - - autocmd FileType typescript nnoremap r :call RunTypeScript() - autocmd FileType javascript nnoremap r :call RunJavaScript() - autocmd FileType python nnoremap r :call RunPython() - autocmd FileType rust nnoremap r :call RunRust() - autocmd FileType markdown nnoremap r :call OpenInMarked() -augroup END - " Text formatting rules for various files. augroup textFormatting autocmd! @@ -331,13 +232,6 @@ augroup terminalInsert autocmd TermOpen term://* startinsert augroup END -augroup WindowManagement - autocmd! - - autocmd WinEnter * setl rnu cul syntax=on - autocmd WinLeave * setl nornu nocul syntax=off -augroup END - nnoremap \ SynStack diff --git a/nvim/nvim.symlink/plugin/startup.vim b/nvim/nvim.symlink/plugin/startup.vim index 02905dc..11503f9 100644 --- a/nvim/nvim.symlink/plugin/startup.vim +++ b/nvim/nvim.symlink/plugin/startup.vim @@ -1,6 +1,4 @@ function! StartUp() - call darkmodesocket#listenForLights() - call UpdatePlugReminder() endfunc augroup startUp diff --git a/zsh/zsh.symlink/fzf.zsh b/zsh/zsh.symlink/fzf.zsh index 259d156..358355b 100644 --- a/zsh/zsh.symlink/fzf.zsh +++ b/zsh/zsh.symlink/fzf.zsh @@ -1,14 +1,14 @@ # Setup fzf # --------- -if [[ ! "$PATH" == */usr/local/opt/fzf/bin* ]]; then - export PATH="$PATH:/usr/local/opt/fzf/bin" +if [[ ! "$PATH" == */opt/homebrew/opt/fzf/bin* ]]; then + export PATH="$PATH:/opt/homebrew/opt/fzf/bin" fi # Auto-completion # --------------- -[[ $- == *i* ]] && source "/usr/local/opt/fzf/shell/completion.zsh" 2> /dev/null +[[ $- == *i* ]] && source "/opt/homebrew/opt/fzf/shell/completion.zsh" 2> /dev/null # Key bindings # ------------ -source "/usr/local/opt/fzf/shell/key-bindings.zsh" +source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh" diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 7bad2c4..3d7c6a1 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -16,6 +16,16 @@ PATH="/usr/bin:$PATH" PATH="/usr/local/sbin:$PATH" PATH="/usr/local/bin:$PATH" +# Homebrew (generated by `brew shellenv`, lightly modified) +export HOMEBREW_PREFIX="/opt/homebrew" +export HOMEBREW_CELLAR="/opt/homebrew/Cellar" +export HOMEBREW_REPOSITORY="/opt/homebrew" + +export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:" +export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}" + +PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH}" + # Composer (PHP) PATH="$HOME/.composer/vendor/bin:$PATH" export COMPOSER_HOME="$HOME/.composer" @@ -226,6 +236,4 @@ function select_session { # neofetch # fi -# select_session - - +# select_session \ No newline at end of file