mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-12-15 19:30:51 +01:00
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.
This commit is contained in:
parent
273f1f077e
commit
9b9a7b1768
38
.Xresources
38
.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
|
||||
|
@ -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"
|
||||
|
43
.config/feh/tile.sh
Normal file
43
.config/feh/tile.sh
Normal file
@ -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 <color> 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!'
|
@ -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
|
||||
|
@ -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 = <label-song>
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -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
|
14
.config/wal/bspwm_and_dunst.sh
Normal file
14
.config/wal/bspwm_and_dunst.sh
Normal file
@ -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"
|
29
.config/wal/templates/colors.Xresources
Normal file
29
.config/wal/templates/colors.Xresources
Normal file
@ -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
|
52
.config/wal/templates/dunstrc
Normal file
52
.config/wal/templates/dunstrc
Normal file
@ -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 = "<b>%s</b>: %b"
|
||||
|
||||
# Allow some HTML tags like <i> and <u> 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
|
34
.config/wal/templates/termite
Normal file
34
.config/wal/templates/termite
Normal file
@ -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
|
276
.vim/colors.vim
276
.vim/colors.vim
@ -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 <sid>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 <sid>hi("Normal", s:cterm05, s:cterm00, "")
|
||||
call <sid>hi("Bold", "", "", "bold")
|
||||
call <sid>hi("Debug", s:cterm08, "", "")
|
||||
call <sid>hi("Directory", s:cterm0D, "", "")
|
||||
call <sid>hi("Error", s:cterm00, s:cterm08, "")
|
||||
call <sid>hi("ErrorMsg", s:cterm08, s:cterm00, "")
|
||||
call <sid>hi("Exception", s:cterm08, "", "")
|
||||
call <sid>hi("FoldColumn", s:cterm0C, s:cterm01, "")
|
||||
call <sid>hi("Folded", s:cterm03, s:cterm01, "")
|
||||
call <sid>hi("IncSearch", s:cterm01, s:cterm09, "none")
|
||||
call <sid>hi("Italic", "", "", "none")
|
||||
call <sid>hi("Macro", s:cterm08, "", "")
|
||||
call <sid>hi("MatchParen", "", s:cterm03, "")
|
||||
call <sid>hi("ModeMsg", s:cterm0B, "", "")
|
||||
call <sid>hi("MoreMsg", s:cterm0B, "", "")
|
||||
call <sid>hi("Question", s:cterm0D, "", "")
|
||||
call <sid>hi("Search", s:cterm03, s:cterm0A, "")
|
||||
call <sid>hi("Substitute", s:cterm03, s:cterm0A, "none")
|
||||
call <sid>hi("SpecialKey", s:cterm03, "", "")
|
||||
call <sid>hi("TooLong", s:cterm08, "", "")
|
||||
call <sid>hi("Underlined", s:cterm08, "", "")
|
||||
call <sid>hi("Visual", "", s:cterm02, "")
|
||||
call <sid>hi("VisualNOS", s:cterm08, "", "")
|
||||
call <sid>hi("WarningMsg", s:cterm08, "", "")
|
||||
call <sid>hi("WildMenu", s:cterm08, "", "")
|
||||
call <sid>hi("Title", s:cterm0D, "", "none")
|
||||
call <sid>hi("Conceal", s:cterm0D, s:cterm00, "")
|
||||
call <sid>hi("Cursor", s:cterm00, s:cterm05, "")
|
||||
call <sid>hi("NonText", s:cterm03, "", "")
|
||||
call <sid>hi("LineNr", s:cterm03, s:cterm01, "")
|
||||
call <sid>hi("SignColumn", s:cterm03, s:cterm01, "")
|
||||
call <sid>hi("StatusLine", s:cterm04, s:cterm02, "none")
|
||||
call <sid>hi("StatusLineNC", s:cterm03, s:cterm01, "none")
|
||||
call <sid>hi("VertSplit", s:cterm02, s:cterm02, "none")
|
||||
call <sid>hi("ColorColumn", "", s:cterm01, "none")
|
||||
call <sid>hi("CursorColumn", "", s:cterm01, "none")
|
||||
call <sid>hi("CursorLine", "", s:cterm01, "none")
|
||||
call <sid>hi("CursorLineNr", s:cterm04, s:cterm01, "")
|
||||
call <sid>hi("QuickFixLine", "", s:cterm01, "none")
|
||||
call <sid>hi("PMenu", s:cterm05, s:cterm01, "none")
|
||||
call <sid>hi("PMenuSel", s:cterm01, s:cterm05, "")
|
||||
call <sid>hi("TabLine", s:cterm03, s:cterm01, "none")
|
||||
call <sid>hi("TabLineFill", s:cterm03, s:cterm01, "none")
|
||||
call <sid>hi("TabLineSel", s:cterm0B, s:cterm01, "none")
|
||||
|
||||
" Standard syntax highlighting
|
||||
call <sid>hi("Boolean", s:cterm09, "", "")
|
||||
call <sid>hi("Character", s:cterm08, "", "")
|
||||
call <sid>hi("Comment", s:cterm03, "", "")
|
||||
call <sid>hi("Conditional", s:cterm0E, "", "")
|
||||
call <sid>hi("Constant", s:cterm09, "", "")
|
||||
call <sid>hi("Define", s:cterm0E, "", "none")
|
||||
call <sid>hi("Delimiter", s:cterm0F, "", "")
|
||||
call <sid>hi("Float", s:cterm09, "", "")
|
||||
call <sid>hi("Function", s:cterm0D, "", "")
|
||||
call <sid>hi("Identifier", s:cterm08, "", "none")
|
||||
call <sid>hi("Include", s:cterm0D, "", "")
|
||||
call <sid>hi("Keyword", s:cterm0E, "", "")
|
||||
call <sid>hi("Label", s:cterm0A, "", "")
|
||||
call <sid>hi("Number", s:cterm09, "", "")
|
||||
call <sid>hi("Operator", s:cterm05, "", "none")
|
||||
call <sid>hi("PreProc", s:cterm0A, "", "")
|
||||
call <sid>hi("Repeat", s:cterm0A, "", "")
|
||||
call <sid>hi("Special", s:cterm0C, "", "")
|
||||
call <sid>hi("SpecialChar", s:cterm0F, "", "")
|
||||
call <sid>hi("Statement", s:cterm08, "", "")
|
||||
call <sid>hi("StorageClass", s:cterm0A, "", "")
|
||||
call <sid>hi("String", s:cterm0B, "", "")
|
||||
call <sid>hi("Structure", s:cterm0E, "", "")
|
||||
call <sid>hi("Tag", s:cterm0A, "", "")
|
||||
call <sid>hi("Todo", s:cterm0A, s:cterm01, "")
|
||||
call <sid>hi("Type", s:cterm0A, "", "none")
|
||||
call <sid>hi("Typedef", s:cterm0A, "", "")
|
||||
|
||||
" C highlighting
|
||||
call <sid>hi("cOperator", s:cterm0C, "", "")
|
||||
call <sid>hi("cPreCondit", s:cterm0E, "", "")
|
||||
|
||||
" C# highlighting
|
||||
call <sid>hi("csClass", s:cterm0A, "", "")
|
||||
call <sid>hi("csAttribute", s:cterm0A, "", "")
|
||||
call <sid>hi("csModifier", s:cterm0E, "", "")
|
||||
call <sid>hi("csType", s:cterm08, "", "")
|
||||
call <sid>hi("csUnspecifiedStatement", s:cterm0D, "", "")
|
||||
call <sid>hi("csContextualStatement", s:cterm0E, "", "")
|
||||
call <sid>hi("csNewDecleration", s:cterm08, "", "")
|
||||
|
||||
" CSS highlighting
|
||||
call <sid>hi("cssBraces", s:cterm05, "", "")
|
||||
call <sid>hi("cssClassName", s:cterm0E, "", "")
|
||||
call <sid>hi("cssColor", s:cterm0C, "", "")
|
||||
|
||||
" Diff highlighting
|
||||
call <sid>hi("DiffAdd", s:cterm0B, s:cterm01, "")
|
||||
call <sid>hi("DiffChange", s:cterm03, s:cterm01, "")
|
||||
call <sid>hi("DiffDelete", s:cterm08, s:cterm01, "")
|
||||
call <sid>hi("DiffText", s:cterm0D, s:cterm01, "")
|
||||
call <sid>hi("DiffAdded", s:cterm0B, s:cterm00, "")
|
||||
call <sid>hi("DiffFile", s:cterm08, s:cterm00, "")
|
||||
call <sid>hi("DiffNewFile", s:cterm0B, s:cterm00, "")
|
||||
call <sid>hi("DiffLine", s:cterm0D, s:cterm00, "")
|
||||
call <sid>hi("DiffRemoved", s:cterm08, s:cterm00, "")
|
||||
|
||||
" Git highlighting
|
||||
call <sid>hi("gitcommitOverflow", s:cterm08, "", "")
|
||||
call <sid>hi("gitcommitSummary", s:cterm0B, "", "")
|
||||
call <sid>hi("gitcommitComment", s:cterm03, "", "")
|
||||
call <sid>hi("gitcommitUntracked", s:cterm03, "", "")
|
||||
call <sid>hi("gitcommitDiscarded", s:cterm03, "", "")
|
||||
call <sid>hi("gitcommitSelected", s:cterm03, "", "")
|
||||
call <sid>hi("gitcommitHeader", s:cterm0E, "", "")
|
||||
call <sid>hi("gitcommitSelectedType", s:cterm0D, "", "")
|
||||
call <sid>hi("gitcommitUnmergedType", s:cterm0D, "", "")
|
||||
call <sid>hi("gitcommitDiscardedType", s:cterm0D, "", "")
|
||||
call <sid>hi("gitcommitBranch", s:cterm09, "", "bold")
|
||||
call <sid>hi("gitcommitUntrackedFile", s:cterm0A, "", "")
|
||||
call <sid>hi("gitcommitUnmergedFile", s:cterm08, "", "bold")
|
||||
call <sid>hi("gitcommitDiscardedFile", s:cterm08, "", "bold")
|
||||
call <sid>hi("gitcommitSelectedFile", s:cterm0B, "", "bold")
|
||||
|
||||
" GitGutter highlighting
|
||||
call <sid>hi("GitGutterAdd", s:cterm0B, s:cterm01, "")
|
||||
call <sid>hi("GitGutterChange", s:cterm0D, s:cterm01, "")
|
||||
call <sid>hi("GitGutterDelete", s:cterm08, s:cterm01, "")
|
||||
call <sid>hi("GitGutterChangeDelete", s:cterm0E, s:cterm01, "")
|
||||
|
||||
" HTML highlighting
|
||||
call <sid>hi("htmlBold", s:cterm0A, "", "")
|
||||
call <sid>hi("htmlItalic", s:cterm0E, "", "")
|
||||
call <sid>hi("htmlEndTag", s:cterm05, "", "")
|
||||
call <sid>hi("htmlTag", s:cterm05, "", "")
|
||||
|
||||
" JavaScript highlighting
|
||||
call <sid>hi("javaScript", s:cterm05, "", "")
|
||||
call <sid>hi("javaScriptBraces", s:cterm05, "", "")
|
||||
call <sid>hi("javaScriptNumber", s:cterm09, "", "")
|
||||
" pangloss/vim-javascript highlighting
|
||||
call <sid>hi("jsOperator", s:cterm0D, "", "")
|
||||
call <sid>hi("jsStatement", s:cterm0E, "", "")
|
||||
call <sid>hi("jsReturn", s:cterm0E, "", "")
|
||||
call <sid>hi("jsThis", s:cterm08, "", "")
|
||||
call <sid>hi("jsClassDefinition", s:cterm0A, "", "")
|
||||
call <sid>hi("jsFunction", s:cterm0E, "", "")
|
||||
call <sid>hi("jsFuncName", s:cterm0D, "", "")
|
||||
call <sid>hi("jsFuncCall", s:cterm0D, "", "")
|
||||
call <sid>hi("jsClassFuncName", s:cterm0D, "", "")
|
||||
call <sid>hi("jsClassMethodType", s:cterm0E, "", "")
|
||||
call <sid>hi("jsRegexpString", s:cterm0C, "", "")
|
||||
call <sid>hi("jsGlobalObjects", s:cterm0A, "", "")
|
||||
call <sid>hi("jsGlobalNodeObjects", s:cterm0A, "", "")
|
||||
call <sid>hi("jsExceptions", s:cterm0A, "", "")
|
||||
call <sid>hi("jsBuiltins", s:cterm0A, "", "")
|
||||
|
||||
" Mail highlighting
|
||||
call <sid>hi("mailQuoted1", s:cterm0A, "", "")
|
||||
call <sid>hi("mailQuoted2", s:cterm0B, "", "")
|
||||
call <sid>hi("mailQuoted3", s:cterm0E, "", "")
|
||||
call <sid>hi("mailQuoted4", s:cterm0C, "", "")
|
||||
call <sid>hi("mailQuoted5", s:cterm0D, "", "")
|
||||
call <sid>hi("mailQuoted6", s:cterm0A, "", "")
|
||||
call <sid>hi("mailURL", s:cterm0D, "", "")
|
||||
call <sid>hi("mailEmail", s:cterm0D, "", "")
|
||||
|
||||
" Markdown highlighting
|
||||
call <sid>hi("markdownCode", s:cterm0B, "", "")
|
||||
call <sid>hi("markdownError", s:cterm05, s:cterm00, "")
|
||||
call <sid>hi("markdownCodeBlock", s:cterm0B, "", "")
|
||||
call <sid>hi("markdownHeadingDelimiter", s:cterm0D, "", "")
|
||||
|
||||
" NERDTree highlighting
|
||||
call <sid>hi("NERDTreeDirSlash", s:cterm0D, "", "")
|
||||
call <sid>hi("NERDTreeExecFile", s:cterm05, "", "")
|
||||
|
||||
" PHP highlighting
|
||||
call <sid>hi("phpMemberSelector", s:cterm05, "", "")
|
||||
call <sid>hi("phpComparison", s:cterm05, "", "")
|
||||
call <sid>hi("phpParent", s:cterm05, "", "")
|
||||
|
||||
" Python highlighting
|
||||
call <sid>hi("pythonOperator", s:cterm0E, "", "")
|
||||
call <sid>hi("pythonRepeat", s:cterm0E, "", "")
|
||||
call <sid>hi("pythonInclude", s:cterm0E, "", "")
|
||||
call <sid>hi("pythonStatement", s:cterm0E, "", "")
|
||||
|
||||
" Ruby highlighting
|
||||
call <sid>hi("rubyAttribute", s:cterm0D, "", "")
|
||||
call <sid>hi("rubyConstant", s:cterm0A, "", "")
|
||||
call <sid>hi("rubyInterpolationDelimiter", s:cterm0F, "", "")
|
||||
call <sid>hi("rubyRegexp", s:cterm0C, "", "")
|
||||
call <sid>hi("rubySymbol", s:cterm0B, "", "")
|
||||
call <sid>hi("rubyStringDelimiter", s:cterm0B, "", "")
|
||||
|
||||
" SASS highlighting
|
||||
call <sid>hi("sassidChar", s:cterm08, "", "")
|
||||
call <sid>hi("sassClassChar", s:cterm09, "", "")
|
||||
call <sid>hi("sassInclude", s:cterm0E, "", "")
|
||||
call <sid>hi("sassMixing", s:cterm0E, "", "")
|
||||
call <sid>hi("sassMixinName", s:cterm0D, "", "")
|
||||
|
||||
" Signify highlighting
|
||||
call <sid>hi("SignifySignAdd", s:cterm0B, s:cterm01, "")
|
||||
call <sid>hi("SignifySignChange", s:cterm0D, s:cterm01, "")
|
||||
call <sid>hi("SignifySignDelete", s:cterm08, s:cterm01, "")
|
||||
|
||||
" Spelling highlighting
|
||||
call <sid>hi("SpellBad", "", s:cterm00, "undercurl")
|
||||
call <sid>hi("SpellLocal", "", s:cterm00, "undercurl")
|
||||
call <sid>hi("SpellCap", "", s:cterm00, "undercurl")
|
||||
call <sid>hi("SpellRare", "", s:cterm00, "undercurl")
|
||||
|
||||
" Startify highlighting
|
||||
call <sid>hi("StartifyBracket", s:cterm03, "", "")
|
||||
call <sid>hi("StartifyFile", s:cterm07, "", "")
|
||||
call <sid>hi("StartifyFooter", s:cterm03, "", "")
|
||||
call <sid>hi("StartifyHeader", s:cterm0B, "", "")
|
||||
call <sid>hi("StartifyNumber", s:cterm09, "", "")
|
||||
call <sid>hi("StartifyPath", s:cterm03, "", "")
|
||||
call <sid>hi("StartifySection", s:cterm0E, "", "")
|
||||
call <sid>hi("StartifySelect", s:cterm0C, "", "")
|
||||
call <sid>hi("StartifySlash", s:cterm03, "", "")
|
||||
call <sid>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 <sid>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
|
@ -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
|
||||
|
3
.vimrc
3
.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
|
||||
|
Loading…
Reference in New Issue
Block a user