From 9b9a7b17680f791e44cbfb3ee8133ab6b42c8a8f Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 12 Oct 2018 14:37:34 -0400 Subject: [PATCH] Switch from base16 to pywal pywal (also known as wal) lets us change color schemes with a cache directory instead of editing config files directly. This helps us separate the dotfiles from the color schemes. This commit removes explicit color settings from my dotfiles, which are now managed by pywal. Dunst has been added to show any notifications that I may want to use in the future. The colors.Xresources file is used to prevent urxvt from using a depth of 32. My custom colors.vim file has been removed in favor of wal.vim, which solves some problems I had to manually resolve myself and should make things easier to maintain in the long term. Note that pywal also supports base16 color schemes, as well as any other color scheme you can think of. --- .Xresources | 38 ---- .config/bspwm/bspwmrc | 23 +- .config/feh/tile.sh | 43 ++++ .config/fish/config.fish | 1 + .config/polybar/config | 36 ++-- .config/ranger/rc.conf | 3 + .config/termite/config | 43 ---- .config/wal/bspwm_and_dunst.sh | 14 ++ .config/wal/templates/colors.Xresources | 29 +++ .config/wal/templates/dunstrc | 52 +++++ .config/wal/templates/termite | 34 +++ .vim/colors.vim | 276 ------------------------ .vim/plugins.vim | 3 +- .vimrc | 3 +- 14 files changed, 206 insertions(+), 392 deletions(-) create mode 100644 .config/feh/tile.sh delete mode 100644 .config/termite/config create mode 100644 .config/wal/bspwm_and_dunst.sh create mode 100644 .config/wal/templates/colors.Xresources create mode 100644 .config/wal/templates/dunstrc create mode 100644 .config/wal/templates/termite delete mode 100644 .vim/colors.vim diff --git a/.Xresources b/.Xresources index 990e8360..0fc5030b 100644 --- a/.Xresources +++ b/.Xresources @@ -25,11 +25,6 @@ Xft.rgba: rgb ! Make letter spacing identical to termite URxvt.letterSpace: 1 -! Transparency example. Note that setting URxvt.depth will cause -! problems with the urxvt image mode in ranger -! URxvt.background: rgba:0000/0000/0200/e800 -! URxvt.depth: 32 - ! urxvt settings URxvt.font: xft:Hack:size=11 @@ -52,37 +47,4 @@ URxvt.clipboard.autocopy: true URxvt.iso14755: false URxvt.iso14755_52: false -! This line is used to indicate where to add theme colors. Note that everything -! after this line is replaced. -! -! TODO: Replace this with an include. It may be ideal to split the other settings -! into separate files as well. - -! [colors] -*foreground: #D0D0D0 -*cursorColor: #E0E0E0 -*background: #151515 -*color0: #151515 -*color8: #505050 -*color7: #D0D0D0 -*color15: #FFFFFF -*color1: #FF0086 -*color9: #FF0086 -*color2: #00C918 -*color10: #00C918 -*color3: #ABA800 -*color11: #ABA800 -*color4: #3777E6 -*color12: #3777E6 -*color5: #AD00A1 -*color13: #AD00A1 -*color6: #1FAAAA -*color14: #1FAAAA -*color16: #FD8900 -*color17: #CC6633 -*color18: #202020 -*color19: #303030 -*color20: #B0B0B0 -*color21: #E0E0E0 - ! vim:ft=xdefaults diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index d6b477f6..b568af7c 100644 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -31,6 +31,9 @@ xmodmap ~/.xmodmap # Make caps lock (left ctrl) work as escape xcape -e 'Control_L=Escape' +# Set a temporary black background to avoid flash +~/.config/feh/tile.sh 000000 + # If we're in KDE Plasma, then add bottom padding for # the panel at the bottom. if [ "$XDG_CURRENT_DESKTOP" == "KDE" ]; then @@ -49,23 +52,24 @@ else # Overall look (top_padding from polybar) bspc config top_padding 80 - bspc config border_width 10 + bspc config border_width 8 bspc config window_gap 20 + # Set the color scheme to a random one. Note that this command + # needs to be run after any screen resolution changes. + wal -o ~/.config/wal/bspwm_and_dunst.sh -i ~/Pictures/Wallpapers + # Never blank the screen (disable power saving) xset s off -dpms # Start compton compton -b - # Set the desktop background - ~/.fehbg & - # Start polybar ~/.config/polybar/launch.sh # Start a terminal - urxvtcd & + # urxvtcd & fi # bspc rules @@ -76,12 +80,3 @@ bspc rule -a kwrite state=floating bspc rule -a ark state=floating bspc rule -a kmag state=floating bspc rule -a kcharselect state=floating - -# TODO: The colors below can probably be re-written to accept values -# from the .Xresources file. - -# [colors] -bspc config normal_border_color "#C0C5CE" -bspc config active_border_color "#FFFFFF" -bspc config focused_border_color "#FFFFFF" -bspc config presel_feedback_color "#C0C5CE" diff --git a/.config/feh/tile.sh b/.config/feh/tile.sh new file mode 100644 index 00000000..d1efe747 --- /dev/null +++ b/.config/feh/tile.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# End the script if an error occurs. +set -e + +# Change the working directory to a cache directory. +mkdir -p "$HOME/.cache/feh" +cd "$HOME/.cache/feh" + +# If $1 is not defined, raise an error. +if [ -z "$1" ]; then + echo 'error: No color specified.' + echo 'usage: ./path/to/tile.sh where color is hexadecimal' + exit 1 +fi + +# If $1 contains something other than 0-9 and A-F, raise an error. +if [[ -n "${1//[0-9A-F]/}" ]]; then + echo 'error: Invalid color specified. Colors must use 0-9 and A-F only.' + echo ' Colors should not use a-f since file names are case sensitive.' + exit 1 +fi + +# If $1 is not exactly six characters long, raise an error. +if ! [ "${#1}" -eq 6 ]; then + echo 'error: Invalid color specified. Colors must be of length 6.' + echo ' This is for the convert function, and is used to help' + echo ' prevent duplicate colors.' + exit 1 +fi + +# If the color doesn't exist yet, make it. +if ! test -e "$1.png"; then + echo 'status: Color file does not exist yet. Making it...' + convert -size 1x1 "xc:#$1" "$1.png" +fi + +# Finally, set the specified color as the background. +echo 'status: Setting the desktop background as the specified color...' +feh --no-fehbg --bg-tile "$1.png" + +# We're done here. +echo 'status: Successfully changed the background to the color specified!' diff --git a/.config/fish/config.fish b/.config/fish/config.fish index abaa53e2..8dce7818 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -65,6 +65,7 @@ if not set -q set_abbr abbr f "launch feh --auto-zoom" # Easy image viewing with f abbr z "launch zathura" # Easy document browsing with z abbr m "launch mpv" # Easy media playing with m + abbr w "wal -o ~/.config/wal/bspwm_and_dunst.sh" abbr T "tree" abbr lium "launch chromium" # Launch chromium separate from the terminal diff --git a/.config/polybar/config b/.config/polybar/config index fa37529b..55f84efb 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -77,16 +77,16 @@ wm-restack = bspwm type = internal/bspwm pin-workspaces = true -label-focused-foreground = ${color.green} +label-focused-foreground = ${color.text} label-urgent-foreground = ${color.yellow} -label-occupied-foreground = ${color.text} -label-empty-foreground = ${color.background-alt} +label-occupied-foreground = ${color.background-alt} +label-empty-foreground = ${color.green} label-focused-padding = 2 label-urgent-padding = 2 label-occupied-padding = 2 label-empty-padding = 2 -label-focused-underline = ${color.green} +label-focused-underline = ${color.text} ws-icon-0 = 1;一 ws-icon-1 = 2;二 @@ -102,28 +102,28 @@ ws-icon-9 = 10;十 [module/cpu] type = internal/cpu label =  %percentage%% - format-foreground = ${color.blue} -format-underline = ${color.blue} +format-foreground = ${color.background-alt} +format-underline = ${color.background-alt} [module/ram] type = internal/memory label =  %gb_used% - format-foreground = ${color.cyan} -format-underline = ${color.cyan} +format-foreground = ${color.background-alt} +format-underline = ${color.background-alt} [module/date] type = internal/date date =  %d.%m.%y #date = %B %d, %Y #date = %A - format-foreground = ${color.yellow} -format-underline = ${color.yellow} +format-foreground = ${color.background-alt} +format-underline = ${color.background-alt} [module/time] type = internal/date date =  %H:%M -format-foreground = ${color.magenta} -format-underline = ${color.magenta} +format-foreground = ${color.background-alt} +format-underline = ${color.background-alt} [module/battery] type = internal/battery @@ -140,15 +140,15 @@ format-offline = No song is currently playing. label-song-maxlen = 100 label-song-ellipsis = true format-online =  -format-offline-foreground = ${color.cyan} -format-offline-underline = ${color.cyan} -format-online-foreground = ${color.cyan} -format-online-underline = ${color.cyan} +format-offline-foreground = ${color.background-alt} +format-offline-underline = ${color.background-alt} +format-online-foreground = ${color.background-alt} +format-online-underline = ${color.background-alt} [module/volume] type = internal/alsa label-volume =  %percentage%% -format-volume-foreground = ${color.green} -format-volume-underline = ${color.green} +format-volume-foreground = ${color.background-alt} +format-volume-underline = ${color.background-alt} ; vim:ft=dosini diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index a7523958..92daeef0 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -25,6 +25,9 @@ alias r rename # Alias d to delete alias d delete +# Alias w to wal +alias w shell -fs launch wal -o "$HOME/.config/wal/bspwm_and_dunst.sh" -i %f + set use_preview_script true set preview_files true set preview_images true diff --git a/.config/termite/config b/.config/termite/config deleted file mode 100644 index a0531690..00000000 --- a/.config/termite/config +++ /dev/null @@ -1,43 +0,0 @@ -# New Start: A modern Arch workflow built with an emphasis on functionality. -# Copyright (C) 2017-2018 Donovan Glover - -[options] -font = Hack 11 - -# No need to show the mouse in the terminal window -mouse_autohide = true - -# Note: If you want terminal transparency, you can use RGBA. -# Example: background = rgba(0, 0, 0, 0.9) - -[colors] -foreground = #D0D0D0 -foreground_bold = #E0E0E0 -cursor = #E0E0E0 -cursor_foreground = #151515 -background = #151515 - -color0 = #151515 -color8 = #505050 -color7 = #D0D0D0 -color15 = #FFFFFF -color1 = #FF0086 -color9 = #FF0086 -color2 = #00C918 -color10 = #00C918 -color3 = #ABA800 -color11 = #ABA800 -color4 = #3777E6 -color12 = #3777E6 -color5 = #AD00A1 -color13 = #AD00A1 -color6 = #1FAAAA -color14 = #1FAAAA -color16 = #FD8900 -color17 = #CC6633 -color18 = #202020 -color19 = #303030 -color20 = #B0B0B0 -color21 = #E0E0E0 - -# vim:ft=dosini diff --git a/.config/wal/bspwm_and_dunst.sh b/.config/wal/bspwm_and_dunst.sh new file mode 100644 index 00000000..c0a74d29 --- /dev/null +++ b/.config/wal/bspwm_and_dunst.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Source the colors from wal +source "${HOME}/.cache/wal/colors.sh" + +# Set the border colors +bspc config normal_border_color "$color1" +bspc config active_border_color "$color2" +bspc config focused_border_color "$color15" +bspc config presel_feedback_color "$color1" + +# Restart dunst with the new color scheme +pkill dunst +dunst -conf "${HOME}/.cache/wal/dunstrc" diff --git a/.config/wal/templates/colors.Xresources b/.config/wal/templates/colors.Xresources new file mode 100644 index 00000000..0c91fdc3 --- /dev/null +++ b/.config/wal/templates/colors.Xresources @@ -0,0 +1,29 @@ +*foreground: {foreground} +*background: {background} +URxvt*cursorColor: {cursor} +URxvt*borderColor: {background} + +*color0: {color0} +*color1: {color1} +*color2: {color2} +*color3: {color3} +*color4: {color4} +*color5: {color5} +*color6: {color6} +*color7: {color7} +*color8: {color8} +*color9: {color9} +*color10: {color10} +*color11: {color11} +*color12: {color12} +*color13: {color13} +*color14: {color14} +*color15: {color15} + +! Black color that will not be affected by bold highlighting. +*color66: {color0} + +! Disable transparency for better image support +! This also makes the terminal faster and makes images persist between +! desktops with the urxvt mode in ranger. +URxvt*depth:0 diff --git a/.config/wal/templates/dunstrc b/.config/wal/templates/dunstrc new file mode 100644 index 00000000..d0c6af8e --- /dev/null +++ b/.config/wal/templates/dunstrc @@ -0,0 +1,52 @@ +[global] + # Make the width 3740 (3840 - 100), have 50 left margin and 95 above + geometry = "3740x5-50+95" + + # Show multiple notifications in the same box + separator_height = 0 + + # Add vertical padding to the inside of the notification + padding = 24 + + # Add horizontal padding for when the text gets long enough + horizontal_padding = 24 + + # The frame color and width of the notification + frame_color = "{color4}" + frame_width = 6 + + # How long a user needs to be idle for sticky notifications + idle_threshold = 120 + + # Font and typography settings + font = Fira Mono 11 + alignment = center + word_wrap = yes + + # Format for how notifications will be displayed + # Usage: `notify-send 'Title' 'Summary'` + format = "%s: %b" + + # Allow some HTML tags like and in notifications + markup = full + +# These are the keybindings used to control dunst notifications +[shortcuts] + close = ctrl+space + close_all = ctrl+shift+space + history = ctrl+grave + +# Set the background and foreground (text) color for all notifications +[urgency_low] + background = "{background}" + foreground = "{foreground}" + +[urgency_normal] + background = "{background}" + foreground = "{foreground}" + +[urgency_critical] + background = "{background}" + foreground = "{foreground}" + +# vim:ft=cfg diff --git a/.config/wal/templates/termite b/.config/wal/templates/termite new file mode 100644 index 00000000..a5c20f5d --- /dev/null +++ b/.config/wal/templates/termite @@ -0,0 +1,34 @@ +# New Start: A modern Arch workflow built with an emphasis on functionality. +# Copyright (C) 2017-2018 Donovan Glover + +[options] +font = Hack 11 + +# No need to show the mouse in the terminal window +mouse_autohide = true + +[colors] +foreground = {foreground} +foreground_bold = {cursor} +cursor = {cursor} +cursor_foreground = {background} +background = rgba({background.rgb}, 0.5) + +color0 = {color0} +color1 = {color1} +color2 = {color2} +color3 = {color3} +color4 = {color4} +color5 = {color5} +color6 = {color6} +color7 = {color7} +color8 = {color8} +color9 = {color9} +color10 = {color10} +color11 = {color11} +color12 = {color12} +color13 = {color13} +color14 = {color14} +color15 = {color15} + +# vim:ft=dosini diff --git a/.vim/colors.vim b/.vim/colors.vim deleted file mode 100644 index b1dfd28c..00000000 --- a/.vim/colors.vim +++ /dev/null @@ -1,276 +0,0 @@ -" New Start: A modern Arch workflow built with an emphasis on functionality. -" Copyright (C) 2017-2018 Donovan Glover - -" This is a modified version of Chris Kempson's base16-vim that removes a lot of -" the settings you don't need when using your terminal's colors as the color scheme. - -" Main colors -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" -" Extra colors -let s:cterm01 = "10" " 10 without 256 colors -let s:cterm02 = "11" " 11 -let s:cterm04 = "12" " 12 -let s:cterm06 = "13" " 13 -let s:cterm09 = "09" " 09 -let s:cterm0F = "14" " 14 - -" Highlighting function -fun hi(group, ctermfg, ctermbg, attr) - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . a:ctermfg - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . a:ctermbg - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif -endfun - -" Vim editor colors -call hi("Normal", s:cterm05, s:cterm00, "") -call hi("Bold", "", "", "bold") -call hi("Debug", s:cterm08, "", "") -call hi("Directory", s:cterm0D, "", "") -call hi("Error", s:cterm00, s:cterm08, "") -call hi("ErrorMsg", s:cterm08, s:cterm00, "") -call hi("Exception", s:cterm08, "", "") -call hi("FoldColumn", s:cterm0C, s:cterm01, "") -call hi("Folded", s:cterm03, s:cterm01, "") -call hi("IncSearch", s:cterm01, s:cterm09, "none") -call hi("Italic", "", "", "none") -call hi("Macro", s:cterm08, "", "") -call hi("MatchParen", "", s:cterm03, "") -call hi("ModeMsg", s:cterm0B, "", "") -call hi("MoreMsg", s:cterm0B, "", "") -call hi("Question", s:cterm0D, "", "") -call hi("Search", s:cterm03, s:cterm0A, "") -call hi("Substitute", s:cterm03, s:cterm0A, "none") -call hi("SpecialKey", s:cterm03, "", "") -call hi("TooLong", s:cterm08, "", "") -call hi("Underlined", s:cterm08, "", "") -call hi("Visual", "", s:cterm02, "") -call hi("VisualNOS", s:cterm08, "", "") -call hi("WarningMsg", s:cterm08, "", "") -call hi("WildMenu", s:cterm08, "", "") -call hi("Title", s:cterm0D, "", "none") -call hi("Conceal", s:cterm0D, s:cterm00, "") -call hi("Cursor", s:cterm00, s:cterm05, "") -call hi("NonText", s:cterm03, "", "") -call hi("LineNr", s:cterm03, s:cterm01, "") -call hi("SignColumn", s:cterm03, s:cterm01, "") -call hi("StatusLine", s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:cterm01, "none") -call hi("CursorColumn", "", s:cterm01, "none") -call hi("CursorLine", "", s:cterm01, "none") -call hi("CursorLineNr", s:cterm04, s:cterm01, "") -call hi("QuickFixLine", "", s:cterm01, "none") -call hi("PMenu", s:cterm05, s:cterm01, "none") -call hi("PMenuSel", s:cterm01, s:cterm05, "") -call hi("TabLine", s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:cterm0B, s:cterm01, "none") - -" Standard syntax highlighting -call hi("Boolean", s:cterm09, "", "") -call hi("Character", s:cterm08, "", "") -call hi("Comment", s:cterm03, "", "") -call hi("Conditional", s:cterm0E, "", "") -call hi("Constant", s:cterm09, "", "") -call hi("Define", s:cterm0E, "", "none") -call hi("Delimiter", s:cterm0F, "", "") -call hi("Float", s:cterm09, "", "") -call hi("Function", s:cterm0D, "", "") -call hi("Identifier", s:cterm08, "", "none") -call hi("Include", s:cterm0D, "", "") -call hi("Keyword", s:cterm0E, "", "") -call hi("Label", s:cterm0A, "", "") -call hi("Number", s:cterm09, "", "") -call hi("Operator", s:cterm05, "", "none") -call hi("PreProc", s:cterm0A, "", "") -call hi("Repeat", s:cterm0A, "", "") -call hi("Special", s:cterm0C, "", "") -call hi("SpecialChar", s:cterm0F, "", "") -call hi("Statement", s:cterm08, "", "") -call hi("StorageClass", s:cterm0A, "", "") -call hi("String", s:cterm0B, "", "") -call hi("Structure", s:cterm0E, "", "") -call hi("Tag", s:cterm0A, "", "") -call hi("Todo", s:cterm0A, s:cterm01, "") -call hi("Type", s:cterm0A, "", "none") -call hi("Typedef", s:cterm0A, "", "") - -" C highlighting -call hi("cOperator", s:cterm0C, "", "") -call hi("cPreCondit", s:cterm0E, "", "") - -" C# highlighting -call hi("csClass", s:cterm0A, "", "") -call hi("csAttribute", s:cterm0A, "", "") -call hi("csModifier", s:cterm0E, "", "") -call hi("csType", s:cterm08, "", "") -call hi("csUnspecifiedStatement", s:cterm0D, "", "") -call hi("csContextualStatement", s:cterm0E, "", "") -call hi("csNewDecleration", s:cterm08, "", "") - -" CSS highlighting -call hi("cssBraces", s:cterm05, "", "") -call hi("cssClassName", s:cterm0E, "", "") -call hi("cssColor", s:cterm0C, "", "") - -" Diff highlighting -call hi("DiffAdd", s:cterm0B, s:cterm01, "") -call hi("DiffChange", s:cterm03, s:cterm01, "") -call hi("DiffDelete", s:cterm08, s:cterm01, "") -call hi("DiffText", s:cterm0D, s:cterm01, "") -call hi("DiffAdded", s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:cterm08, s:cterm00, "") - -" Git highlighting -call hi("gitcommitOverflow", s:cterm08, "", "") -call hi("gitcommitSummary", s:cterm0B, "", "") -call hi("gitcommitComment", s:cterm03, "", "") -call hi("gitcommitUntracked", s:cterm03, "", "") -call hi("gitcommitDiscarded", s:cterm03, "", "") -call hi("gitcommitSelected", s:cterm03, "", "") -call hi("gitcommitHeader", s:cterm0E, "", "") -call hi("gitcommitSelectedType", s:cterm0D, "", "") -call hi("gitcommitUnmergedType", s:cterm0D, "", "") -call hi("gitcommitDiscardedType", s:cterm0D, "", "") -call hi("gitcommitBranch", s:cterm09, "", "bold") -call hi("gitcommitUntrackedFile", s:cterm0A, "", "") -call hi("gitcommitUnmergedFile", s:cterm08, "", "bold") -call hi("gitcommitDiscardedFile", s:cterm08, "", "bold") -call hi("gitcommitSelectedFile", s:cterm0B, "", "bold") - -" GitGutter highlighting -call hi("GitGutterAdd", s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:cterm08, s:cterm01, "") -call hi("GitGutterChangeDelete", s:cterm0E, s:cterm01, "") - -" HTML highlighting -call hi("htmlBold", s:cterm0A, "", "") -call hi("htmlItalic", s:cterm0E, "", "") -call hi("htmlEndTag", s:cterm05, "", "") -call hi("htmlTag", s:cterm05, "", "") - -" JavaScript highlighting -call hi("javaScript", s:cterm05, "", "") -call hi("javaScriptBraces", s:cterm05, "", "") -call hi("javaScriptNumber", s:cterm09, "", "") -" pangloss/vim-javascript highlighting -call hi("jsOperator", s:cterm0D, "", "") -call hi("jsStatement", s:cterm0E, "", "") -call hi("jsReturn", s:cterm0E, "", "") -call hi("jsThis", s:cterm08, "", "") -call hi("jsClassDefinition", s:cterm0A, "", "") -call hi("jsFunction", s:cterm0E, "", "") -call hi("jsFuncName", s:cterm0D, "", "") -call hi("jsFuncCall", s:cterm0D, "", "") -call hi("jsClassFuncName", s:cterm0D, "", "") -call hi("jsClassMethodType", s:cterm0E, "", "") -call hi("jsRegexpString", s:cterm0C, "", "") -call hi("jsGlobalObjects", s:cterm0A, "", "") -call hi("jsGlobalNodeObjects", s:cterm0A, "", "") -call hi("jsExceptions", s:cterm0A, "", "") -call hi("jsBuiltins", s:cterm0A, "", "") - -" Mail highlighting -call hi("mailQuoted1", s:cterm0A, "", "") -call hi("mailQuoted2", s:cterm0B, "", "") -call hi("mailQuoted3", s:cterm0E, "", "") -call hi("mailQuoted4", s:cterm0C, "", "") -call hi("mailQuoted5", s:cterm0D, "", "") -call hi("mailQuoted6", s:cterm0A, "", "") -call hi("mailURL", s:cterm0D, "", "") -call hi("mailEmail", s:cterm0D, "", "") - -" Markdown highlighting -call hi("markdownCode", s:cterm0B, "", "") -call hi("markdownError", s:cterm05, s:cterm00, "") -call hi("markdownCodeBlock", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:cterm0D, "", "") - -" NERDTree highlighting -call hi("NERDTreeDirSlash", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:cterm05, "", "") - -" PHP highlighting -call hi("phpMemberSelector", s:cterm05, "", "") -call hi("phpComparison", s:cterm05, "", "") -call hi("phpParent", s:cterm05, "", "") - -" Python highlighting -call hi("pythonOperator", s:cterm0E, "", "") -call hi("pythonRepeat", s:cterm0E, "", "") -call hi("pythonInclude", s:cterm0E, "", "") -call hi("pythonStatement", s:cterm0E, "", "") - -" Ruby highlighting -call hi("rubyAttribute", s:cterm0D, "", "") -call hi("rubyConstant", s:cterm0A, "", "") -call hi("rubyInterpolationDelimiter", s:cterm0F, "", "") -call hi("rubyRegexp", s:cterm0C, "", "") -call hi("rubySymbol", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:cterm0B, "", "") - -" SASS highlighting -call hi("sassidChar", s:cterm08, "", "") -call hi("sassClassChar", s:cterm09, "", "") -call hi("sassInclude", s:cterm0E, "", "") -call hi("sassMixing", s:cterm0E, "", "") -call hi("sassMixinName", s:cterm0D, "", "") - -" Signify highlighting -call hi("SignifySignAdd", s:cterm0B, s:cterm01, "") -call hi("SignifySignChange", s:cterm0D, s:cterm01, "") -call hi("SignifySignDelete", s:cterm08, s:cterm01, "") - -" Spelling highlighting -call hi("SpellBad", "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:cterm00, "undercurl") - -" Startify highlighting -call hi("StartifyBracket", s:cterm03, "", "") -call hi("StartifyFile", s:cterm07, "", "") -call hi("StartifyFooter", s:cterm03, "", "") -call hi("StartifyHeader", s:cterm0B, "", "") -call hi("StartifyNumber", s:cterm09, "", "") -call hi("StartifyPath", s:cterm03, "", "") -call hi("StartifySection", s:cterm0E, "", "") -call hi("StartifySelect", s:cterm0C, "", "") -call hi("StartifySlash", s:cterm03, "", "") -call hi("StartifySpecial", s:cterm03, "", "") - - -" Custom colors not a part of base16-vim -" Remove the background from GitGutter items -hi GitGutterAdd ctermbg=none -hi GitGutterChange ctermbg=none -hi GitGutterDelete ctermbg=none - -" Remove functions -delf hi - -" Hide the tilde (~) from empty files -highlight EndOfBuffer ctermfg=0 - -" Remove color variables -unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/.vim/plugins.vim b/.vim/plugins.vim index c5ec071d..550c065e 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -3,14 +3,13 @@ call plug#begin('~/.vim/plugged') " Use vim-plug as our package manager of choice Plug 'airblade/vim-gitgutter' " Add git diff support - Plug 'chriskempson/base16-vim' " Add theme support + Plug 'dylanaraps/wal.vim' " Add wal support Plug 'osyo-manga/vim-over' " Automatically highlight find and replace Plug 'jiangmiao/auto-pairs' " Close brackets and other pairs automatically Plug 'w0rp/ale' " Automatically check language syntax for errors Plug 'maksimr/vim-jsbeautify' " Make it easier to work with foreign code Plug 'lervag/vimtex' " Make editing LaTeX a breeze Plug 'dbeniamine/todo.txt-vim' " Easily manage any part of your todo.txt - Plug 'Kjwon15/vim-transparent' " Add transparency by default for all color schemes Plug 'elixir-editors/vim-elixir' " Add syntax highlighting and autoindent for Elixir Plug 'tpope/vim-fugitive' " Add fugitive.vim, enabling us to use git in vim diff --git a/.vimrc b/.vimrc index 6b15a4c4..ca149d2d 100644 --- a/.vimrc +++ b/.vimrc @@ -7,9 +7,10 @@ endif source ~/.vim/plugins.vim source ~/.vim/config.vim -source ~/.vim/colors.vim source ~/.vim/keybindings.vim +colorscheme wal + " =================================== Plugin-Specific =================================== let g:ale_lint_on_text_changed = 'never' " Do not lint while typing