commit 84bc4ef53fa10e3769ad54cf7874445146318bd3 Author: Shane Peters Date: Tue Nov 5 10:18:47 2024 -0500 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5e8312e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +vim/.netrwhist +vim/spell/*.spl +bash_history diff --git a/README.md b/README.md new file mode 100644 index 0000000..4836857 --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +Configuration Files +=================== + +My custom config files and rcs. + +Installation +------------ + +Inside the repository you can run `install` to place the configs in `~` +and install some packages for an i3 desktop. diff --git a/Xresources b/Xresources new file mode 100644 index 0000000..32af16d --- /dev/null +++ b/Xresources @@ -0,0 +1,78 @@ +!! Colorscheme + +! special +*.foreground: #93a1a1 +*.background: #141c21 +*.cursorColor: #afbfbf + +! black +*.color0: #263640 +*.color8: #4a697d + +! red +*.color1: #d12f2c +*.color9: #fa3935 + +! green +*.color2: #819400 +*.color10: #a4bd00 + +! yellow +*.color3: #b08500 +*.color11: #d9a400 + +! blue +*.color4: #2587cc +*.color12: #2ca2f5 + +! magenta +*.color5: #696ebf +*.color13: #8086e8 + +! cyan +*.color6: #289c93 +*.color14: #33c5ba + +! white +*.color7: #bfbaac +*.color15: #fdf6e3 + +!! URxvt Appearance +URxvt.font: xft:SpaceMono:style=Regular:size=9 +URxvt.boldFont: xft:SpaceMono:style=Bold:size=9 +URxvt.italicFont: xft:SpaceMono:style=Italic:size=9 +URxvt.boldItalicfont: xft:SpaceMono:style=Bold Italic:size=9 +URxvt.letterSpace: -1 +URxvt.lineSpace: 0 +URxvt.geometry: 92x24 +URxvt.internalBorder: 24 +URxvt.cursorBlink: true +URxvt.cursorUnderline: false +URxvt.saveline: 2048 +URxvt.scrollBar: false +URxvt.scrollBar_right: false +URxvt.urgentOnBell: true +URxvt.depth: 24 +URxvt.iso14755: false + +!! Common Keybinds for Navigations +URxvt.keysym.Shift-Up: command:\033]720;1\007 +URxvt.keysym.Shift-Down: command:\033]721;1\007 +URxvt.keysym.Control-Up: \033[1;5A +URxvt.keysym.Control-Down: \033[1;5B +URxvt.keysym.Control-Right: \033[1;5C +URxvt.keysym.Control-Left: \033[1;5D + +!! Copy Paste & Other Extensions +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select +URxvt.copyCommand: xclip -i -selection clipboard +URxvt.pasteCommand: xclip -o -selection clipboard +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.keysym.M-C-v: perl:clipboard:paste_escaped +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.urlLauncher: firefox +URxvt.underlineURLs: true +URxvt.urlButton: 1 diff --git a/bash_profile b/bash_profile new file mode 100644 index 0000000..d1fb79b --- /dev/null +++ b/bash_profile @@ -0,0 +1 @@ +. ~/.bashrc diff --git a/bashrc b/bashrc new file mode 100644 index 0000000..932188d --- /dev/null +++ b/bashrc @@ -0,0 +1,430 @@ +#!/usr/bin/env bash +# Best bashrc in history +# +# Author: Shane Peters + +# SSH agent +SSH_ENV="$HOME/.ssh/agent-environment" +start_agent() { + /usr/bin/ssh-agent | sed 's/^echo/#echo/' >"$SSH_ENV" + chmod 600 "$SSH_ENV" + . {$SSH_ENV} >/dev/null + /usr/bin/ssh-add; +} + +if [ -f "${SSH_ENV}" ]; then + . ${SSH_ENV} >/dev/null + ps -ef | grep $SSH_AGENT_PID | grep ssh-agent$ >/dev/null || { + start_agent + } +else + start_agent +fi + +# Set environment +# Support colors in less +export LESS_TERMCAP_mb=$(tput bold; tput setaf 1) +export LESS_TERMCAP_md=$(tput bold; tput setaf 1) +export LESS_TERMCAP_me=$(tput sgr0) +export LESS_TERMCAP_se=$(tput sgr0) +export LESS_TERMCAP_so=$(tput bold; tput setaf 3; tput setab 4) +export LESS_TERMCAP_ue=$(tput sgr0) +export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 2) +export LESS_TERMCAP_mr=$(tput rev) +export LESS_TERMCAP_mh=$(tput dim) +export LESS_TERMCAP_ZN=$(tput ssubm) +export LESS_TERMCAP_ZV=$(tput rsubm) +export LESS_TERMCAP_ZO=$(tput ssupm) +export LESS_TERMCAP_ZW=$(tput rsupm) + +# +# Alternate Paths +# +[[ -d ~/Bin ]] && export PATH=~/Bin:$PATH # local binaries & scripts +[[ -d ~/Bin/streams ]] && export PATH=~/Bin/streams:$PATH # radio streams +[[ -d /usr/local/cuda/bin ]] && export PATH=/usr/local/cuda-11.8/bin:$PATH +[[ -d /opt/node/node/bin ]] && export PATH=/opt/node/node/bin:$PATH # local binaries & scripts +[[ -d /opt/zeek/bin ]] && export PATH=/opt/zeek/bin:$PATH +[[ -d ~/.local/bin ]] && export PATH=~/bin:~/.local/bin:$PATH +[[ -d ~/.cargo/bin ]] && export PATH=~/.cargo/bin:$PATH + +# +# App env variables +# +export EDITOR='vim' +export GREP_COLOR='1;36' +export HISTIGNORE="&:[ ]*:ls:ls -a:cd:cd .." # leave commands out of history log +export HISTCONTROL='ignoredups' +export HISTSIZE=5000 +export HISTFILESIZE=5000 +export LSCOLORS='ExGxbEaECxxEhEhBaDaCaD' +export PAGER='less' +export TZ='America/New_York' +export VAULT_TOKEN=root +export VAULT_ADDR=http://127.0.0.1:8200 +export LANG=en_US.utf8 +export VISUAL=$EDITOR +[[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)" # less more friendly for non-text + +# +# bash options +# +shopt -s cdspell +shopt -s extglob +shopt -s checkwinsize # updates values of LINES and COLUMNS +shopt -s nocaseglob # case-insensitive pathname expansion +shopt -s autocd # enter directory without cd +shopt -s cdspell # correct minor errors in directory names with cd +shopt -s dirspell # attempt spelling correction on directory names in completion +shopt -s dotglob # includes filenames beginning with a `.' in filename expansion +shopt -s histappend # append to history file, instead of overwriting it +shopt -s no_empty_cmd_completion # not attempt to search for possible completions on an empty line. +shopt -s globstar # recursive globbing with ** +shopt -s expand_aliases # expand aliases +shopt -s cmdhist # save all lines of a multiline command in same entry +shopt -s lithist # save all lines of a multiline command in same entry +stty -ixon # disable ^S/^Q flow control + +# +# colors +# +#alias ls='ls --color=auto' # ls colored output +export GREP_COLOR="mt=1;36" # grep colored ouput +alias grep='grep --color=auto' # grep colored ouput +export LESS="-R" # less colored output +export LESS_TERMCAP_mb=$'\E[01;31m' # begin blinking +export LESS_TERMCAP_md=$'\E[01;38;5;74m' # begin bold +export LESS_TERMCAP_me=$'\E[0m' # end mode +export LESS_TERMCAP_se=$'\E[0m' # end standout-mode +export LESS_TERMCAP_so=$'\E[38;5;246m' # begin standout-mode - info box +export LESS_TERMCAP_ue=$'\E[0m' # end underline +export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline + + +# Aliases +alias ..='echo "cd .."; cd ..' +alias ag='rg' # sorry silver searcher +alias chomd='chmod' +alias curl='curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"' +alias externalip='curl -sS https://www.daveeddy.com/ip' +alias gerp='grep' +alias hl='rg --passthru' +alias l='ls' +alias ll='ls -lrtha' +alias suod='sudo' +alias gl='git log -p' +alias wget='wget --user-agent="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"' +alias vrd='VAULT_UI=true VAULT_REDIRECT_ADDR=http://127.0.0.1:8200 vault server -log-level=trace -dev -dev-root-token-id=root' +# Git Aliases +alias nb='git checkout -b "$USER-$(date +%s)"' # new branch +alias ga='git add . --all' +alias gb='git branch' +alias gc='git clone' +alias gci='git commit -a' +alias gco='git checkout' +alias gd="git diff ':!*lock'" +alias gdf='git diff' # git diff (full) +alias gi='git init' +alias gl='git log' +alias gp='git push origin HEAD' +alias gr='git rev-parse --show-toplevel' # git root +alias gs='git status' +alias gt='git tag' +alias gu='git pull' # gu = git update + +# Functions +sscreate() { + openssl req \ + -x509 \ + -nodes \ + -newkey rsa:4096 \ + -keyout $1_key.pem \ + -out $1_cert.pem \ + -days 365 \ + -subj "/C=US/ST=Ohio/L=Columbus/O=ColumOps/OU=OPS/CN=$1" +} + +compress() { + FILE=$1 + case $FILE in + *.tar.bz2) shift && tar cjf $FILE $* ;; + *.tar.gz) shift && tar czf $FILE $* ;; + *.tgz) shift && tar czf $FILE $* ;; + *.zip) shift && zip $FILE $* ;; + *.rar) shift && rar $FILE $* ;; + *.7z) shift && 7za a $FILE $* ;; + esac +} + +extract() { + local e=0 i c + for i; do + if [ -f $i && -r $i ]; then + c= + case $i in + *.tar.bz2) c='tar xjf' ;; + *.tar.gz) c='tar xzf' ;; + *.bz2) c='bunzip2' ;; + *.gz) c='gunzip' ;; + *.tar) c='tar xf' ;; + *.tbz2) c='tar xjf' ;; + *.tgz) c='tar xzf' ;; + *.7z) c='7z x' ;; + *.Z) c='uncompress' ;; + *.exe) c='cabextract' ;; + *.rar) c='unrar x' ;; + *.xz) c='unxz' ;; + *.zip) c='unzip' ;; + *) echo "$0: cannot extract \`$i': Unrecognized file extension" >&2; e=1 ;; + esac + [ $c ] && command $c "$i" + else + echo "$0: cannot extract \`$i': File is unreadable" >&2; e=2 + fi + done + return $e +} + + +mkiso() { + mkisofs -V $2 -J -r $1 -o isoimage.iso +} + + +# because `master` is sometimes `main` (or others), these must be functions. +gmb() { # git main branch + local main + main=$(git symbolic-ref --short refs/remotes/origin/HEAD) + main=${main#origin/} + [[ -n $main ]] || return 1 + echo "$main" +} + +# show the diff from inside a branch to the main branch +gbd() { # git branch diff + local mb=$(gmb) || return 1 + git diff "$mb..HEAD" +} + +# checkout the main branch and update it +gcm() { # git checkout $main + local mb=$(gmb) || return 1 + git checkout "$mb" && git pull +} + +# merge the main branch into our branch +gmm() { # git merge $main + local mb=$(gmb) || return 1 + git merge "$mb" +} + +# Prompt +# Store `tput` colors for future use to reduce fork+exec +# the array will be 0-255 for colors, 256 will be sgr0 +# and 257 will be bold +COLOR256=() +COLOR256[0]=$(tput setaf 1) +COLOR256[256]=$(tput sgr0) +COLOR256[257]=$(tput bold) + +# Colors for use in PS1 that may or may not change when +# set_prompt_colors is run +PROMPT_COLORS=() + +# Change the prompt colors to a theme, themes are 0-29 +set_prompt_colors() { + local h=${1:-0} + local color= + local i=0 + local j=0 + for i in {22..231}; do + ((i % 30 == h)) || continue + + color=${COLOR256[$i]} + # cache the tput colors + if [[ -z $color ]]; then + COLOR256[$i]=$(tput setaf "$i") + color=${COLOR256[$i]} + fi + PROMPT_COLORS[$j]=$color + ((j++)) + done +} + +# Construct the prompt +# [(exit code)] - [git branch] <$|#> + +# exit code of last process +PS1='$(ret=$?;(($ret!=0)) && echo "\[${COLOR256[0]}\]($ret) \[${COLOR256[256]}\]")' + +# username (red for root) +PS1+='\[${PROMPT_COLORS[0]}\]\[${COLOR256[257]}\]$(((UID==0)) && echo "\[${COLOR256[0]}\]")\u\[${COLOR256[256]}\]@' + + +# hostname +PS1+='\[${PROMPT_COLORS[3]}\]\h ' + +# zonename (global zone warning) +# PS1+='\[${COLOR256[0]}\]\[${COLOR256[257]}\]'"$(zonename 2>/dev/null | grep -q '^global$' && echo 'GZ:')"'\[${COLOR256[256]}\]' + +# uname +#PS1+='\[${PROMPT_COLORS[2]}\]'"$(uname | tr '[:upper:]' '[:lower:]')"' ' + +# cwd +PS1+='\[${PROMPT_COLORS[5]}\]\w ' + +# optional git branch +PS1+='$(branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null); [[ -n $branch ]] && echo "\[${PROMPT_COLORS[2]}\](\[${PROMPT_COLORS[3]}\]git:$branch\[${PROMPT_COLORS[2]}\]) ")' + +# prompt character +PS1+='\[${PROMPT_COLORS[0]}\]\$\[${COLOR256[256]}\] ' + +# set the theme +set_prompt_colors 24 + +# Prompt command +_prompt_command() { + local user=$USER + local host=${HOSTNAME%%.*} + local pwd=${PWD/#$HOME/\~} + local ssh= + [[ -n $SSH_CLIENT ]] && ssh='[ssh] ' + printf "\033]0;%s%s@%s:%s\007" "$ssh" "$user" "$host" "$pwd" +} +PROMPT_COMMAND=_prompt_command + +PROMPT_DIRTRIM=6 + +# Print all 256 colors +colors() { + local i + for i in {0..255}; do + printf "\x1b[38;5;${i}mcolor %d\n" "$i" + done + tput sgr0 +} + +# Copy stdin to the clipboard +copy() { + pbcopy 2>/dev/null || + xsel 2>/dev/null || + clip.exe + +} + +# Convert epoch to human readable (print current date if no args) +epoch() { + local num=${1:--1} + printf '%(%B %d, %Y %-I:%M:%S %p %Z)T\n' "$num" +} + +# Open the current path or file in GitHub +gho() { + local file=$1 + local remote=${2:-origin} + + # get the git root dir, branch, and remote URL + local gr=$(git rev-parse --show-toplevel) + local branch=$(git rev-parse --abbrev-ref HEAD) + local url=$(git config --get "remote.$remote.url") + + [[ -n $gr && -n $branch && -n $remote ]] || return 1 + + # construct the path + local path=${PWD/#$gr/} + [[ -n $file ]] && path+=/$file + + # extract the username and repo name + local a + IFS=:/ read -a a <<< "$url" + local len=${#a[@]} + local user=${a[len-2]} + local repo=${a[len-1]%.git} + + url="https://github.com/$user/$repo/tree/$branch$path" + echo "$url" + open "$url" +} + +# Platform-independent interfaces +interfaces() { + node <<-EOF + var os = require('os'); + var i = os.networkInterfaces(); + Object.keys(i).forEach(function(name) { + i[name].forEach(function(int) { + if (int.family === 'IPv4') { + console.log('%s: %s', name, int.address); + } + }); + }); + EOF +} + +# Calculate CPU load / Core Count +load() { + node -p <<-EOF + var os = require('os'); + var c = os.cpus().length; + os.loadavg().map(function(l) { + return (l/c).toFixed(2); + }).join(' '); + EOF +} + +# Platform-independent memory usage +meminfo() { + node <<-EOF + var os = require('os'); + var free = os.freemem(); + var total = os.totalmem(); + var used = total - free; + console.log('memory: %dmb / %dmb (%d%%)', + Math.round(used / 1024 / 1024), + Math.round(total / 1024 / 1024), + Math.round(used * 100 / total)); + EOF +} + +# print lines over X columns (defaults to 80) +over() { + awk -v c="${1:-80}" 'length($0) > c { + printf("%4d %s\n", NR, $0); + }' +} + +# print a rainbow if truecolor is available to the terminal +truecolor-rainbow() { + local i r g b + for ((i = 0; i < 77; i++)); do + r=$((255 - (i * 255 / 76))) + g=$((i * 510 / 76)) + b=$((i * 255 / 76)) + ((g > 255)) && g=$((510 - g)) + printf '\033[48;2;%d;%d;%dm ' "$r" "$g" "$b" + done + tput sgr0 + echo +} + +# Follow redirects to untiny a tiny url +untiny() { + local location=$1 + local last_location='' + + while [[ -n $location ]]; do + [[ -n $last_location ]] && echo " -> $last_location" + last_location=$location + read -r _ location < \ + <(curl -sI "$location" | grep 'Location: ' | tr -d '[:cntrl:]') + done + echo "$last_location" +} + +# load completions +source /usr/share/bash-completion/completions/fzf +source /usr/share/doc/fzf/examples/key-bindings.bash +source /etc/bash/bash_completion 2>/dev/null + +# done +true diff --git a/config/geany/colorschemes/fluffy.conf b/config/geany/colorschemes/fluffy.conf new file mode 100644 index 0000000..56417c0 --- /dev/null +++ b/config/geany/colorschemes/fluffy.conf @@ -0,0 +1,128 @@ +# +# No explicit license available but part of the `gedit-themes` +# project: +# https://github.com/mig/gedit-themes/blob/master/fluffy.xml +# +# Indicated author and assumed copyright holder is: +# Osmo Salomaa +# +# Ported to Geany by Matthew Brush +# + +[theme_info] +name=Fluffy +description=A soft and downy color scheme. +# incremented automatically, do not change manually +version=1226 +author=Osmo Salomaa +url=https://github.com/mig/gedit-themes/blob/master/fluffy.xml +# list of each compatible Geany release version +compat=1.22;1.23;1.23.1;1.24 + +[named_colors] +almost_black=#111 +blue=#06f +cyan=#02b5d1 +dark_grey=#babdb6 +green=#00bb87 +highlight_blue=#abf5ff +highlight_green=#c1ff9d +highlight_yellow=#fce94f +indigo=#b76fff +light_grey=#eeeeec +magenta=#ff6fff +medium_grey=#d3d7cf +red=#ff405a +very_dark_grey=#888a85 +very_light_grey=#fafaf8 +white=#fff + +[named_styles] + +default=almost_black;white;false;false +error=red;;true + +# Editor styles +#------------------------------------------------------------------------------- + +selection=;highlight_yellow;;true +current_line=;very_light_grey;true +brace_good=;highlight_green +brace_bad=red +margin_line_number=;dark_grey +margin_folding=;medium_grey +fold_symbol_highlight=white +indent_guide=medium_grey +caret=almost_black +marker_line=;highlight_yellow +marker_search=;blue +marker_mark=;highlight_green +call_tips=#c0c0c0 +white_space=medium_grey;;true + +# Generic programming languages +#------------------------------------------------------------------------------- + +comment=blue +comment_doc=comment +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + +number=magenta +number_1=number +number_2=number_1 + +type=green;;true +class=type +function=indigo +parameter=function + +keyword=red;;true +keyword_1=keyword +keyword_2=indigo;;true +keyword_3=keyword_1 +keyword_4=keyword_1 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=magenta +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=string_1,italic +character=string_1 +backticks=string_2 +here_doc=string_2 + +scalar=string_2 +label=default,bold +preprocessor=green +regex=number_1 +operator=default +decorator=red;;true +other=default + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=green +tag_unknown=tag +tag_end=tag +attribute=red +attribute_unknown=red +value=magenta +entity=default + +# Diff +#------------------------------------------------------------------------------- + +line_added=green +line_removed=red +line_changed=cyan diff --git a/config/geany/colorschemes/inkpot.conf b/config/geany/colorschemes/inkpot.conf new file mode 100644 index 0000000..7cd21ee --- /dev/null +++ b/config/geany/colorschemes/inkpot.conf @@ -0,0 +1,118 @@ +# +# Copyright 2012 Campbell Barton +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# + +[theme_info] +name=InkPot +description=Based on the vim theme of the same name. +# incremented automatically, do not change manually +version=1226 +author=Campbell Barton +url=https://github.com/codebrainz/geany-themes +# list of each compatible Geany release version +compat=1.22;1.23;1.23.1;1.24 + +[named_styles] + +default=#cfbfad;#1e1e27;false;false +error=#1e1e1e;#f00;false;false + +# Editor styles +#------------------------------------------------------------------------------- + +selection=;#4e4e8f;false;true +current_line=#000;#2d2d32;true +brace_good=#cfbfad;#4e4e8f +brace_bad=#cfbfad;#f00 +margin_line_number=#8b8bcd;#2e2e2e +margin_folding=#000;#3e3e3e;false;false +fold_symbol_highlight=#6e6e6e +indent_guide=#3b3b4d;;true;false +caret=#8b8bff;#fff;false;false +marker_line=#000;#ff0;false;false +marker_search=#000;#b8f4b8;false;false +marker_mark=#000;#b8f4b8; +call_tips=default +white_space=indent_guide + +# Generic programming languages +#------------------------------------------------------------------------------- + +comment=#cd8b00 +comment_doc=#737dd5 +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=#4e5ab3;;true +comment_doc_keyword_error=comment_doc + +number=#f0ad6d +number_1=number +number_2=number_1 + +type=#ff8bff;;true +class=#ff8bff +function=#ff8bff +parameter=function + +keyword=#808bed +keyword_1=keyword +keyword_2=#afc2ff;;true +keyword_3=keyword_1 +keyword_4=keyword_1 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=#ffcd8b;#404040 +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=string_1 +character=string +backticks=string_2 +here_doc=string_2 + +scalar=string_2 +label=#e76000;;bold +preprocessor=#409090 +regex=number_1 +operator=#eee8d5 +decorator=#e76000;;true +other=#808bed + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=type +tag_unknown=tag,bold +tag_end=tag,bold +attribute=#ff8bff +attribute_unknown=attribute,bold +value=string_1 +entity=default + +# Diff +#------------------------------------------------------------------------------- + +line_added=#0a0 +line_removed=#f00 +line_changed=#e7b937 diff --git a/config/geany/colorschemes/ubuntu.conf b/config/geany/colorschemes/ubuntu.conf new file mode 100644 index 0000000..832f5fb --- /dev/null +++ b/config/geany/colorschemes/ubuntu.conf @@ -0,0 +1,116 @@ +# +# Copyright 2013 James Brierley +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +[theme_info] +name=Ubuntu +description=A theme for Ubuntu fanboys and fangirls. +version=1 +author=James Brierley +url= +# list of each compatible Geany release version +compat=1.22;1.23;1.23.1;1.24 + +[named_styles] + +default=#000;#fff;false;false +error=#fff;#f00 + +# Editor styles +#------------------------------------------------------------------------------- + +selection=#000;#c0c0c0;false;true +current_line=#000;#f0f0f0;true +brace_good=#333;#fff;true;false +brace_bad=#fff;#333;true;false +margin_line_number=#000;#d0d0d0 +margin_folding=#000;#dfdfdf +fold_symbol_highlight=#fff +indent_guide=#c0c0c0 +caret=#000;#000;false +marker_line=#000;#ff0 +marker_search=#000;#0000f0 +marker_mark=#000;#b8f4b8 +call_tips=#c0c0c0;#fff;false;false +white_space=#c0c0c0;#fff;true;false + +# Programming languages +#------------------------------------------------------------------------------- + +comment=#808080 +comment_doc=#595959 +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + +number=#dd4814 +number_1=number +number_2=number_1 + +type=#5e2750;;true +class=type +function=#000080 +parameter=function + +keyword=#2c001e;;true +keyword_1=keyword +keyword_2=#9f0200;;true +keyword_3=keyword_1 +keyword_4=keyword_1 + +identifier=#151515 +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=#dd4814 +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=#000;#e0c0e0 +character=string_1 +backticks=string_2 +here_doc=string_2 + +label=default,bold +preprocessor=comment_doc,bold +regex=number_1 +operator=#5e2750 +decorator=string_1,bold +other=#404080 + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=type +tag_unknown=tag,bold +tag_end=tag,bold +attribute=keyword_1 +attribute_unknown=attribute,bold +value=string_1 +entity=default + +# Diff +#------------------------------------------------------------------------------- + +line_added=#008b8b +line_removed=#6a5acd +line_changed=preprocessor diff --git a/config/geany/geany.conf b/config/geany/geany.conf new file mode 100644 index 0000000..8f979b4 --- /dev/null +++ b/config/geany/geany.conf @@ -0,0 +1,201 @@ +[geany] +pref_main_load_session=true +pref_main_project_file_in_basedir=false +pref_main_save_winpos=true +pref_main_save_wingeom=true +pref_main_confirm_exit=false +pref_main_suppress_status_messages=false +switch_msgwin_pages=false +beep_on_errors=true +auto_focus=false +sidebar_symbol_visible=true +sidebar_openfiles_visible=true +editor_font=Monospace 10 +tagbar_font=Sans 9 +msgwin_font=Monospace 9 +show_notebook_tabs=true +show_tab_cross=true +tab_order_ltr=true +tab_order_beside=false +tab_pos_editor=2 +tab_pos_msgwin=0 +tab_label_length=1000 +show_indent_guide=false +show_white_space=false +show_line_endings=false +show_line_endings_only_when_differ=false +show_markers_margin=true +show_linenumber_margin=true +long_line_enabled=true +long_line_type=0 +long_line_column=72 +long_line_color=#C2EBC2 +symbolcompletion_max_height=10 +symbolcompletion_min_chars=4 +use_folding=true +unfold_all_children=false +use_indicators=true +line_wrapping=false +auto_close_xml_tags=true +complete_snippets=true +auto_complete_symbols=true +pref_editor_disable_dnd=false +pref_editor_smart_home_key=true +pref_editor_newline_strip=false +line_break_column=72 +auto_continue_multiline=true +comment_toggle_mark=~ +scroll_stop_at_last_line=true +autoclose_chars=0 +pref_editor_default_new_encoding=UTF-8 +pref_editor_default_open_encoding=none +default_eol_character=2 +pref_editor_new_line=true +pref_editor_ensure_convert_line_endings=false +pref_editor_replace_tabs=false +pref_editor_trail_space=false +pref_toolbar_show=true +pref_toolbar_append_to_menu=false +pref_toolbar_use_gtk_default_style=true +pref_toolbar_use_gtk_default_icon=true +pref_toolbar_icon_style=0 +pref_toolbar_icon_size=0 +pref_template_developer=shane +pref_template_company= +pref_template_mail=shane@g +pref_template_initial=s +pref_template_version=1.0 +pref_template_year=%Y +pref_template_date=%Y-%m-%d +pref_template_datetime=%d.%m.%Y %H:%M:%S %Z +context_action_cmd= +sidebar_visible=false +statusbar_visible=true +msgwindow_visible=false +fullscreen=false +symbols_group_by_type=true +color_picker_palette= +scribble_text=Type here what you want, use it as a notice/scratch board +scribble_pos=57 +custom_date_format= +default_open_path= +cmdline_new_files=true +notebook_double_click_hides_widgets=false +tab_close_switch_to_mru=false +tab_pos_sidebar=2 +openfiles_path_mode=2 +sidebar_pos=0 +symbols_sort_mode=0 +msgwin_orientation=1 +highlighting_invert_all=false +pref_main_search_use_current_word=true +check_detect_indent=false +detect_indent_width=false +use_tab_to_indent=true +backspace_unindent=true +pref_editor_tab_width=4 +indent_mode=2 +indent_type=1 +virtualspace=1 +change_history_markers=false +change_history_indicators=false +autocomplete_doc_words=false +completion_drops_rest_of_word=false +autocompletion_max_entries=30 +autocompletion_update_freq=250 +color_scheme=inkpot.conf +scroll_lines_around_cursor=0 +mru_length=10 +disk_check_timeout=30 +show_editor_scrollbars=true +brace_match_ltgt=false +use_gtk_word_boundaries=true +complete_snippets_whilst_editing=false +indent_hard_tab_width=8 +editor_ime_interaction=0 +use_atomic_file_saving=false +gio_unsafe_save_backup=false +use_gio_unsafe_file_saving=true +keep_edit_history_on_reload=true +show_keep_edit_history_on_reload_msg=true +reload_clean_doc_on_file_change=false +save_config_on_file_change=true +extract_filetype_regex=-\\*-\\s*([^\\s]+)\\s*-\\*- +allow_always_save=false +find_selection_type=0 +replace_and_find_by_default=true +show_symbol_list_expanders=true +compiler_tab_autoscroll=true +statusbar_template=line: %l / %L col: %c sel: %s %w %t %mmode: %M encoding: %e filetype: %f scope: %S +new_document_after_close=false +msgwin_status_visible=true +msgwin_compiler_visible=true +msgwin_messages_visible=true +msgwin_scribble_visible=true +warn_on_project_close=true + +[tools] +terminal_cmd=x-terminal-emulator -e "/bin/sh %c" +browser_cmd=sensible-browser +grep_cmd=grep + +[printing] +print_cmd=lpr '%f' +use_gtk_printing=true +print_line_numbers=true +print_page_numbers=true +print_page_header=true +page_header_basename=false +page_header_datefmt=%c + +[VTE] +load_vte=true +font=Monospace 10 +scroll_on_key=true +scroll_on_out=true +enable_bash_keys=true +ignore_menu_bar_accel=false +follow_path=false +run_in_vte=false +skip_run_script=false +cursor_blinks=false +scrollback_lines=500 +shell=/bin/bash +colour_fore=#FFFFFF +colour_back=#000000 +send_cmd_prefix= +send_selection_unsafe=false + +[build-menu] +number_ft_menu_items=0 +number_non_ft_menu_items=0 +number_exec_menu_items=0 + +[search] +pref_search_hide_find_dialog=false +pref_search_always_wrap=false +pref_search_current_file_dir=true +fif_regexp=false +fif_case_sensitive=true +fif_match_whole_word=false +fif_invert_results=false +fif_recursive=false +fif_extra_options= +fif_use_extra_options=false +fif_files= +fif_files_mode=0 +find_regexp=false +find_regexp_multiline=false +find_case_sensitive=false +find_escape_sequences=false +find_match_whole_word=false +find_match_word_start=false +find_close_dialog=true +replace_regexp=false +replace_regexp_multiline=false +replace_case_sensitive=false +replace_escape_sequences=false +replace_match_whole_word=false +replace_match_word_start=false +replace_search_backwards=false +replace_close_dialog=true diff --git a/config/i3/config b/config/i3/config new file mode 100644 index 0000000..34c783e --- /dev/null +++ b/config/i3/config @@ -0,0 +1,154 @@ +# set modifier +set $super Mod1 +set $alt Mod4 + +# set font +font pango:Ionicons 12, Poppins Regular 12 + +# use mouse+$super to drag floating windows to their wanted position +floating_modifier $super + + +# autostart +exec --no-startup-id eval $(gnome-keyring-daemon -s) +exec --no-startup-id hsetroot -fill ~/.config/i3/wallpaper.png +exec --no-startup-id ~/.config/i3/display.sh +exec --no-startup-id redshift-gtk & +exec --no-startup-id nm-applet & +exec --no-startup-id signal-desktop --password-store=gnome-libsecret & + +# start a terminal +bindsym $super+Return exec i3-sensible-terminal + +# start dmenu (a program launcher) +bindsym $super+d exec i3-dmenu-desktop --dmenu="dmenu -i -b \ +-fn 'Poppins:size=9' -nb '#141c21' -nf '#93a1a1' \ +-sb '#289c93' -sf '#141c21'" + +# common apps keybinds +bindsym Print exec scrot 'screen_%a-%d%b%y_%H.%M.png' -e 'xdg-open ~/$f' +bindsym $super+l exec i3lock -i ~/.config/i3/lock.png +bindsym $super+w exec x-www-browser +bindsym $super+e exec thunar +bindsym $super+t exec geany + +# change volume and brightness +# Pulse Audio controls +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound + +# change volume and brightness +bindsym XF86MonBrightnessUp exec brightnessctl set 5%+ +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- + + +# Media player controls +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioPause exec playerctl pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + +# kill focused window +bindsym $super+c kill +bindsym $alt+F4 kill + +# change focus +bindsym $super+Left focus left +bindsym $super+Down focus down +bindsym $super+Up focus up +bindsym $super+Right focus right + +# move focused window +bindsym $super+Shift+Left move left +bindsym $super+Shift+Down move down +bindsym $super+Shift+Up move up +bindsym $super+Shift+Right move right + +# split in horizontal or vertical orientation +bindsym $super+h split h +bindsym $super+v split v + +# change split direction for already opened windows +bindsym $super+s layout toggle split + +# enter fullscreen mode for the focused container +bindsym $super+f fullscreen toggle + +# toggle tiling / floating +bindsym $super+space floating toggle + +# change focus between tiling / floating windows +bindsym $super+Shift+space focus mode_toggle + +# switch to workspace +bindsym $super+Control+Right workspace next +bindsym $super+Control+Left workspace prev +bindsym $super+1 workspace 1:I +bindsym $super+2 workspace 2:II +bindsym $super+3 workspace 3:III +bindsym $super+4 workspace 4:IV +bindsym $super+5 workspace 5:V +bindsym $super+6 workspace 6:VI + +# move focused container to workspace +bindsym $super+Shift+1 move container to workspace 1:I +bindsym $super+Shift+2 move container to workspace 2:II +bindsym $super+Shift+3 move container to workspace 3:III +bindsym $super+Shift+4 move container to workspace 4:IV +bindsym $super+Shift+5 move container to workspace 5:V +bindsym $super+Shift+6 move container to workspace 6:VI + +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $super+BackSpace exec "i3-msg restart" + +# exit i3 +bindsym $super+q exec "i3-nagbar -t warning -m 'Really, exit?' \ +-b 'Yes' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + bindsym Left resize shrink width 5 px or 5 ppt + bindsym Down resize grow height 5 px or 5 ppt + bindsym Up resize shrink height 5 px or 5 ppt + bindsym Right resize grow width 5 px or 5 ppt + bindsym Return mode "default" + } +bindsym $super+r mode "resize" + +# panel +bar { + status_command i3status + position top + workspace_min_width 24 + padding 2px 8px 2px 8px + strip_workspace_numbers yes + + colors { + background #141c21 + statusline #141c21 + separator #141c21 + + # colour of border, background, and text + focused_workspace #141c21 #d12f2c #93a1a1 + active_workspace #141c21 #141c21 #93a1a1 + inactive_workspace #141c21 #141c21 #93a1a1 + urgent_workspace #141c21 #b08500 #93a1a1 + } +} + +# colour of border, background, text, indicator, and child_border +client.focused #d12f2c #263640 #93a1a1 #696ebf #2587cc1 +client.focused_inactive #263640 #b08500 #93a1a1 #263640 #263640 +client.unfocused #263640 #b08500 #93a1a1 #263640 #263640 +client.urgent #263640 #b08500 #93a1a1 #263640 #263640 +client.placeholder #263640 #b08500 #93a1a1 #263640 #263640 +client.background #263640 + +# window rules, you can find the window class using xprop +for_window [class=Eog|Sxiv|feh|mpv|Vlc|File-roller|Xarchiver] floating enable +for_window [class=Eog|Sxiv|feh|mpv|Vlc|File-roller|Xarchiver] focus +for_window [class=".*"] border pixel 8 +hide_edge_borders smart +gaps inner 12 +smart_gaps on diff --git a/config/i3/display.sh b/config/i3/display.sh new file mode 100755 index 0000000..6154365 --- /dev/null +++ b/config/i3/display.sh @@ -0,0 +1,2 @@ +#!/bin/sh +xrandr --output eDP-1 --primary --mode 1600x900 --pos 0x0 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off diff --git a/config/i3/lock.png b/config/i3/lock.png new file mode 100755 index 0000000..7c6710f Binary files /dev/null and b/config/i3/lock.png differ diff --git a/config/i3/wallpaper.png b/config/i3/wallpaper.png new file mode 100755 index 0000000..d859c22 Binary files /dev/null and b/config/i3/wallpaper.png differ diff --git a/config/i3status/config b/config/i3status/config new file mode 100755 index 0000000..28e75ce --- /dev/null +++ b/config/i3status/config @@ -0,0 +1,75 @@ +general { + output_format = "i3bar" + colors = false + markup = pango + interval = 5 +} + +order += "load" +order += "memory" +order += "cpu_temperature 0" +order += "wireless wlp4s0" +order += "volume master" +order += "battery 0" +order += "battery 1" +order += "time" + +load { + format = " %5min Load " +} + +memory { + format = " %used | %available " + threshold_degraded = "1G" + format_degraded = "MEMORY < %available" +} + + +cpu_temperature 0 { + format = " %degrees °C " + path = "/sys/class/thermal/thermal_zone0/temp" +} + +wireless wlp4s0 { + format_up = " %essid " + format_down = " Disconnected " +} + +volume master { + format = " %volume " + format_muted = " Muted " + device = "default" + mixer = "Master" + mixer_idx = 0 +} + +battery 0 { + last_full_capacity = true + format = " %status %percentage " + format_down = "No Battery" + status_chr = "" + status_bat = "" + status_unk = "" + status_full = "" + path = "/sys/class/power_supply/BAT%d/uevent" + low_threshold = 10 + integer_battery_capacity = true +} + +battery 1 { + last_full_capacity = true + format = " %status %percentage " + format_down = "No Battery" + status_chr = "" + status_bat = "" + status_unk = "" + status_full = "" + path = "/sys/class/power_supply/BAT%d/uevent" + low_threshold = 10 + integer_battery_capacity = true +} + +time { + format = " %b %d at %H:%M " +} + diff --git a/config/redshift.conf b/config/redshift.conf new file mode 100644 index 0000000..3307417 --- /dev/null +++ b/config/redshift.conf @@ -0,0 +1,70 @@ +; Global settings for redshift +[redshift] +; Set the day and night screen temperatures +temp-day=4000 +temp-night=3000 + +; Disable the smooth fade between temperatures when Redshift starts and stops. +; 0 will cause an immediate change between screen temperatures. +; 1 will gradually apply the new screen temperature over a couple of seconds. +fade=1 + +; Solar elevation thresholds. +; By default, Redshift will use the current elevation of the sun to determine +; whether it is daytime, night or in transition (dawn/dusk). When the sun is +; above the degrees specified with elevation-high it is considered daytime and +; below elevation-low it is considered night. +;elevation-high=3 +;elevation-low=-6 + +; Custom dawn/dusk intervals. +; Instead of using the solar elevation, the time intervals of dawn and dusk +; can be specified manually. The times must be specified as HH:MM in 24-hour +; format. +;dawn-time=6:00-7:45 +;dusk-time=18:35-20:15 + +; Set the screen brightness. Default is 1.0. +brightness=0.9 +; It is also possible to use different settings for day and night +; since version 1.8. +;brightness-day=0.7 +;brightness-night=0.4 +; Set the screen gamma (for all colors, or each color channel +; individually) +; gamma=0.8 +;gamma=0.8:0.7:0.8 +; This can also be set individually for day and night since +; version 1.10. +;gamma-day=0.8:0.7:0.8 +;gamma-night=0.6 + +; Set the location-provider: 'geoclue2', 'manual' +; type 'redshift -l list' to see possible values. +; The location provider settings are in a different section. +location-provider=manual + +; Set the adjustment-method: 'randr', 'vidmode' +; type 'redshift -m list' to see all possible values. +; 'randr' is the preferred method, 'vidmode' is an older API. +; but works in some cases when 'randr' does not. +; The adjustment method settings are in a different section. +adjustment-method=randr + +; Configuration of the location-provider: +; type 'redshift -l PROVIDER:help' to see the settings. +; ex: 'redshift -l manual:help' +; Keep in mind that longitudes west of Greenwich (e.g. the Americas) +; are negative numbers. +[manual] +lat=40.79 +lon=-84.19 + +; Configuration of the adjustment-method +; type 'redshift -m METHOD:help' to see the settings. +; ex: 'redshift -m randr:help' +; In this example, randr is configured to adjust only screen 0. +; Note that the numbering starts from 0, so this is actually the first screen. +; If this option is not specified, Redshift will try to adjust _all_ screens. +; [randr] +; screen=0 diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..472fc7f --- /dev/null +++ b/gitconfig @@ -0,0 +1,49 @@ +#--------------------------- +#-- .gitconfig -- +#-- by shane -- +#-- CC BY-SA 3.0 -- +#--------------------------- +[user] + email = shane@shaner.life + name = Shane Peters +[color] + ui = true +[alias] + st = status -s + ci = commit + br = branch + co = checkout + df = diff + lg = log -p + pl = pull + ps = push + timeline = log --graph \"--pretty=format:%C(192)%h%Creset by %C(bold 239)%an%Creset (%ar)%C(182)%d%Creset%n%s%n%b\" --all + ctimeline = log --graph --format=format:\"%C(yellow)%h%C(red)%d%C(reset) - %C(bold green)(%ar)%C(reset) %s %C(blue)<%an>%C(reset)\" + stag = add -u + unstag = reset HEAD -- + change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --env-filter \"if [[ \\\"$`echo $VAR`\\\" = '$OLD' ]]; then export $VAR='$NEW'; fi\" $@; }; f " +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[merge] + conflictstyle = zdiff3 + +[pager] + pager = delta + diff = delta + show = delta + +[delta] + navigate = true # use n and N to move between diff sections + # dark = true + # light = true + line-numbers = true + side-by-side = true + line-numbers-left-format = "{nm:>4}┊" + line-numbers-right-format = "{np:>4}│" + +[init] + defaultBranch = master diff --git a/htoprc b/htoprc new file mode 100644 index 0000000..a995f2b --- /dev/null +++ b/htoprc @@ -0,0 +1,20 @@ +# Dave eddy htoprc +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=46 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +highlight_base_name=0 +highlight_megabytes=1 +highlight_threads=0 +tree_view=0 +header_margin=1 +detailed_cpu_time=0 +color_scheme=5 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 4 diff --git a/install b/install new file mode 100644 index 0000000..5a9f139 --- /dev/null +++ b/install @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# install dotfiles +dotfiles=( + bash_profile + bashrc + config + gitconfig + htoprc + screenrc + tmux.conf + vimrc + vim + xinitrc + Xresources +) +for f in "${dotfiles[@]}"; do + if [ "$f" == "pkgs" ]; then + continue + fi + cp -rv $f ~/."$f" +done + +# install packages +packages=( + arandr + i3 + i3lock + fzf + git + hsetroot + playerctl + ranger + redshift-gtk + rofi + rxvt-unicode + scrot + ssh + suckless-tools + thunar + x11-xserver-utils # for xrandr + xsel + vim + cmus + fish +) +sudo dpkg -i ./pkgs/*.deb +sudo apt install -y ${packages[@]} +vim '+PlugInstall --sync' +qa diff --git a/pkgs/git-delta_0.18.2_amd64.deb b/pkgs/git-delta_0.18.2_amd64.deb new file mode 100644 index 0000000..5ef57b2 Binary files /dev/null and b/pkgs/git-delta_0.18.2_amd64.deb differ diff --git a/screenrc b/screenrc new file mode 100644 index 0000000..58dd5e7 --- /dev/null +++ b/screenrc @@ -0,0 +1,12 @@ +# Dave Eddy + +termcapinfo xterm* ti@:te@ + +hardstatus alwayslastline +hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{=kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{g}%?%+Lw%?%?%= %{g}][%{B}%m/%d %{W}%c %{g}]' + +#no more wuf wuf +bindkey -d -k kb stuff "\010" + +# Allow full screen apps to clear properly +altscreen on diff --git a/ssh/agent-environment b/ssh/agent-environment new file mode 100644 index 0000000..aa3b636 --- /dev/null +++ b/ssh/agent-environment @@ -0,0 +1,3 @@ +SSH_AUTH_SOCK=/tmp/ssh-zXhOqb9pEfti/agent.113035; export SSH_AUTH_SOCK; +SSH_AGENT_PID=113037; export SSH_AGENT_PID; +#echo Agent pid 113037; diff --git a/ssh/config b/ssh/config new file mode 100644 index 0000000..e4b9582 --- /dev/null +++ b/ssh/config @@ -0,0 +1,2 @@ +HashKnownHosts yes +ForwardAgent no diff --git a/ssh/environment b/ssh/environment new file mode 100644 index 0000000..f809986 --- /dev/null +++ b/ssh/environment @@ -0,0 +1 @@ +PATH=/snap/bin:/usr/local/sbin:/usr/local/bin:/opt/local/sbin:/opt/local/bin:/usr/sbin:/usr/bin:/sbin diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 0000000..95f27fa --- /dev/null +++ b/tmux.conf @@ -0,0 +1,61 @@ +# .tmux.conf + +new-session -n $HOST + +#unbind -n MouseDown3Pane +bind | split-window -h +bind - split-window -v +bind -n M-Left select-pane -L +bind -n M-Right select-pane -R +bind -n M-Up select-pane -U +bind -n M-Down select-pane -D +bind-key r source-file ~/.tmux.conf +bind-key y \ + setw synchronize-pane on \;\ + display 'SYNC Panes: ON' +bind-key Y \ + setw synchronize-pane off \;\ + display 'SYNC Panes: OFF' + +unbind '"' +unbind % + +set-option -g history-limit 3000000 +set -g default-terminal "screen-256color" +set -g mouse on +set -g mode-keys vi +setw -g monitor-activity on +set -g visual-activity on + +# statusbar background to black, foreground to white +set-option -g status-fg black +set-option -g status-bg yellow + +# hostname is printed on the left, uptime and current load on the right +set-option -g status-left-length 40 +set-option -g status-left "#H" +set-option -g status-right "#(uptime|cut -d "," -f 2-)" + +set-option -g status-keys vi +set-window-option -g mode-keys vi + +# fix the titles +set -g set-titles on +set -g set-titles-string "#I:#W" + +# be notified when there is activity in one of your windows +set-window-option -g monitor-activity on + +# don't rename windows automatically +#set-window-option -g automatic-rename off + +###################### +### DESIGN CHANGES ### +###################### + +# loud or quiet? +set -g visual-activity off +set -g visual-bell off +set -g visual-silence off +setw -g monitor-activity off +set -g bell-action none diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim new file mode 100644 index 0000000..652caa8 --- /dev/null +++ b/vim/autoload/plug.vim @@ -0,0 +1,2812 @@ +" vim-plug: Vim plugin manager +" ============================ +" +" Download plug.vim and put it in ~/.vim/autoload +" +" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ +" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +" +" Edit your .vimrc +" +" call plug#begin('~/.vim/plugged') +" +" " Make sure you use single quotes +" +" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align +" Plug 'junegunn/vim-easy-align' +" +" " Any valid git URL is allowed +" Plug 'https://github.com/junegunn/vim-github-dashboard.git' +" +" " Multiple Plug commands can be written in a single line using | separators +" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +" +" " On-demand loading +" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } +" +" " Using a non-default branch +" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } +" +" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) +" Plug 'fatih/vim-go', { 'tag': '*' } +" +" " Plugin options +" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } +" +" " Plugin outside ~/.vim/plugged with post-update hook +" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +" +" " Unmanaged plugin (manually installed and updated) +" Plug '~/my-prototype-plugin' +" +" " Initialize plugin system +" call plug#end() +" +" Then reload .vimrc and :PlugInstall to install plugins. +" +" Plug options: +" +"| Option | Description | +"| ----------------------- | ------------------------------------------------ | +"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | +"| `rtp` | Subdirectory that contains Vim plugin | +"| `dir` | Custom directory for the plugin | +"| `as` | Use different name for the plugin | +"| `do` | Post-update hook (string or funcref) | +"| `on` | On-demand loading: Commands or ``-mappings | +"| `for` | On-demand loading: File types | +"| `frozen` | Do not update unless explicitly specified | +" +" More information: https://github.com/junegunn/vim-plug +" +" +" Copyright (c) 2017 Junegunn Choi +" +" MIT License +" +" Permission is hereby granted, free of charge, to any person obtaining +" a copy of this software and associated documentation files (the +" "Software"), to deal in the Software without restriction, including +" without limitation the rights to use, copy, modify, merge, publish, +" distribute, sublicense, and/or sell copies of the Software, and to +" permit persons to whom the Software is furnished to do so, subject to +" the following conditions: +" +" The above copyright notice and this permission notice shall be +" included in all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +if exists('g:loaded_plug') + finish +endif +let g:loaded_plug = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let s:plug_src = 'https://github.com/junegunn/vim-plug.git' +let s:plug_tab = get(s:, 'plug_tab', -1) +let s:plug_buf = get(s:, 'plug_buf', -1) +let s:mac_gui = has('gui_macvim') && has('gui_running') +let s:is_win = has('win32') +let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) +let s:vim8 = has('patch-8.0.0039') && exists('*job_start') +if s:is_win && &shellslash + set noshellslash + let s:me = resolve(expand(':p')) + set shellslash +else + let s:me = resolve(expand(':p')) +endif +let s:base_spec = { 'branch': '', 'frozen': 0 } +let s:TYPE = { +\ 'string': type(''), +\ 'list': type([]), +\ 'dict': type({}), +\ 'funcref': type(function('call')) +\ } +let s:loaded = get(s:, 'loaded', {}) +let s:triggers = get(s:, 'triggers', {}) + +function! s:is_powershell(shell) + return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$' +endfunction + +function! s:isabsolute(dir) abort + return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') +endfunction + +function! s:git_dir(dir) abort + let gitdir = s:trim(a:dir) . '/.git' + if isdirectory(gitdir) + return gitdir + endif + if !filereadable(gitdir) + return '' + endif + let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') + if len(gitdir) && !s:isabsolute(gitdir) + let gitdir = a:dir . '/' . gitdir + endif + return isdirectory(gitdir) ? gitdir : '' +endfunction + +function! s:git_origin_url(dir) abort + let gitdir = s:git_dir(a:dir) + let config = gitdir . '/config' + if empty(gitdir) || !filereadable(config) + return '' + endif + return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') +endfunction + +function! s:git_revision(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + + let line = get(readfile(head), 0, '') + let ref = matchstr(line, '^ref: \zs.*') + if empty(ref) + return line + endif + + if filereadable(gitdir . '/' . ref) + return get(readfile(gitdir . '/' . ref), 0, '') + endif + + if filereadable(gitdir . '/packed-refs') + for line in readfile(gitdir . '/packed-refs') + if line =~# ' ' . ref + return matchstr(line, '^[0-9a-f]*') + endif + endfor + endif + + return '' +endfunction + +function! s:git_local_branch(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') + return len(branch) ? branch : 'HEAD' +endfunction + +function! s:git_origin_branch(spec) + if len(a:spec.branch) + return a:spec.branch + endif + + " The file may not be present if this is a local repository + let gitdir = s:git_dir(a:spec.dir) + let origin_head = gitdir.'/refs/remotes/origin/HEAD' + if len(gitdir) && filereadable(origin_head) + return matchstr(get(readfile(origin_head), 0, ''), + \ '^ref: refs/remotes/origin/\zs.*') + endif + + " The command may not return the name of a branch in detached HEAD state + let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) + return v:shell_error ? '' : result[-1] +endfunction + +if s:is_win + function! s:plug_call(fn, ...) + let shellslash = &shellslash + try + set noshellslash + return call(a:fn, a:000) + finally + let &shellslash = shellslash + endtry + endfunction +else + function! s:plug_call(fn, ...) + return call(a:fn, a:000) + endfunction +endif + +function! s:plug_getcwd() + return s:plug_call('getcwd') +endfunction + +function! s:plug_fnamemodify(fname, mods) + return s:plug_call('fnamemodify', a:fname, a:mods) +endfunction + +function! s:plug_expand(fmt) + return s:plug_call('expand', a:fmt, 1) +endfunction + +function! s:plug_tempname() + return s:plug_call('tempname') +endfunction + +function! plug#begin(...) + if a:0 > 0 + let s:plug_home_org = a:1 + let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) + elseif exists('g:plug_home') + let home = s:path(g:plug_home) + elseif has('nvim') + let home = stdpath('data') . '/plugged' + elseif !empty(&rtp) + let home = s:path(split(&rtp, ',')[0]) . '/plugged' + else + return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') + endif + if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp + return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') + endif + + let g:plug_home = home + let g:plugs = {} + let g:plugs_order = [] + let s:triggers = {} + + call s:define_commands() + return 1 +endfunction + +function! s:define_commands() + command! -nargs=+ -bar Plug call plug#() + if !executable('git') + return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') + endif + if has('win32') + \ && &shellslash + \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell)) + return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') + endif + if !has('nvim') + \ && (has('win32') || has('win32unix')) + \ && !has('multi_byte') + return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') + endif + command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) + command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) + command! -nargs=0 -bar -bang PlugClean call s:clean(0) + command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif + command! -nargs=0 -bar PlugStatus call s:status() + command! -nargs=0 -bar PlugDiff call s:diff() + command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) +endfunction + +function! s:to_a(v) + return type(a:v) == s:TYPE.list ? a:v : [a:v] +endfunction + +function! s:to_s(v) + return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" +endfunction + +function! s:glob(from, pattern) + return s:lines(globpath(a:from, a:pattern)) +endfunction + +function! s:source(from, ...) + let found = 0 + for pattern in a:000 + for vim in s:glob(a:from, pattern) + execute 'source' s:esc(vim) + let found = 1 + endfor + endfor + return found +endfunction + +function! s:assoc(dict, key, val) + let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) +endfunction + +function! s:ask(message, ...) + call inputsave() + echohl WarningMsg + let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) + echohl None + call inputrestore() + echo "\r" + return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 +endfunction + +function! s:ask_no_interrupt(...) + try + return call('s:ask', a:000) + catch + return 0 + endtry +endfunction + +function! s:lazy(plug, opt) + return has_key(a:plug, a:opt) && + \ (empty(s:to_a(a:plug[a:opt])) || + \ !isdirectory(a:plug.dir) || + \ len(s:glob(s:rtp(a:plug), 'plugin')) || + \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) +endfunction + +function! plug#end() + if !exists('g:plugs') + return s:err('plug#end() called without calling plug#begin() first') + endif + + if exists('#PlugLOD') + augroup PlugLOD + autocmd! + augroup END + augroup! PlugLOD + endif + let lod = { 'ft': {}, 'map': {}, 'cmd': {} } + + if get(g:, 'did_load_filetypes', 0) + filetype off + endif + for name in g:plugs_order + if !has_key(g:plugs, name) + continue + endif + let plug = g:plugs[name] + if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') + let s:loaded[name] = 1 + continue + endif + + if has_key(plug, 'on') + let s:triggers[name] = { 'map': [], 'cmd': [] } + for cmd in s:to_a(plug.on) + if cmd =~? '^.\+' + if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) + call s:assoc(lod.map, cmd, name) + endif + call add(s:triggers[name].map, cmd) + elseif cmd =~# '^[A-Z]' + let cmd = substitute(cmd, '!*$', '', '') + if exists(':'.cmd) != 2 + call s:assoc(lod.cmd, cmd, name) + endif + call add(s:triggers[name].cmd, cmd) + else + call s:err('Invalid `on` option: '.cmd. + \ '. Should start with an uppercase letter or ``.') + endif + endfor + endif + + if has_key(plug, 'for') + let types = s:to_a(plug.for) + if !empty(types) + augroup filetypedetect + call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') + augroup END + endif + for type in types + call s:assoc(lod.ft, type, name) + endfor + endif + endfor + + for [cmd, names] in items(lod.cmd) + execute printf( + \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', + \ cmd, string(cmd), string(names)) + endfor + + for [map, names] in items(lod.map) + for [mode, map_prefix, key_prefix] in + \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + execute printf( + \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', + \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) + endfor + endfor + + for [ft, names] in items(lod.ft) + augroup PlugLOD + execute printf('autocmd FileType %s call lod_ft(%s, %s)', + \ ft, string(ft), string(names)) + augroup END + endfor + + call s:reorg_rtp() + filetype plugin indent on + if has('vim_starting') + if has('syntax') && !exists('g:syntax_on') + syntax enable + end + else + call s:reload_plugins() + endif +endfunction + +function! s:loaded_names() + return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') +endfunction + +function! s:load_plugin(spec) + call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') +endfunction + +function! s:reload_plugins() + for name in s:loaded_names() + call s:load_plugin(g:plugs[name]) + endfor +endfunction + +function! s:trim(str) + return substitute(a:str, '[\/]\+$', '', '') +endfunction + +function! s:version_requirement(val, min) + for idx in range(0, len(a:min) - 1) + let v = get(a:val, idx, 0) + if v < a:min[idx] | return 0 + elseif v > a:min[idx] | return 1 + endif + endfor + return 1 +endfunction + +function! s:git_version_requirement(...) + if !exists('s:git_version') + let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)') + endif + return s:version_requirement(s:git_version, a:000) +endfunction + +function! s:progress_opt(base) + return a:base && !s:is_win && + \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' +endfunction + +function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) +endfunction + +if s:is_win + function! s:path(path) + return s:trim(substitute(a:path, '/', '\', 'g')) + endfunction + + function! s:dirpath(path) + return s:path(a:path) . '\' + endfunction + + function! s:is_local_plug(repo) + return a:repo =~? '^[a-z]:\|^[%~]' + endfunction + + " Copied from fzf + function! s:wrap_cmds(cmds) + let cmds = [ + \ '@echo off', + \ 'setlocal enabledelayedexpansion'] + \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) + \ + ['endlocal'] + if has('iconv') + if !exists('s:codepage') + let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) + endif + return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) + endif + return map(cmds, 'v:val."\r"') + endfunction + + function! s:batchfile(cmd) + let batchfile = s:plug_tempname().'.bat' + call writefile(s:wrap_cmds(a:cmd), batchfile) + let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) + if s:is_powershell(&shell) + let cmd = '& ' . cmd + endif + return [batchfile, cmd] + endfunction +else + function! s:path(path) + return s:trim(a:path) + endfunction + + function! s:dirpath(path) + return substitute(a:path, '[/\\]*$', '/', '') + endfunction + + function! s:is_local_plug(repo) + return a:repo[0] =~ '[/$~]' + endfunction +endif + +function! s:err(msg) + echohl ErrorMsg + echom '[vim-plug] '.a:msg + echohl None +endfunction + +function! s:warn(cmd, msg) + echohl WarningMsg + execute a:cmd 'a:msg' + echohl None +endfunction + +function! s:esc(path) + return escape(a:path, ' ') +endfunction + +function! s:escrtp(path) + return escape(a:path, ' ,') +endfunction + +function! s:remove_rtp() + for name in s:loaded_names() + let rtp = s:rtp(g:plugs[name]) + execute 'set rtp-='.s:escrtp(rtp) + let after = globpath(rtp, 'after') + if isdirectory(after) + execute 'set rtp-='.s:escrtp(after) + endif + endfor +endfunction + +function! s:reorg_rtp() + if !empty(s:first_rtp) + execute 'set rtp-='.s:first_rtp + execute 'set rtp-='.s:last_rtp + endif + + " &rtp is modified from outside + if exists('s:prtp') && s:prtp !=# &rtp + call s:remove_rtp() + unlet! s:middle + endif + + let s:middle = get(s:, 'middle', &rtp) + let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') + let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') + let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') + \ . ','.s:middle.',' + \ . join(map(afters, 'escape(v:val, ",")'), ',') + let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') + let s:prtp = &rtp + + if !empty(s:first_rtp) + execute 'set rtp^='.s:first_rtp + execute 'set rtp+='.s:last_rtp + endif +endfunction + +function! s:doautocmd(...) + if exists('#'.join(a:000, '#')) + execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) + endif +endfunction + +function! s:dobufread(names) + for name in a:names + let path = s:rtp(g:plugs[name]) + for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] + if len(finddir(dir, path)) + if exists('#BufRead') + doautocmd BufRead + endif + return + endif + endfor + endfor +endfunction + +function! plug#load(...) + if a:0 == 0 + return s:err('Argument missing: plugin name(s) required') + endif + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 + let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') + if !empty(unknowns) + let s = len(unknowns) > 1 ? 's' : '' + return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) + end + let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') + if !empty(unloaded) + for name in unloaded + call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + endfor + call s:dobufread(unloaded) + return 1 + end + return 0 +endfunction + +function! s:remove_triggers(name) + if !has_key(s:triggers, a:name) + return + endif + for cmd in s:triggers[a:name].cmd + execute 'silent! delc' cmd + endfor + for map in s:triggers[a:name].map + execute 'silent! unmap' map + execute 'silent! iunmap' map + endfor + call remove(s:triggers, a:name) +endfunction + +function! s:lod(names, types, ...) + for name in a:names + call s:remove_triggers(name) + let s:loaded[name] = 1 + endfor + call s:reorg_rtp() + + for name in a:names + let rtp = s:rtp(g:plugs[name]) + for dir in a:types + call s:source(rtp, dir.'/**/*.vim') + endfor + if a:0 + if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) + execute 'runtime' a:1 + endif + call s:source(rtp, a:2) + endif + call s:doautocmd('User', name) + endfor +endfunction + +function! s:lod_ft(pat, names) + let syn = 'syntax/'.a:pat.'.vim' + call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) + execute 'autocmd! PlugLOD FileType' a:pat + call s:doautocmd('filetypeplugin', 'FileType') + call s:doautocmd('filetypeindent', 'FileType') +endfunction + +function! s:lod_cmd(cmd, bang, l1, l2, args, names) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) +endfunction + +function! s:lod_map(map, names, with_prefix, prefix) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + let extra = '' + while 1 + let c = getchar(0) + if c == 0 + break + endif + let extra .= nr2char(c) + endwhile + + if a:with_prefix + let prefix = v:count ? v:count : '' + let prefix .= '"'.v:register.a:prefix + if mode(1) == 'no' + if v:operator == 'c' + let prefix = "\" . prefix + endif + let prefix .= v:operator + endif + call feedkeys(prefix, 'n') + endif + call feedkeys(substitute(a:map, '^', "\", '') . extra) +endfunction + +function! plug#(repo, ...) + if a:0 > 1 + return s:err('Invalid number of arguments (1..2)') + endif + + try + let repo = s:trim(a:repo) + let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec + let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) + let spec = extend(s:infer_properties(name, repo), opts) + if !has_key(g:plugs, name) + call add(g:plugs_order, name) + endif + let g:plugs[name] = spec + let s:loaded[name] = get(s:loaded, name, 0) + catch + return s:err(repo . ' ' . v:exception) + endtry +endfunction + +function! s:parse_options(arg) + let opts = copy(s:base_spec) + let type = type(a:arg) + let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' + if type == s:TYPE.string + if empty(a:arg) + throw printf(opt_errfmt, 'tag', 'string') + endif + let opts.tag = a:arg + elseif type == s:TYPE.dict + for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] + if has_key(a:arg, opt) + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) + throw printf(opt_errfmt, opt, 'string') + endif + endfor + for opt in ['on', 'for'] + if has_key(a:arg, opt) + \ && type(a:arg[opt]) != s:TYPE.list + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) + throw printf(opt_errfmt, opt, 'string or list') + endif + endfor + if has_key(a:arg, 'do') + \ && type(a:arg.do) != s:TYPE.funcref + \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) + throw printf(opt_errfmt, 'do', 'string or funcref') + endif + call extend(opts, a:arg) + if has_key(opts, 'dir') + let opts.dir = s:dirpath(s:plug_expand(opts.dir)) + endif + else + throw 'Invalid argument type (expected: string or dictionary)' + endif + return opts +endfunction + +function! s:infer_properties(name, repo) + let repo = a:repo + if s:is_local_plug(repo) + return { 'dir': s:dirpath(s:plug_expand(repo)) } + else + if repo =~ ':' + let uri = repo + else + if repo !~ '/' + throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) + endif + let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') + let uri = printf(fmt, repo) + endif + return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } + endif +endfunction + +function! s:install(force, names) + call s:update_impl(0, a:force, a:names) +endfunction + +function! s:update(force, names) + call s:update_impl(1, a:force, a:names) +endfunction + +function! plug#helptags() + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + for spec in values(g:plugs) + let docd = join([s:rtp(spec), 'doc'], '/') + if isdirectory(docd) + silent! execute 'helptags' s:esc(docd) + endif + endfor + return 1 +endfunction + +function! s:syntax() + syntax clear + syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber + syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX + syn match plugNumber /[0-9]\+[0-9.]*/ contained + syn match plugBracket /[[\]]/ contained + syn match plugX /x/ contained + syn match plugDash /^-\{1}\ / + syn match plugPlus /^+/ + syn match plugStar /^*/ + syn match plugMessage /\(^- \)\@<=.*/ + syn match plugName /\(^- \)\@<=[^ ]*:/ + syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ + syn match plugTag /(tag: [^)]\+)/ + syn match plugInstall /\(^+ \)\@<=[^:]*/ + syn match plugUpdate /\(^* \)\@<=[^:]*/ + syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag + syn match plugEdge /^ \X\+$/ + syn match plugEdge /^ \X*/ contained nextgroup=plugSha + syn match plugSha /[0-9a-f]\{7,9}/ contained + syn match plugRelDate /([^)]*)$/ contained + syn match plugNotLoaded /(not loaded)$/ + syn match plugError /^x.*/ + syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ + syn match plugH2 /^.*:\n-\+$/ + syn match plugH2 /^-\{2,}/ + syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean + hi def link plug1 Title + hi def link plug2 Repeat + hi def link plugH2 Type + hi def link plugX Exception + hi def link plugBracket Structure + hi def link plugNumber Number + + hi def link plugDash Special + hi def link plugPlus Constant + hi def link plugStar Boolean + + hi def link plugMessage Function + hi def link plugName Label + hi def link plugInstall Function + hi def link plugUpdate Type + + hi def link plugError Error + hi def link plugDeleted Ignore + hi def link plugRelDate Comment + hi def link plugEdge PreProc + hi def link plugSha Identifier + hi def link plugTag Constant + + hi def link plugNotLoaded Comment +endfunction + +function! s:lpad(str, len) + return a:str . repeat(' ', a:len - len(a:str)) +endfunction + +function! s:lines(msg) + return split(a:msg, "[\r\n]") +endfunction + +function! s:lastline(msg) + return get(s:lines(a:msg), -1, '') +endfunction + +function! s:new_window() + execute get(g:, 'plug_window', 'vertical topleft new') +endfunction + +function! s:plug_window_exists() + let buflist = tabpagebuflist(s:plug_tab) + return !empty(buflist) && index(buflist, s:plug_buf) >= 0 +endfunction + +function! s:switch_in() + if !s:plug_window_exists() + return 0 + endif + + if winbufnr(0) != s:plug_buf + let s:pos = [tabpagenr(), winnr(), winsaveview()] + execute 'normal!' s:plug_tab.'gt' + let winnr = bufwinnr(s:plug_buf) + execute winnr.'wincmd w' + call add(s:pos, winsaveview()) + else + let s:pos = [winsaveview()] + endif + + setlocal modifiable + return 1 +endfunction + +function! s:switch_out(...) + call winrestview(s:pos[-1]) + setlocal nomodifiable + if a:0 > 0 + execute a:1 + endif + + if len(s:pos) > 1 + execute 'normal!' s:pos[0].'gt' + execute s:pos[1] 'wincmd w' + call winrestview(s:pos[2]) + endif +endfunction + +function! s:finish_bindings() + nnoremap R :call retry() + nnoremap D :PlugDiff + nnoremap S :PlugStatus + nnoremap U :call status_update() + xnoremap U :call status_update() + nnoremap ]] :silent! call section('') + nnoremap [[ :silent! call section('b') +endfunction + +function! s:prepare(...) + if empty(s:plug_getcwd()) + throw 'Invalid current working directory. Cannot proceed.' + endif + + for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] + if exists(evar) + throw evar.' detected. Cannot proceed.' + endif + endfor + + call s:job_abort() + if s:switch_in() + if b:plug_preview == 1 + pc + endif + enew + else + call s:new_window() + endif + + nnoremap q :call close_pane() + if a:0 == 0 + call s:finish_bindings() + endif + let b:plug_preview = -1 + let s:plug_tab = tabpagenr() + let s:plug_buf = winbufnr(0) + call s:assign_name() + + for k in ['', 'L', 'o', 'X', 'd', 'dd'] + execute 'silent! unmap ' k + endfor + setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell + if exists('+colorcolumn') + setlocal colorcolumn= + endif + setf vim-plug + if exists('g:syntax_on') + call s:syntax() + endif +endfunction + +function! s:close_pane() + if b:plug_preview == 1 + pc + let b:plug_preview = -1 + else + bd + endif +endfunction + +function! s:assign_name() + " Assign buffer name + let prefix = '[Plugins]' + let name = prefix + let idx = 2 + while bufexists(name) + let name = printf('%s (%s)', prefix, idx) + let idx = idx + 1 + endwhile + silent! execute 'f' fnameescape(name) +endfunction + +function! s:chsh(swap) + let prev = [&shell, &shellcmdflag, &shellredir] + if !s:is_win + set shell=sh + endif + if a:swap + if s:is_powershell(&shell) + let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' + elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' + set shellredir=>%s\ 2>&1 + endif + endif + return prev +endfunction + +function! s:bang(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(a:0) + " FIXME: Escaping is incomplete. We could use shellescape with eval, + " but it won't work on Windows. + let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') + execute "normal! :execute g:_plug_bang\\" + finally + unlet g:_plug_bang + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + return v:shell_error ? 'Exit status: ' . v:shell_error : '' +endfunction + +function! s:regress_bar() + let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') + call s:progress_bar(2, bar, len(bar)) +endfunction + +function! s:is_updated(dir) + return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir)) +endfunction + +function! s:do(pull, force, todo) + for [name, spec] in items(a:todo) + if !isdirectory(spec.dir) + continue + endif + let installed = has_key(s:update.new, name) + let updated = installed ? 0 : + \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) + if a:force || installed || updated + execute 'cd' s:esc(spec.dir) + call append(3, '- Post-update hook for '. name .' ... ') + let error = '' + let type = type(spec.do) + if type == s:TYPE.string + if spec.do[0] == ':' + if !get(s:loaded, name, 0) + let s:loaded[name] = 1 + call s:reorg_rtp() + endif + call s:load_plugin(spec) + try + execute spec.do[1:] + catch + let error = v:exception + endtry + if !s:plug_window_exists() + cd - + throw 'Warning: vim-plug was terminated by the post-update hook of '.name + endif + else + let error = s:bang(spec.do) + endif + elseif type == s:TYPE.funcref + try + call s:load_plugin(spec) + let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') + call spec.do({ 'name': name, 'status': status, 'force': a:force }) + catch + let error = v:exception + endtry + else + let error = 'Invalid hook type' + endif + call s:switch_in() + call setline(4, empty(error) ? (getline(4) . 'OK') + \ : ('x' . getline(4)[1:] . error)) + if !empty(error) + call add(s:update.errors, name) + call s:regress_bar() + endif + cd - + endif + endfor +endfunction + +function! s:hash_match(a, b) + return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 +endfunction + +function! s:checkout(spec) + let sha = a:spec.commit + let output = s:git_revision(a:spec.dir) + if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) + let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' + let output = s:system( + \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) + endif + return output +endfunction + +function! s:finish(pull) + let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) + if new_frozen + let s = new_frozen > 1 ? 's' : '' + call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) + endif + call append(3, '- Finishing ... ') | 4 + redraw + call plug#helptags() + call plug#end() + call setline(4, getline(4) . 'Done!') + redraw + let msgs = [] + if !empty(s:update.errors) + call add(msgs, "Press 'R' to retry.") + endif + if a:pull && len(s:update.new) < len(filter(getline(5, '$'), + \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) + call add(msgs, "Press 'D' to see the updated changes.") + endif + echo join(msgs, ' ') + call s:finish_bindings() +endfunction + +function! s:retry() + if empty(s:update.errors) + return + endif + echo + call s:update_impl(s:update.pull, s:update.force, + \ extend(copy(s:update.errors), [s:update.threads])) +endfunction + +function! s:is_managed(name) + return has_key(g:plugs[a:name], 'uri') +endfunction + +function! s:names(...) + return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) +endfunction + +function! s:check_ruby() + silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") + if !exists('g:plug_ruby') + redraw! + return s:warn('echom', 'Warning: Ruby interface is broken') + endif + let ruby_version = split(g:plug_ruby, '\.') + unlet g:plug_ruby + return s:version_requirement(ruby_version, [1, 8, 7]) +endfunction + +function! s:update_impl(pull, force, args) abort + let sync = index(a:args, '--sync') >= 0 || has('vim_starting') + let args = filter(copy(a:args), 'v:val != "--sync"') + let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? + \ remove(args, -1) : get(g:, 'plug_threads', 16) + + let managed = filter(copy(g:plugs), 's:is_managed(v:key)') + let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : + \ filter(managed, 'index(args, v:key) >= 0') + + if empty(todo) + return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) + endif + + if !s:is_win && s:git_version_requirement(2, 3) + let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' + let $GIT_TERMINAL_PROMPT = 0 + for plug in values(todo) + let plug.uri = substitute(plug.uri, + \ '^https://git::@github\.com', 'https://github.com', '') + endfor + endif + + if !isdirectory(g:plug_home) + try + call mkdir(g:plug_home, 'p') + catch + return s:err(printf('Invalid plug directory: %s. '. + \ 'Try to call plug#begin with a valid directory', g:plug_home)) + endtry + endif + + if has('nvim') && !exists('*jobwait') && threads > 1 + call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') + endif + + let use_job = s:nvim || s:vim8 + let python = (has('python') || has('python3')) && !use_job + let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() + + let s:update = { + \ 'start': reltime(), + \ 'all': todo, + \ 'todo': copy(todo), + \ 'errors': [], + \ 'pull': a:pull, + \ 'force': a:force, + \ 'new': {}, + \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, + \ 'bar': '', + \ 'fin': 0 + \ } + + call s:prepare(1) + call append(0, ['', '']) + normal! 2G + silent! redraw + + " Set remote name, overriding a possible user git config's clone.defaultRemoteName + let s:clone_opt = ['--origin', 'origin'] + if get(g:, 'plug_shallow', 1) + call extend(s:clone_opt, ['--depth', '1']) + if s:git_version_requirement(1, 7, 10) + call add(s:clone_opt, '--no-single-branch') + endif + endif + + if has('win32unix') || has('wsl') + call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input']) + endif + + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + + " Python version requirement (>= 2.7) + if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 + redir => pyv + silent python import platform; print platform.python_version() + redir END + let python = s:version_requirement( + \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) + endif + + if (python || ruby) && s:update.threads > 1 + try + let imd = &imd + if s:mac_gui + set noimd + endif + if ruby + call s:update_ruby() + else + call s:update_python() + endif + catch + let lines = getline(4, '$') + let printed = {} + silent! 4,$d _ + for line in lines + let name = s:extract_name(line, '.', '') + if empty(name) || !has_key(printed, name) + call append('$', line) + if !empty(name) + let printed[name] = 1 + if line[0] == 'x' && index(s:update.errors, name) < 0 + call add(s:update.errors, name) + end + endif + endif + endfor + finally + let &imd = imd + call s:update_finish() + endtry + else + call s:update_vim() + while use_job && sync + sleep 100m + if s:update.fin + break + endif + endwhile + endif +endfunction + +function! s:log4(name, msg) + call setline(4, printf('- %s (%s)', a:msg, a:name)) + redraw +endfunction + +function! s:update_finish() + if exists('s:git_terminal_prompt') + let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt + endif + if s:switch_in() + call append(3, '- Updating ...') | 4 + for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) + let [pos, _] = s:logpos(name) + if !pos + continue + endif + if has_key(spec, 'commit') + call s:log4(name, 'Checking out '.spec.commit) + let out = s:checkout(spec) + elseif has_key(spec, 'tag') + let tag = spec.tag + if tag =~ '\*' + let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) + if !v:shell_error && !empty(tags) + let tag = tags[0] + call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) + call append(3, '') + endif + endif + call s:log4(name, 'Checking out '.tag) + let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) + else + let branch = s:git_origin_branch(spec) + call s:log4(name, 'Merging origin/'.s:esc(branch)) + let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' + \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) + endif + if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && + \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) + call s:log4(name, 'Updating submodules. This may take a while.') + let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) + endif + let msg = s:format_message(v:shell_error ? 'x': '-', name, out) + if v:shell_error + call add(s:update.errors, name) + call s:regress_bar() + silent execute pos 'd _' + call append(4, msg) | 4 + elseif !empty(out) + call setline(pos, msg[0]) + endif + redraw + endfor + silent 4 d _ + try + call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) + catch + call s:warn('echom', v:exception) + call s:warn('echo', '') + return + endtry + call s:finish(s:update.pull) + call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') + call s:switch_out('normal! gg') + endif +endfunction + +function! s:job_abort() + if (!s:nvim && !s:vim8) || !exists('s:jobs') + return + endif + + for [name, j] in items(s:jobs) + if s:nvim + silent! call jobstop(j.jobid) + elseif s:vim8 + silent! call job_stop(j.jobid) + endif + if j.new + call s:rm_rf(g:plugs[name].dir) + endif + endfor + let s:jobs = {} +endfunction + +function! s:last_non_empty_line(lines) + let len = len(a:lines) + for idx in range(len) + let line = a:lines[len-idx-1] + if !empty(line) + return line + endif + endfor + return '' +endfunction + +function! s:job_out_cb(self, data) abort + let self = a:self + let data = remove(self.lines, -1) . a:data + let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') + call extend(self.lines, lines) + " To reduce the number of buffer updates + let self.tick = get(self, 'tick', -1) + 1 + if !self.running || self.tick % len(s:jobs) == 0 + let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') + let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) + call s:log(bullet, self.name, result) + endif +endfunction + +function! s:job_exit_cb(self, data) abort + let a:self.running = 0 + let a:self.error = a:data != 0 + call s:reap(a:self.name) + call s:tick() +endfunction + +function! s:job_cb(fn, job, ch, data) + if !s:plug_window_exists() " plug window closed + return s:job_abort() + endif + call call(a:fn, [a:job, a:data]) +endfunction + +function! s:nvim_cb(job_id, data, event) dict abort + return (a:event == 'stdout' || a:event == 'stderr') ? + \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : + \ s:job_cb('s:job_exit_cb', self, 0, a:data) +endfunction + +function! s:spawn(name, cmd, opts) + let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], + \ 'new': get(a:opts, 'new', 0) } + let s:jobs[a:name] = job + + if s:nvim + if has_key(a:opts, 'dir') + let job.cwd = a:opts.dir + endif + let argv = a:cmd + call extend(job, { + \ 'on_stdout': function('s:nvim_cb'), + \ 'on_stderr': function('s:nvim_cb'), + \ 'on_exit': function('s:nvim_cb'), + \ }) + let jid = s:plug_call('jobstart', argv, job) + if jid > 0 + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = [jid < 0 ? argv[0].' is not executable' : + \ 'Invalid arguments (or job table is full)'] + endif + elseif s:vim8 + let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) + if has_key(a:opts, 'dir') + let cmd = s:with_cd(cmd, a:opts.dir, 0) + endif + let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] + let jid = job_start(s:is_win ? join(argv, ' ') : argv, { + \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), + \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), + \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), + \ 'err_mode': 'raw', + \ 'out_mode': 'raw' + \}) + if job_status(jid) == 'run' + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = ['Failed to start job'] + endif + else + let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd])) + let job.error = v:shell_error != 0 + let job.running = 0 + endif +endfunction + +function! s:reap(name) + let job = s:jobs[a:name] + if job.error + call add(s:update.errors, a:name) + elseif get(job, 'new', 0) + let s:update.new[a:name] = 1 + endif + let s:update.bar .= job.error ? 'x' : '=' + + let bullet = job.error ? 'x' : '-' + let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) + call s:log(bullet, a:name, empty(result) ? 'OK' : result) + call s:bar() + + call remove(s:jobs, a:name) +endfunction + +function! s:bar() + if s:switch_in() + let total = len(s:update.all) + call setline(1, (s:update.pull ? 'Updating' : 'Installing'). + \ ' plugins ('.len(s:update.bar).'/'.total.')') + call s:progress_bar(2, s:update.bar, total) + call s:switch_out() + endif +endfunction + +function! s:logpos(name) + let max = line('$') + for i in range(4, max > 4 ? max : 4) + if getline(i) =~# '^[-+x*] '.a:name.':' + for j in range(i + 1, max > 5 ? max : 5) + if getline(j) !~ '^ ' + return [i, j - 1] + endif + endfor + return [i, i] + endif + endfor + return [0, 0] +endfunction + +function! s:log(bullet, name, lines) + if s:switch_in() + let [b, e] = s:logpos(a:name) + if b > 0 + silent execute printf('%d,%d d _', b, e) + if b > winheight('.') + let b = 4 + endif + else + let b = 4 + endif + " FIXME For some reason, nomodifiable is set after :d in vim8 + setlocal modifiable + call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) + call s:switch_out() + endif +endfunction + +function! s:update_vim() + let s:jobs = {} + + call s:bar() + call s:tick() +endfunction + +function! s:tick() + let pull = s:update.pull + let prog = s:progress_opt(s:nvim || s:vim8) +while 1 " Without TCO, Vim stack is bound to explode + if empty(s:update.todo) + if empty(s:jobs) && !s:update.fin + call s:update_finish() + let s:update.fin = 1 + endif + return + endif + + let name = keys(s:update.todo)[0] + let spec = remove(s:update.todo, name) + let new = empty(globpath(spec.dir, '.git', 1)) + + call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') + redraw + + let has_tag = has_key(spec, 'tag') + if !new + let [error, _] = s:git_validate(spec, 0) + if empty(error) + if pull + let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] + if has_tag && !empty(globpath(spec.dir, '.git/shallow')) + call extend(cmd, ['--depth', '99999999']) + endif + if !empty(prog) + call add(cmd, prog) + endif + call s:spawn(name, cmd, { 'dir': spec.dir }) + else + let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } + endif + else + let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } + endif + else + let cmd = ['git', 'clone'] + if !has_tag + call extend(cmd, s:clone_opt) + endif + if !empty(prog) + call add(cmd, prog) + endif + call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 }) + endif + + if !s:jobs[name].running + call s:reap(name) + endif + if len(s:jobs) >= s:update.threads + break + endif +endwhile +endfunction + +function! s:update_python() +let py_exe = has('python') ? 'python' : 'python3' +execute py_exe "<< EOF" +import datetime +import functools +import os +try: + import queue +except ImportError: + import Queue as queue +import random +import re +import shutil +import signal +import subprocess +import tempfile +import threading as thr +import time +import traceback +import vim + +G_NVIM = vim.eval("has('nvim')") == '1' +G_PULL = vim.eval('s:update.pull') == '1' +G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 +G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) +G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt')) +G_PROGRESS = vim.eval('s:progress_opt(1)') +G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) +G_STOP = thr.Event() +G_IS_WIN = vim.eval('s:is_win') == '1' + +class PlugError(Exception): + def __init__(self, msg): + self.msg = msg +class CmdTimedOut(PlugError): + pass +class CmdFailed(PlugError): + pass +class InvalidURI(PlugError): + pass +class Action(object): + INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] + +class Buffer(object): + def __init__(self, lock, num_plugs, is_pull): + self.bar = '' + self.event = 'Updating' if is_pull else 'Installing' + self.lock = lock + self.maxy = int(vim.eval('winheight(".")')) + self.num_plugs = num_plugs + + def __where(self, name): + """ Find first line with name in current buffer. Return line num. """ + found, lnum = False, 0 + matcher = re.compile('^[-+x*] {0}:'.format(name)) + for line in vim.current.buffer: + if matcher.search(line) is not None: + found = True + break + lnum += 1 + + if not found: + lnum = -1 + return lnum + + def header(self): + curbuf = vim.current.buffer + curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) + + num_spaces = self.num_plugs - len(self.bar) + curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') + + with self.lock: + vim.command('normal! 2G') + vim.command('redraw') + + def write(self, action, name, lines): + first, rest = lines[0], lines[1:] + msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] + msg.extend([' ' + line for line in rest]) + + try: + if action == Action.ERROR: + self.bar += 'x' + vim.command("call add(s:update.errors, '{0}')".format(name)) + elif action == Action.DONE: + self.bar += '=' + + curbuf = vim.current.buffer + lnum = self.__where(name) + if lnum != -1: # Found matching line num + del curbuf[lnum] + if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): + lnum = 3 + else: + lnum = 3 + curbuf.append(msg, lnum) + + self.header() + except vim.error: + pass + +class Command(object): + CD = 'cd /d' if G_IS_WIN else 'cd' + + def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): + self.cmd = cmd + if cmd_dir: + self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) + self.timeout = timeout + self.callback = cb if cb else (lambda msg: None) + self.clean = clean if clean else (lambda: None) + self.proc = None + + @property + def alive(self): + """ Returns true only if command still running. """ + return self.proc and self.proc.poll() is None + + def execute(self, ntries=3): + """ Execute the command with ntries if CmdTimedOut. + Returns the output of the command if no Exception. + """ + attempt, finished, limit = 0, False, self.timeout + + while not finished: + try: + attempt += 1 + result = self.try_command() + finished = True + return result + except CmdTimedOut: + if attempt != ntries: + self.notify_retry() + self.timeout += limit + else: + raise + + def notify_retry(self): + """ Retry required for command, notify user. """ + for count in range(3, 0, -1): + if G_STOP.is_set(): + raise KeyboardInterrupt + msg = 'Timeout. Will retry in {0} second{1} ...'.format( + count, 's' if count != 1 else '') + self.callback([msg]) + time.sleep(1) + self.callback(['Retrying ...']) + + def try_command(self): + """ Execute a cmd & poll for callback. Returns list of output. + Raises CmdFailed -> return code for Popen isn't 0 + Raises CmdTimedOut -> command exceeded timeout without new output + """ + first_line = True + + try: + tfile = tempfile.NamedTemporaryFile(mode='w+b') + preexec_fn = not G_IS_WIN and os.setsid or None + self.proc = subprocess.Popen(self.cmd, stdout=tfile, + stderr=subprocess.STDOUT, + stdin=subprocess.PIPE, shell=True, + preexec_fn=preexec_fn) + thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) + thrd.start() + + thread_not_started = True + while thread_not_started: + try: + thrd.join(0.1) + thread_not_started = False + except RuntimeError: + pass + + while self.alive: + if G_STOP.is_set(): + raise KeyboardInterrupt + + if first_line or random.random() < G_LOG_PROB: + first_line = False + line = '' if G_IS_WIN else nonblock_read(tfile.name) + if line: + self.callback([line]) + + time_diff = time.time() - os.path.getmtime(tfile.name) + if time_diff > self.timeout: + raise CmdTimedOut(['Timeout!']) + + thrd.join(0.5) + + tfile.seek(0) + result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] + + if self.proc.returncode != 0: + raise CmdFailed([''] + result) + + return result + except: + self.terminate() + raise + + def terminate(self): + """ Terminate process and cleanup. """ + if self.alive: + if G_IS_WIN: + os.kill(self.proc.pid, signal.SIGINT) + else: + os.killpg(self.proc.pid, signal.SIGTERM) + self.clean() + +class Plugin(object): + def __init__(self, name, args, buf_q, lock): + self.name = name + self.args = args + self.buf_q = buf_q + self.lock = lock + self.tag = args.get('tag', 0) + + def manage(self): + try: + if os.path.exists(self.args['dir']): + self.update() + else: + self.install() + with self.lock: + thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) + except PlugError as exc: + self.write(Action.ERROR, self.name, exc.msg) + except KeyboardInterrupt: + G_STOP.set() + self.write(Action.ERROR, self.name, ['Interrupted!']) + except: + # Any exception except those above print stack trace + msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) + self.write(Action.ERROR, self.name, msg.split('\n')) + raise + + def install(self): + target = self.args['dir'] + if target[-1] == '\\': + target = target[0:-1] + + def clean(target): + def _clean(): + try: + shutil.rmtree(target) + except OSError: + pass + return _clean + + self.write(Action.INSTALL, self.name, ['Installing ...']) + callback = functools.partial(self.write, Action.INSTALL, self.name) + cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( + '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], + esc(target)) + com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + + def repo_uri(self): + cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' + command = Command(cmd, self.args['dir'], G_TIMEOUT,) + result = command.execute(G_RETRIES) + return result[-1] + + def update(self): + actual_uri = self.repo_uri() + expect_uri = self.args['uri'] + regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') + ma = regex.match(actual_uri) + mb = regex.match(expect_uri) + if ma is None or mb is None or ma.groups() != mb.groups(): + msg = ['', + 'Invalid URI: {0}'.format(actual_uri), + 'Expected {0}'.format(expect_uri), + 'PlugClean required.'] + raise InvalidURI(msg) + + if G_PULL: + self.write(Action.UPDATE, self.name, ['Updating ...']) + callback = functools.partial(self.write, Action.UPDATE, self.name) + fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' + cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) + com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + else: + self.write(Action.DONE, self.name, ['Already installed']) + + def write(self, action, name, msg): + self.buf_q.put((action, name, msg)) + +class PlugThread(thr.Thread): + def __init__(self, tname, args): + super(PlugThread, self).__init__() + self.tname = tname + self.args = args + + def run(self): + thr.current_thread().name = self.tname + buf_q, work_q, lock = self.args + + try: + while not G_STOP.is_set(): + name, args = work_q.get_nowait() + plug = Plugin(name, args, buf_q, lock) + plug.manage() + work_q.task_done() + except queue.Empty: + pass + +class RefreshThread(thr.Thread): + def __init__(self, lock): + super(RefreshThread, self).__init__() + self.lock = lock + self.running = True + + def run(self): + while self.running: + with self.lock: + thread_vim_command('noautocmd normal! a') + time.sleep(0.33) + + def stop(self): + self.running = False + +if G_NVIM: + def thread_vim_command(cmd): + vim.session.threadsafe_call(lambda: vim.command(cmd)) +else: + def thread_vim_command(cmd): + vim.command(cmd) + +def esc(name): + return '"' + name.replace('"', '\"') + '"' + +def nonblock_read(fname): + """ Read a file with nonblock flag. Return the last line. """ + fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) + buf = os.read(fread, 100000).decode('utf-8', 'replace') + os.close(fread) + + line = buf.rstrip('\r\n') + left = max(line.rfind('\r'), line.rfind('\n')) + if left != -1: + left += 1 + line = line[left:] + + return line + +def main(): + thr.current_thread().name = 'main' + nthreads = int(vim.eval('s:update.threads')) + plugs = vim.eval('s:update.todo') + mac_gui = vim.eval('s:mac_gui') == '1' + + lock = thr.Lock() + buf = Buffer(lock, len(plugs), G_PULL) + buf_q, work_q = queue.Queue(), queue.Queue() + for work in plugs.items(): + work_q.put(work) + + start_cnt = thr.active_count() + for num in range(nthreads): + tname = 'PlugT-{0:02}'.format(num) + thread = PlugThread(tname, (buf_q, work_q, lock)) + thread.start() + if mac_gui: + rthread = RefreshThread(lock) + rthread.start() + + while not buf_q.empty() or thr.active_count() != start_cnt: + try: + action, name, msg = buf_q.get(True, 0.25) + buf.write(action, name, ['OK'] if not msg else msg) + buf_q.task_done() + except queue.Empty: + pass + except KeyboardInterrupt: + G_STOP.set() + + if mac_gui: + rthread.stop() + rthread.join() + +main() +EOF +endfunction + +function! s:update_ruby() + ruby << EOF + module PlugStream + SEP = ["\r", "\n", nil] + def get_line + buffer = '' + loop do + char = readchar rescue return + if SEP.include? char.chr + buffer << $/ + break + else + buffer << char + end + end + buffer + end + end unless defined?(PlugStream) + + def esc arg + %["#{arg.gsub('"', '\"')}"] + end + + def killall pid + pids = [pid] + if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM + pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } + else + unless `which pgrep 2> /dev/null`.empty? + children = pids + until children.empty? + children = children.map { |pid| + `pgrep -P #{pid}`.lines.map { |l| l.chomp } + }.flatten + pids += children + end + end + pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } + end + end + + def compare_git_uri a, b + regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} + regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) + end + + require 'thread' + require 'fileutils' + require 'timeout' + running = true + iswin = VIM::evaluate('s:is_win').to_i == 1 + pull = VIM::evaluate('s:update.pull').to_i == 1 + base = VIM::evaluate('g:plug_home') + all = VIM::evaluate('s:update.todo') + limit = VIM::evaluate('get(g:, "plug_timeout", 60)') + tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 + nthr = VIM::evaluate('s:update.threads').to_i + maxy = VIM::evaluate('winheight(".")').to_i + vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ + cd = iswin ? 'cd /d' : 'cd' + tot = VIM::evaluate('len(s:update.todo)') || 0 + bar = '' + skip = 'Already installed' + mtx = Mutex.new + take1 = proc { mtx.synchronize { running && all.shift } } + logh = proc { + cnt = bar.length + $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" + $curbuf[2] = '[' + bar.ljust(tot) + ']' + VIM::command('normal! 2G') + VIM::command('redraw') + } + where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } + log = proc { |name, result, type| + mtx.synchronize do + ing = ![true, false].include?(type) + bar += type ? '=' : 'x' unless ing + b = case type + when :install then '+' when :update then '*' + when true, nil then '-' else + VIM::command("call add(s:update.errors, '#{name}')") + 'x' + end + result = + if type || type.nil? + ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] + elsif result =~ /^Interrupted|^Timeout/ + ["#{b} #{name}: #{result}"] + else + ["#{b} #{name}"] + result.lines.map { |l| " " << l } + end + if lnum = where.call(name) + $curbuf.delete lnum + lnum = 4 if ing && lnum > maxy + end + result.each_with_index do |line, offset| + $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) + end + logh.call + end + } + bt = proc { |cmd, name, type, cleanup| + tried = timeout = 0 + begin + tried += 1 + timeout += limit + fd = nil + data = '' + if iswin + Timeout::timeout(timeout) do + tmp = VIM::evaluate('tempname()') + system("(#{cmd}) > #{tmp}") + data = File.read(tmp).chomp + File.unlink tmp rescue nil + end + else + fd = IO.popen(cmd).extend(PlugStream) + first_line = true + log_prob = 1.0 / nthr + while line = Timeout::timeout(timeout) { fd.get_line } + data << line + log.call name, line.chomp, type if name && (first_line || rand < log_prob) + first_line = false + end + fd.close + end + [$? == 0, data.chomp] + rescue Timeout::Error, Interrupt => e + if fd && !fd.closed? + killall fd.pid + fd.close + end + cleanup.call if cleanup + if e.is_a?(Timeout::Error) && tried < tries + 3.downto(1) do |countdown| + s = countdown > 1 ? 's' : '' + log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type + sleep 1 + end + log.call name, 'Retrying ...', type + retry + end + [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] + end + } + main = Thread.current + threads = [] + watcher = Thread.new { + if vim7 + while VIM::evaluate('getchar(1)') + sleep 0.1 + end + else + require 'io/console' # >= Ruby 1.9 + nil until IO.console.getch == 3.chr + end + mtx.synchronize do + running = false + threads.each { |t| t.raise Interrupt } unless vim7 + end + threads.each { |t| t.join rescue nil } + main.kill + } + refresh = Thread.new { + while true + mtx.synchronize do + break unless running + VIM::command('noautocmd normal! a') + end + sleep 0.2 + end + } if VIM::evaluate('s:mac_gui') == 1 + + clone_opt = VIM::evaluate('s:clone_opt').join(' ') + progress = VIM::evaluate('s:progress_opt(1)') + nthr.times do + mtx.synchronize do + threads << Thread.new { + while pair = take1.call + name = pair.first + dir, uri, tag = pair.last.values_at *%w[dir uri tag] + exists = File.directory? dir + ok, result = + if exists + chdir = "#{cd} #{iswin ? dir : esc(dir)}" + ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil + current_uri = data.lines.to_a.last + if !ret + if data =~ /^Interrupted|^Timeout/ + [false, data] + else + [false, [data.chomp, "PlugClean required."].join($/)] + end + elsif !compare_git_uri(current_uri, uri) + [false, ["Invalid URI: #{current_uri}", + "Expected: #{uri}", + "PlugClean required."].join($/)] + else + if pull + log.call name, 'Updating ...', :update + fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' + bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil + else + [true, skip] + end + end + else + d = esc dir.sub(%r{[\\/]+$}, '') + log.call name, 'Installing ...', :install + bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { + FileUtils.rm_rf dir + } + end + mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok + log.call name, result, ok + end + } if running + end + end + threads.each { |t| t.join rescue nil } + logh.call + refresh.kill if refresh + watcher.kill +EOF +endfunction + +function! s:shellesc_cmd(arg, script) + let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') + return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') +endfunction + +function! s:shellesc_ps1(arg) + return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" +endfunction + +function! s:shellesc_sh(arg) + return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" +endfunction + +" Escape the shell argument based on the shell. +" Vim and Neovim's shellescape() are insufficient. +" 1. shellslash determines whether to use single/double quotes. +" Double-quote escaping is fragile for cmd.exe. +" 2. It does not work for powershell. +" 3. It does not work for *sh shells if the command is executed +" via cmd.exe (ie. cmd.exe /c sh -c command command_args) +" 4. It does not support batchfile syntax. +" +" Accepts an optional dictionary with the following keys: +" - shell: same as Vim/Neovim 'shell' option. +" If unset, fallback to 'cmd.exe' on Windows or 'sh'. +" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. +function! plug#shellescape(arg, ...) + if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' + return a:arg + endif + let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} + let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') + let script = get(opts, 'script', 1) + if shell =~# 'cmd\(\.exe\)\?$' + return s:shellesc_cmd(a:arg, script) + elseif s:is_powershell(shell) + return s:shellesc_ps1(a:arg) + endif + return s:shellesc_sh(a:arg) +endfunction + +function! s:glob_dir(path) + return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') +endfunction + +function! s:progress_bar(line, bar, total) + call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') +endfunction + +function! s:compare_git_uri(a, b) + " See `git help clone' + " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] + " [git@] github.com[:port] : junegunn/vim-plug [.git] + " file:// / junegunn/vim-plug [/] + " / junegunn/vim-plug [/] + let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' + let ma = matchlist(a:a, pat) + let mb = matchlist(a:b, pat) + return ma[1:2] ==# mb[1:2] +endfunction + +function! s:format_message(bullet, name, message) + if a:bullet != 'x' + return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] + else + let lines = map(s:lines(a:message), '" ".v:val') + return extend([printf('x %s:', a:name)], lines) + endif +endfunction + +function! s:with_cd(cmd, dir, ...) + let script = a:0 > 0 ? a:1 : 1 + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) +endfunction + +function! s:system(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + if type(a:cmd) == s:TYPE.list + " Neovim's system() supports list argument to bypass the shell + " but it cannot set the working directory for the command. + " Assume that the command does not rely on the shell. + if has('nvim') && a:0 == 0 + return system(a:cmd) + endif + let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) + if s:is_powershell(&shell) + let cmd = '& ' . cmd + endif + else + let cmd = a:cmd + endif + if a:0 > 0 + let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) + endif + if s:is_win && type(a:cmd) != s:TYPE.list + let [batchfile, cmd] = s:batchfile(cmd) + endif + return system(cmd) + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry +endfunction + +function! s:system_chomp(...) + let ret = call('s:system', a:000) + return v:shell_error ? '' : substitute(ret, '\n$', '', '') +endfunction + +function! s:git_validate(spec, check_branch) + let err = '' + if isdirectory(a:spec.dir) + let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] + let remote = result[-1] + if empty(remote) + let err = join([remote, 'PlugClean required.'], "\n") + elseif !s:compare_git_uri(remote, a:spec.uri) + let err = join(['Invalid URI: '.remote, + \ 'Expected: '.a:spec.uri, + \ 'PlugClean required.'], "\n") + elseif a:check_branch && has_key(a:spec, 'commit') + let sha = s:git_revision(a:spec.dir) + if empty(sha) + let err = join(add(result, 'PlugClean required.'), "\n") + elseif !s:hash_match(sha, a:spec.commit) + let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', + \ a:spec.commit[:6], sha[:6]), + \ 'PlugUpdate required.'], "\n") + endif + elseif a:check_branch + let current_branch = result[0] + " Check tag + let origin_branch = s:git_origin_branch(a:spec) + if has_key(a:spec, 'tag') + let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) + if a:spec.tag !=# tag && a:spec.tag !~ '\*' + let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', + \ (empty(tag) ? 'N/A' : tag), a:spec.tag) + endif + " Check branch + elseif origin_branch !=# current_branch + let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', + \ current_branch, origin_branch) + endif + if empty(err) + let [ahead, behind] = split(s:lastline(s:system([ + \ 'git', 'rev-list', '--count', '--left-right', + \ printf('HEAD...origin/%s', origin_branch) + \ ], a:spec.dir)), '\t') + if !v:shell_error && ahead + if behind + " Only mention PlugClean if diverged, otherwise it's likely to be + " pushable (and probably not that messed up). + let err = printf( + \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" + \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) + else + let err = printf("Ahead of origin/%s by %d commit(s).\n" + \ .'Cannot update until local changes are pushed.', + \ origin_branch, ahead) + endif + endif + endif + endif + else + let err = 'Not found' + endif + return [err, err =~# 'PlugClean'] +endfunction + +function! s:rm_rf(dir) + if isdirectory(a:dir) + return s:system(s:is_win + \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) + \ : ['rm', '-rf', a:dir]) + endif +endfunction + +function! s:clean(force) + call s:prepare() + call append(0, 'Searching for invalid plugins in '.g:plug_home) + call append(1, '') + + " List of valid directories + let dirs = [] + let errs = {} + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + if !s:is_managed(name) + call add(dirs, spec.dir) + else + let [err, clean] = s:git_validate(spec, 1) + if clean + let errs[spec.dir] = s:lines(err)[0] + else + call add(dirs, spec.dir) + endif + endif + let cnt += 1 + call s:progress_bar(2, repeat('=', cnt), total) + normal! 2G + redraw + endfor + + let allowed = {} + for dir in dirs + let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 + let allowed[dir] = 1 + for child in s:glob_dir(dir) + let allowed[child] = 1 + endfor + endfor + + let todo = [] + let found = sort(s:glob_dir(g:plug_home)) + while !empty(found) + let f = remove(found, 0) + if !has_key(allowed, f) && isdirectory(f) + call add(todo, f) + call append(line('$'), '- ' . f) + if has_key(errs, f) + call append(line('$'), ' ' . errs[f]) + endif + let found = filter(found, 'stridx(v:val, f) != 0') + end + endwhile + + 4 + redraw + if empty(todo) + call append(line('$'), 'Already clean.') + else + let s:clean_count = 0 + call append(3, ['Directories to delete:', '']) + redraw! + if a:force || s:ask_no_interrupt('Delete all directories?') + call s:delete([6, line('$')], 1) + else + call setline(4, 'Cancelled.') + nnoremap d :set opfunc=delete_opg@ + nmap dd d_ + xnoremap d :call delete_op(visualmode(), 1) + echo 'Delete the lines (d{motion}) to delete the corresponding directories' + endif + endif + 4 + setlocal nomodifiable +endfunction + +function! s:delete_op(type, ...) + call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) +endfunction + +function! s:delete(range, force) + let [l1, l2] = a:range + let force = a:force + let err_count = 0 + while l1 <= l2 + let line = getline(l1) + if line =~ '^- ' && isdirectory(line[2:]) + execute l1 + redraw! + let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) + let force = force || answer > 1 + if answer + let err = s:rm_rf(line[2:]) + setlocal modifiable + if empty(err) + call setline(l1, '~'.line[1:]) + let s:clean_count += 1 + else + delete _ + call append(l1 - 1, s:format_message('x', line[1:], err)) + let l2 += len(s:lines(err)) + let err_count += 1 + endif + let msg = printf('Removed %d directories.', s:clean_count) + if err_count > 0 + let msg .= printf(' Failed to remove %d directories.', err_count) + endif + call setline(4, msg) + setlocal nomodifiable + endif + endif + let l1 += 1 + endwhile +endfunction + +function! s:upgrade() + echo 'Downloading the latest version of vim-plug' + redraw + let tmp = s:plug_tempname() + let new = tmp . '/plug.vim' + + try + let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp]) + if v:shell_error + return s:err('Error upgrading vim-plug: '. out) + endif + + if readfile(s:me) ==# readfile(new) + echo 'vim-plug is already up-to-date' + return 0 + else + call rename(s:me, s:me . '.old') + call rename(new, s:me) + unlet g:loaded_plug + echo 'vim-plug has been upgraded' + return 1 + endif + finally + silent! call s:rm_rf(tmp) + endtry +endfunction + +function! s:upgrade_specs() + for spec in values(g:plugs) + let spec.frozen = get(spec, 'frozen', 0) + endfor +endfunction + +function! s:status() + call s:prepare() + call append(0, 'Checking plugins') + call append(1, '') + + let ecnt = 0 + let unloaded = 0 + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + let is_dir = isdirectory(spec.dir) + if has_key(spec, 'uri') + if is_dir + let [err, _] = s:git_validate(spec, 1) + let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] + else + let [valid, msg] = [0, 'Not found. Try PlugInstall.'] + endif + else + if is_dir + let [valid, msg] = [1, 'OK'] + else + let [valid, msg] = [0, 'Not found.'] + endif + endif + let cnt += 1 + let ecnt += !valid + " `s:loaded` entry can be missing if PlugUpgraded + if is_dir && get(s:loaded, name, -1) == 0 + let unloaded = 1 + let msg .= ' (not loaded)' + endif + call s:progress_bar(2, repeat('=', cnt), total) + call append(3, s:format_message(valid ? '-' : 'x', name, msg)) + normal! 2G + redraw + endfor + call setline(1, 'Finished. '.ecnt.' error(s).') + normal! gg + setlocal nomodifiable + if unloaded + echo "Press 'L' on each line to load plugin, or 'U' to update" + nnoremap L :call status_load(line('.')) + xnoremap L :call status_load(line('.')) + end +endfunction + +function! s:extract_name(str, prefix, suffix) + return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') +endfunction + +function! s:status_load(lnum) + let line = getline(a:lnum) + let name = s:extract_name(line, '-', '(not loaded)') + if !empty(name) + call plug#load(name) + setlocal modifiable + call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) + setlocal nomodifiable + endif +endfunction + +function! s:status_update() range + let lines = getline(a:firstline, a:lastline) + let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') + if !empty(names) + echo + execute 'PlugUpdate' join(names) + endif +endfunction + +function! s:is_preview_window_open() + silent! wincmd P + if &previewwindow + wincmd p + return 1 + endif +endfunction + +function! s:find_name(lnum) + for lnum in reverse(range(1, a:lnum)) + let line = getline(lnum) + if empty(line) + return '' + endif + let name = s:extract_name(line, '-', '') + if !empty(name) + return name + endif + endfor + return '' +endfunction + +function! s:preview_commit() + if b:plug_preview < 0 + let b:plug_preview = !s:is_preview_window_open() + endif + + let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') + if empty(sha) + let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$') + if empty(name) + return + endif + let title = 'HEAD@{1}..' + let command = 'git diff --no-color HEAD@{1}' + else + let title = sha + let command = 'git show --no-color --pretty=medium '.sha + let name = s:find_name(line('.')) + endif + + if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) + return + endif + + if exists('g:plug_pwindow') && !s:is_preview_window_open() + execute g:plug_pwindow + execute 'e' title + else + execute 'pedit' title + wincmd P + endif + setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + execute 'silent %!' cmd + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + setlocal nomodifiable + nnoremap q :q + wincmd p +endfunction + +function! s:section(flags) + call search('\(^[x-] \)\@<=[^:]\+:', a:flags) +endfunction + +function! s:format_git_log(line) + let indent = ' ' + let tokens = split(a:line, nr2char(1)) + if len(tokens) != 5 + return indent.substitute(a:line, '\s*$', '', '') + endif + let [graph, sha, refs, subject, date] = tokens + let tag = matchstr(refs, 'tag: [^,)]\+') + let tag = empty(tag) ? ' ' : ' ('.tag.') ' + return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) +endfunction + +function! s:append_ul(lnum, text) + call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) +endfunction + +function! s:diff() + call s:prepare() + call append(0, ['Collecting changes ...', '']) + let cnts = [0, 0] + let bar = '' + let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') + call s:progress_bar(2, bar, len(total)) + for origin in [1, 0] + let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) + if empty(plugs) + continue + endif + call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') + for [k, v] in plugs + let branch = s:git_origin_branch(v) + if len(branch) + let range = origin ? '..origin/'.branch : 'HEAD@{1}..' + let cmd = ['git', 'log', '--graph', '--color=never'] + if s:git_version_requirement(2, 10, 0) + call add(cmd, '--no-show-signature') + endif + call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) + if has_key(v, 'rtp') + call extend(cmd, ['--', v.rtp]) + endif + let diff = s:system_chomp(cmd, v.dir) + if !empty(diff) + let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' + call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) + let cnts[origin] += 1 + endif + endif + let bar .= '=' + call s:progress_bar(2, bar, len(total)) + normal! 2G + redraw + endfor + if !cnts[origin] + call append(5, ['', 'N/A']) + endif + endfor + call setline(1, printf('%d plugin(s) updated.', cnts[0]) + \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) + + if cnts[0] || cnts[1] + nnoremap (plug-preview) :silent! call preview_commit() + if empty(maparg("\", 'n')) + nmap (plug-preview) + endif + if empty(maparg('o', 'n')) + nmap o (plug-preview) + endif + endif + if cnts[0] + nnoremap X :call revert() + echo "Press 'X' on each block to revert the update" + endif + normal! gg + setlocal nomodifiable +endfunction + +function! s:revert() + if search('^Pending updates', 'bnW') + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || + \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' + return + endif + + call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) + setlocal modifiable + normal! "_dap + setlocal nomodifiable + echo 'Reverted' +endfunction + +function! s:snapshot(force, ...) abort + call s:prepare() + setf vim + call append(0, ['" Generated by vim-plug', + \ '" '.strftime("%c"), + \ '" :source this file in vim to restore the snapshot', + \ '" or execute: vim -S snapshot.vim', + \ '', '', 'PlugUpdate!']) + 1 + let anchor = line('$') - 3 + let names = sort(keys(filter(copy(g:plugs), + \'has_key(v:val, "uri") && isdirectory(v:val.dir)'))) + for name in reverse(names) + let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir) + if !empty(sha) + call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) + redraw + endif + endfor + + if a:0 > 0 + let fn = s:plug_expand(a:1) + if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) + return + endif + call writefile(getline(1, '$'), fn) + echo 'Saved as '.a:1 + silent execute 'e' s:esc(fn) + setf vim + endif +endfunction + +function! s:split_rtp() + return split(&rtp, '\\\@>>---------------------------------------------------------------> +" >>>---------------------------------------------------------------> +" >> +" >>-> >-> +" >> >-> >> >--> >--> >-> >--> >> >--> >-> >-> +" >-> >-> >-> >-> >->>-> >> >-> >-> >-> >-> +" >----->>-> >-> >-> >-> >-> >>--->>-> >-> >--> +" >-> >-> >-> >-> >> >-> >> >-> >-> +" >-> >-> >--> >--> >-> >-> >----> >--> >-> +" >-> +" >>>---------------------------------------------------------------> +" +" URL: https://github.com/Badacadabra/vim-archery +" Author: Baptiste Vannesson +" License: MIT +" Description: Vim colorscheme inspired by Arch Linux colors +" +" >>>---------------------------------------------------------------> +" >>>---------------------------------------------------------------> + +" ============================= +" BOILERPLATE {{{1 +" ============================= + +set background=dark +hi clear + +if exists('syntax_on') + syntax reset +endif + +let g:colors_name = 'archery' + +" ============================= +" SYNTAX GROUP NAMES {{{1 +" ============================= + +" ----------------------------- +" Comment {{{2 +" ----------------------------- + +" Preferred group +hi Comment cterm=italic ctermfg=7 ctermbg=NONE gui=italic guifg=#535B6F guibg=NONE + +" ----------------------------- +" Constant {{{2 +" ----------------------------- + +" Preferred group +hi Constant cterm=NONE ctermfg=14 ctermbg=NONE gui=NONE guifg=#25B8A5 guibg=NONE + +" Minor groups +hi String cterm=NONE ctermfg=15 ctermbg=NONE gui=NONE guifg=#F6F9FC guibg=NONE + +hi link Character Constant +hi link Number Constant +hi link Boolean Constant +hi link Float Constant + +" ----------------------------- +" Identifier {{{2 +" ----------------------------- + +" Preferred group +hi Identifier cterm=NONE ctermfg=6 ctermbg=NONE gui=NONE guifg=#006596 guibg=NONE + +" Minor group +hi link Function Identifier + +" ----------------------------- +" Statement {{{2 +" ----------------------------- + +" Preferred group +hi Statement cterm=bold ctermfg=4 ctermbg=NONE gui=bold guifg=#0088CC guibg=NONE + +" Minor groups +hi link Conditional Statement +hi link Repeat Statement +hi link Label Statement +hi link Operator Statement +hi link Keyword Statement +hi link Exception Statement + +" ----------------------------- +" PreProc {{{2 +" ----------------------------- + +" Preferred group +hi PreProc cterm=NONE ctermfg=15 ctermbg=NONE gui=NONE guifg=#F6F9FC guibg=NONE + +" Minor groups +hi link Include PreProc +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc + +" ----------------------------- +" Type {{{2 +" ----------------------------- + +" Preferred group +hi Type cterm=NONE ctermfg=4 ctermbg=NONE gui=NONE guifg=#0088CC guibg=NONE + +" Minor groups +hi link StorageClass Type +hi link Structure Type +hi link Typedef Type + +" ----------------------------- +" Special {{{2 +" ----------------------------- + +" Preferred group +hi Special cterm=NONE ctermfg=7 ctermbg=NONE gui=NONE guifg=#53586F guibg=NONE + +" Minor groups +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special + +" ----------------------------- +" Underlined {{{2 +" ----------------------------- + +" Preferred group +hi Underlined cterm=underline ctermfg=NONE ctermbg=NONE gui=underline guifg=NONE guibg=NONE + +" ----------------------------- +" Ignore {{{2 +" ----------------------------- + +" Preferred group +hi Ignore cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + +" ----------------------------- +" Error {{{2 +" ----------------------------- + +" Preferred group +hi Error cterm=NONE ctermfg=9 ctermbg=0 gui=NONE guifg=#C95F5F guibg=#25272C + +" ----------------------------- +" Todo {{{2 +" ----------------------------- + +" Preferred group +hi Todo cterm=NONE ctermfg=11 ctermbg=0 gui=NONE guifg=#EAC06E guibg=#25272C + +" ============================= +" DEFAULT HIGHLIGHTING GROUPS {{{1 +" ============================= + +" ----------------------------- +" Modes {{{2 +" ----------------------------- + +" hi Normal cterm=NONE ctermfg=12 ctermbg=0 gui=NONE guifg=#81A3CF guibg=#25272C +hi Normal cterm=NONE ctermfg=12 ctermbg=0 gui=NONE guifg=#81A3CF guibg=#1C1C1C +hi Visual cterm=NONE ctermfg=0 ctermbg=12 gui=NONE guifg=#25272C guibg=#81A3CF +hi VisualNOS cterm=NONE ctermfg=15 ctermbg=4 gui=NONE guifg=#F6F9FC guibg=#0088CC + +" ----------------------------- +" Cursor {{{2 +" ----------------------------- + +hi Cursor cterm=NONE ctermfg=15 ctermbg=4 gui=NONE guifg=#F6F9FC guibg=#0088CC +hi CursorIM cterm=NONE ctermfg=15 ctermbg=4 gui=NONE guifg=#F6F9FC guibg=#81A3CF +hi CursorColumn cterm=NONE ctermfg=NONE ctermbg=12 gui=NONE guifg=NONE guibg=#81A3CF +hi CursorLine cterm=NONE ctermfg=NONE ctermbg=8 gui=NONE guifg=NONE guibg=#282D34 +hi CursorLineNr cterm=NONE ctermfg=4 ctermbg=8 gui=NONE guifg=#0088CC guibg=#282D34 + +" ----------------------------- +" Output text {{{2 +" ----------------------------- + +" Messages +hi ErrorMsg cterm=NONE ctermfg=9 ctermbg=NONE gui=NONE guifg=#C95F5F guibg=NONE +hi ModeMsg cterm=NONE ctermfg=12 ctermbg=NONE gui=NONE guifg=#81A3CF guibg=NONE +hi MoreMsg cterm=NONE ctermfg=4 ctermbg=NONE gui=NONE guifg=#0088CC guibg=NONE +hi WarningMsg cterm=NONE ctermfg=11 ctermbg=NONE gui=NONE guifg=#F07D30 guibg=NONE + +" Misc. +hi Title cterm=NONE ctermfg=4 ctermbg=NONE gui=NONE guifg=#0088CC guibg=NONE +hi Question cterm=NONE ctermfg=4 ctermbg=NONE gui=NONE guifg=#0088CC guibg=NONE +hi SpecialKey cterm=NONE ctermfg=12 ctermbg=NONE gui=NONE guifg=#81A3CF guibg=NONE +hi NonText cterm=NONE ctermfg=15 ctermbg=NONE gui=NONE guifg=#F6F9FC guibg=NONE +hi EndOfBuffer cterm=NONE ctermfg=12 ctermbg=NONE gui=NONE guifg=#81A3CF guibg=NONE + +" ----------------------------- +" Popup menu {{{2 +" ----------------------------- + +hi Pmenu cterm=bold ctermfg=0 ctermbg=7 gui=bold guifg=#25272C guibg=#53586F +hi PmenuSel cterm=bold ctermfg=15 ctermbg=4 gui=bold guifg=#F6F9FC guibg=#0088CC +hi PmenuSbar cterm=NONE ctermfg=NONE ctermbg=12 gui=NONE guifg=NONE guibg=#25272C +hi PmenuThumb cterm=NONE ctermfg=NONE ctermbg=12 gui=NONE guifg=NONE guibg=#81A3CF + +" ----------------------------- +" Search {{{2 +" ----------------------------- + +hi MatchParen cterm=NONE ctermfg=0 ctermbg=15 gui=NONE guifg=#25272C guibg=#F6F9FC +hi IncSearch cterm=NONE ctermfg=0 ctermbg=12 gui=NONE guifg=#25272C guibg=#81A3CF +hi Search cterm=NONE ctermfg=8 ctermbg=15 gui=NONE guifg=#282D34 guibg=#F6F9FC +hi WildMenu cterm=bold ctermfg=15 ctermbg=4 gui=bold guifg=#F6F9FC guibg=#0088CC + +" ----------------------------- +" Folding {{{2 +" ----------------------------- + +hi Folded cterm=NONE ctermfg=4 ctermbg=8 gui=bold guifg=#0088CC guibg=#282D34 +hi FoldColumn cterm=NONE ctermfg=15 ctermbg=4 gui=NONE guifg=#F6F9FC guibg=#282D34 + +" ----------------------------- +" Diff {{{2 +" ----------------------------- + +hi DiffAdd cterm=NONE ctermfg=10 ctermbg=NONE gui=NONE guifg=#73BA25 guibg=NONE +hi DiffChange cterm=NONE ctermfg=3 ctermbg=NONE gui=NONE guifg=#EAC06E guibg=NONE +hi DiffDelete cterm=NONE ctermfg=9 ctermbg=NONE gui=NONE guifg=#C95F5F guibg=NONE +hi DiffText cterm=NONE ctermfg=12 ctermbg=NONE gui=NONE guifg=#81A3CF guibg=NONE + +" ----------------------------- +" Spellchecker {{{2 +" ----------------------------- + +hi SpellBad cterm=NONE ctermfg=9 ctermbg=NONE gui=NONE guifg=#C95F5F guibg=NONE +hi SpellCap cterm=NONE ctermfg=3 ctermbg=NONE gui=NONE guifg=#F07D30 guibg=NONE +hi SpellLocal cterm=NONE ctermfg=10 ctermbg=NONE gui=NONE guifg=#73BA25 guibg=NONE +hi SpellRare cterm=NONE ctermfg=11 ctermbg=NONE gui=NONE guifg=#EAC06E guibg=NONE + +" ----------------------------- +" Miscellaneous {{{2 +" ----------------------------- + +hi Directory cterm=NONE ctermfg=4 ctermbg=NONE gui=bold guifg=#0088CC guibg=NONE +hi LineNr cterm=NONE ctermfg=8 ctermbg=NONE gui=NONE guifg=#53586F guibg=#2B2D34 +hi VertSplit cterm=NONE ctermfg=4 ctermbg=8 gui=bold guifg=#0088CC guibg=#282D34 +hi ColorColumn cterm=NONE ctermfg=NONE ctermbg=8 gui=NONE guifg=NONE guibg=#2B2D34 +hi SignColumn cterm=NONE ctermfg=12 ctermbg=8 gui=NONE guifg=#81A3CF guibg=#282D34 +hi Conceal cterm=NONE ctermfg=12 ctermbg=NONE gui=NONE guifg=#81A3CF guibg=NONE + +" ----------------------------- +" Status line / Tab line {{{2 +" ----------------------------- + +" See Powerline, Airline or Lightline... + +"hi StatusLine cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +"hi StatusLineNC cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guifg=NONE +"hi TabLine cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +"hi TabLineFill cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +"hi TabLineSel cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + +" ============================= +" GUI HIGHLIGHTING GROUPS {{{1 +" ============================= + +hi Menu guifg=#53586F guibg=#282D34 +hi Scrollbar guifg=#53586F guibg=#282D34 +hi Tooltip guifg=#F6F9FC guibg=#25272C + +" ============================= +" PLUGINS SUPPORT {{{1 +" ============================= + +" Airline (see 'autoload/airline/themes/archery.vim') +" Lightline (see 'autoload/lightline/colorscheme/archery') + +" CtrlP +hi link CtrlPMatch Type +hi link CtrlPPrtText Type + +" NERDTree +hi link NERDTreeHelp Comment +hi link NERDTreeHelpKey Type +hi link NERDTreeHelpTitle Statement + +" Tagbar +hi link TagbarHelpKey Type +hi link TagbarHelpTitle Statement +hi link TagbarNestedKind Identifier +hi link TagbarScope Identifier +hi link TagbarType Type +hi link TagbarVisibilityPublic SpellLocal +hi link TagbarVisibilityProtected SpellCap +hi link TagbarVisibilityPrivate SpellBad + +" ============================= +" SYNTAX OPTIMIZATIONS {{{1 +" ============================= + +" ----------------------------- +" Raw {{{2 +" ----------------------------- + +" CSS +hi link cssAttrRegion Constant +hi link cssBraces Normal +hi link cssClassName Statement +hi link cssClassNameDot Statement +hi link cssIdentifier Statement +hi link cssImportant PreProc +hi link cssFontDescriptor PreProc +hi link cssTagName PreProc + +" Markdown +hi link markdownLink Constant +hi link markdownLinkText PreProc +hi link markdownUrl Constant + +" YAML +hi link yamlAnchor PreProc +hi link yamlBlockMappingKey Statement +hi link yamlKeyValueDelimiter Type + +" Readline +hi link readlineVariable Type + +" ----------------------------- +" Tags {{{2 +" ----------------------------- + +" HTML +hi link htmlArg Type +hi link htmlEndTag Statement +hi link htmlString Identifier +hi link htmlTag Statement + +" XML +hi link xmlAttrib PreProc +hi link xmlAttribPunct Constant +hi link xmlEndTag Type +hi link xmlNamespace Identifier +hi link xmlProcessingDelim Statement +hi link xmlTag Type +hi link xmlTagName Type + +" ----------------------------- +" Programming {{{2 +" ----------------------------- + +" JavaScript +hi link jsFuncArgs String +hi link jsFuncCall Identifier +hi link jsFunction Identifier +hi link jsFunctionKey Type +hi link jsGlobalObjects Statement +hi link jsObjectKey Type +hi link jsThis Constant +hi link javascriptjQuery Identifier +hi link javascriptQAttributes Identifier +hi link javascriptQEvents Identifier + +" PHP +hi link phpDefine Identifier +hi link phpIdentifier Type +hi link phpParent Statement +hi link phpRegion Constant +hi link phpStructure Statement +hi link phpStorageClass Statement +hi link phpType Type +hi link phpVarSelector Type + +" Python +hi link pythonAttribute Constant +hi link pythonInclude Statement +hi link pythonQuotes Type + +" Ruby +hi link rubyDefine Statement +hi link rubyInclude Statement +hi link rubyInterpolationDelimiter Type +hi link rubySharpBang Comment +hi link rubyStringDelimiter Type + +" Perl +hi link perlStringStartEnd Type +hi link perlStringUnexpanded PreProc +hi link perlVarPlain Type + +" C/C++ +hi link cInclude Statement +hi link cIncluded Type +hi link cParen PreProc + +" Java +hi link javaAnnotation PreProc +hi link javaCommentTitle Comment +hi link javaDocComment Comment +hi link javaDocParam Comment +hi link javaDocTags Comment +hi link javaExternal Statement +hi link javaScopeDecl Statement diff --git a/vim/colors/badwolf.vim b/vim/colors/badwolf.vim new file mode 100644 index 0000000..99f0ce0 --- /dev/null +++ b/vim/colors/badwolf.vim @@ -0,0 +1,650 @@ +" _ _ _ __ +" | |__ __ _ __| | __ _____ | |/ _| +" | '_ \ / _` |/ _` | \ \ /\ / / _ \| | |_ +" | |_) | (_| | (_| | \ V V / (_) | | _| +" |_.__/ \__,_|\__,_| \_/\_/ \___/|_|_| +" +" I am the Bad Wolf. I create myself. +" I take the words. I scatter them in time and space. +" A message to lead myself here. +" +" A Vim colorscheme pieced together by Steve Losh. +" Available at http://stevelosh.com/projects/badwolf/ +" +" Why? {{{ +" +" After using Molokai for quite a long time, I started longing for +" a replacement. +" +" I love Molokai's high contrast and gooey, saturated tones, but it can be +" a little inconsistent at times. +" +" Also it's winter here in Rochester, so I wanted a color scheme that's a bit +" warmer. A little less blue and a bit more red. +" +" And so Bad Wolf was born. I'm no designer, but designers have been scattering +" beautiful colors through time and space long before I came along. I took +" advantage of that and reused some of my favorites to lead me to this scheme. +" +" }}} + +" Supporting code ------------------------------------------------------------- +" Preamble {{{ + +if !has("gui_running") && &t_Co != 88 && &t_Co != 256 + finish +endif + +set background=dark + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "badwolf" + +if !exists("g:badwolf_html_link_underline") " {{{ + let g:badwolf_html_link_underline = 1 +endif " }}} + +if !exists("g:badwolf_css_props_highlight") " {{{ + let g:badwolf_css_props_highlight = 0 +endif " }}} + +" }}} +" Palette {{{ + +let s:bwc = {} + +" The most basic of all our colors is a slightly tweaked version of the Molokai +" Normal text. +let s:bwc.plain = ['f8f6f2', 15] + +" Pure and simple. +let s:bwc.snow = ['ffffff', 15] +let s:bwc.coal = ['000000', 16] + +" All of the Gravel colors are based on a brown from Clouds Midnight. +let s:bwc.brightgravel = ['d9cec3', 252] +let s:bwc.lightgravel = ['998f84', 245] +let s:bwc.gravel = ['857f78', 243] +let s:bwc.mediumgravel = ['666462', 241] +let s:bwc.deepgravel = ['45413b', 238] +let s:bwc.deepergravel = ['35322d', 236] +let s:bwc.darkgravel = ['242321', 235] +let s:bwc.blackgravel = ['1c1b1a', 233] +let s:bwc.blackestgravel = ['141413', 232] + +" A color sampled from a highlight in a photo of a glass of Dale's Pale Ale on +" my desk. +let s:bwc.dalespale = ['fade3e', 221] + +" A beautiful tan from Tomorrow Night. +let s:bwc.dirtyblonde = ['f4cf86', 222] + +" Delicious, chewy red from Made of Code for the poppiest highlights. +let s:bwc.taffy = ['ff2c4b', 196] + +" Another chewy accent, but use sparingly! +let s:bwc.saltwatertaffy = ['8cffba', 121] + +" The star of the show comes straight from Made of Code. +let s:bwc.tardis = ['0a9dff', 39] + +" This one's from Mustang, not Florida! +let s:bwc.orange = ['ffa724', 214] + +" A limier green from Getafe. +let s:bwc.lime = ['aeee00', 154] + +" Rose's dress in The Idiot's Lantern. +let s:bwc.dress = ['ff9eb8', 211] + +" Another play on the brown from Clouds Midnight. I love that color. +let s:bwc.toffee = ['b88853', 137] + +" Also based on that Clouds Midnight brown. +let s:bwc.coffee = ['c7915b', 173] +let s:bwc.darkroast = ['88633f', 95] + +" }}} +" Highlighting Function {{{ +function! s:HL(group, fg, ...) + " Arguments: group, guifg, guibg, gui, guisp + + let histring = 'hi ' . a:group . ' ' + + if strlen(a:fg) + if a:fg == 'fg' + let histring .= 'guifg=fg ctermfg=fg ' + else + let c = get(s:bwc, a:fg) + let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' ' + endif + endif + + if a:0 >= 1 && strlen(a:1) + if a:1 == 'bg' + let histring .= 'guibg=bg ctermbg=bg ' + else + let c = get(s:bwc, a:1) + let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' ' + endif + endif + + if a:0 >= 2 && strlen(a:2) + let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' ' + endif + + if a:0 >= 3 && strlen(a:3) + let c = get(s:bwc, a:3) + let histring .= 'guisp=#' . c[0] . ' ' + endif + + " echom histring + + execute histring +endfunction +" }}} +" Configuration Options {{{ + +if exists('g:badwolf_darkgutter') && g:badwolf_darkgutter + let s:gutter = 'blackestgravel' +else + let s:gutter = 'blackgravel' +endif + +if exists('g:badwolf_tabline') + if g:badwolf_tabline == 0 + let s:tabline = 'blackestgravel' + elseif g:badwolf_tabline == 1 + let s:tabline = 'blackgravel' + elseif g:badwolf_tabline == 2 + let s:tabline = 'darkgravel' + elseif g:badwolf_tabline == 3 + let s:tabline = 'deepgravel' + else + let s:tabline = 'blackestgravel' + endif +else + let s:tabline = 'blackgravel' +endif + +" }}} + +" Actual colorscheme ---------------------------------------------------------- +" Vanilla Vim {{{ + +" General/UI {{{ + +call s:HL('Normal', 'plain', 'blackgravel') + +call s:HL('Folded', 'mediumgravel', 'bg', 'none') + +call s:HL('VertSplit', 'lightgravel', 'bg', 'none') + +call s:HL('CursorLine', '', 'darkgravel', 'none') +call s:HL('CursorColumn', '', 'darkgravel') +call s:HL('ColorColumn', '', 'darkgravel') + +call s:HL('TabLine', 'plain', s:tabline, 'none') +call s:HL('TabLineFill', 'plain', s:tabline, 'none') +call s:HL('TabLineSel', 'coal', 'tardis', 'none') + +call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold') + +call s:HL('NonText', 'deepgravel', 'bg') +call s:HL('SpecialKey', 'deepgravel', 'bg') + +call s:HL('Visual', '', 'deepgravel') +call s:HL('VisualNOS', '', 'deepgravel') + +call s:HL('Search', 'coal', 'dalespale', 'bold') +call s:HL('IncSearch', 'coal', 'tardis', 'bold') + +call s:HL('Underlined', 'fg', '', 'underline') + +call s:HL('StatusLine', 'coal', 'tardis', 'bold') +call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold') + +call s:HL('Directory', 'dirtyblonde', '', 'bold') + +call s:HL('Title', 'lime') + +call s:HL('ErrorMsg', 'taffy', 'bg', 'bold') +call s:HL('MoreMsg', 'dalespale', '', 'bold') +call s:HL('ModeMsg', 'dirtyblonde', '', 'bold') +call s:HL('Question', 'dirtyblonde', '', 'bold') +call s:HL('WarningMsg', 'dress', '', 'bold') + +" This is a ctags tag, not an HTML one. 'Something you can use c-] on'. +call s:HL('Tag', '', '', 'bold') + +" hi IndentGuides guibg=#373737 +" hi WildMenu guifg=#66D9EF guibg=#000000 + +" }}} +" Gutter {{{ + +call s:HL('LineNr', 'mediumgravel', s:gutter) +call s:HL('SignColumn', '', s:gutter) +call s:HL('FoldColumn', 'mediumgravel', s:gutter) + +" }}} +" Cursor {{{ + +call s:HL('Cursor', 'coal', 'tardis', 'bold') +call s:HL('vCursor', 'coal', 'tardis', 'bold') +call s:HL('iCursor', 'coal', 'tardis', 'none') + +" }}} +" Syntax highlighting {{{ + +" Start with a simple base. +call s:HL('Special', 'plain') + +" Comments are slightly brighter than folds, to make 'headers' easier to see. +call s:HL('Comment', 'gravel') +call s:HL('Todo', 'snow', 'bg', 'bold') +call s:HL('SpecialComment', 'snow', 'bg', 'bold') + +" Strings are a nice, pale straw color. Nothing too fancy. +call s:HL('String', 'dirtyblonde') + +" Control flow stuff is taffy. +call s:HL('Statement', 'taffy', '', 'bold') +call s:HL('Keyword', 'taffy', '', 'bold') +call s:HL('Conditional', 'taffy', '', 'bold') +call s:HL('Operator', 'taffy', '', 'none') +call s:HL('Label', 'taffy', '', 'none') +call s:HL('Repeat', 'taffy', '', 'none') + +" Functions and variable declarations are orange, because plain looks weird. +call s:HL('Identifier', 'orange', '', 'none') +call s:HL('Function', 'orange', '', 'none') + +" Preprocessor stuff is lime, to make it pop. +" +" This includes imports in any given language, because they should usually be +" grouped together at the beginning of a file. If they're in the middle of some +" other code they should stand out, because something tricky is +" probably going on. +call s:HL('PreProc', 'lime', '', 'none') +call s:HL('Macro', 'lime', '', 'none') +call s:HL('Define', 'lime', '', 'none') +call s:HL('PreCondit', 'lime', '', 'bold') + +" Constants of all kinds are colored together. +" I'm not really happy with the color yet... +call s:HL('Constant', 'toffee', '', 'bold') +call s:HL('Character', 'toffee', '', 'bold') +call s:HL('Boolean', 'toffee', '', 'bold') + +call s:HL('Number', 'toffee', '', 'bold') +call s:HL('Float', 'toffee', '', 'bold') + +" Not sure what 'special character in a constant' means, but let's make it pop. +call s:HL('SpecialChar', 'dress', '', 'bold') + +call s:HL('Type', 'dress', '', 'none') +call s:HL('StorageClass', 'taffy', '', 'none') +call s:HL('Structure', 'taffy', '', 'none') +call s:HL('Typedef', 'taffy', '', 'bold') + +" Make try/catch blocks stand out. +call s:HL('Exception', 'lime', '', 'bold') + +" Misc +call s:HL('Error', 'snow', 'taffy', 'bold') +call s:HL('Debug', 'snow', '', 'bold') +call s:HL('Ignore', 'gravel', '', '') + +" }}} +" Completion Menu {{{ + +call s:HL('Pmenu', 'plain', 'deepergravel') +call s:HL('PmenuSel', 'coal', 'tardis', 'bold') +call s:HL('PmenuSbar', '', 'deepergravel') +call s:HL('PmenuThumb', 'brightgravel') + +" }}} +" Diffs {{{ + +call s:HL('DiffDelete', 'coal', 'coal') +call s:HL('DiffAdd', '', 'deepergravel') +call s:HL('DiffChange', '', 'darkgravel') +call s:HL('DiffText', 'snow', 'deepergravel', 'bold') + +" }}} +" Spelling {{{ + +if has("spell") + call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale') + call s:HL('SpellBad', '', 'bg', 'undercurl', 'dalespale') + call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale') + call s:HL('SpellRare', '', '', 'undercurl', 'dalespale') +endif + +" }}} + +" }}} +" Plugins {{{ + +" CtrlP {{{ + + " the message when no match is found + call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold') + + " the matched pattern + call s:HL('CtrlPMatch', 'orange', 'bg', 'none') + + " the line prefix '>' in the match window + call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none') + + " the prompt’s base + call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none') + + " the prompt’s text + call s:HL('CtrlPPrtText', 'plain', 'bg', 'none') + + " the prompt’s cursor when moving over the text + call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold') + + " 'prt' or 'win', also for 'regex' + call s:HL('CtrlPMode1', 'coal', 'tardis', 'bold') + + " 'file' or 'path', also for the local working dir + call s:HL('CtrlPMode2', 'coal', 'tardis', 'bold') + + " the scanning status + call s:HL('CtrlPStats', 'coal', 'tardis', 'bold') + + " TODO: CtrlP extensions. + " CtrlPTabExtra : the part of each line that’s not matched against (Comment) + " CtrlPqfLineCol : the line and column numbers in quickfix mode (|s:HL-Search|) + " CtrlPUndoT : the elapsed time in undo mode (|s:HL-Directory|) + " CtrlPUndoBr : the square brackets [] in undo mode (Comment) + " CtrlPUndoNr : the undo number inside [] in undo mode (String) + +" }}} +" EasyMotion {{{ + +call s:HL('EasyMotionTarget', 'tardis', 'bg', 'bold') +call s:HL('EasyMotionShade', 'deepgravel', 'bg') + +" }}} +" Interesting Words {{{ + +" These are only used if you're me or have copied the hNUM mappings +" from my Vimrc. +call s:HL('InterestingWord1', 'coal', 'orange') +call s:HL('InterestingWord2', 'coal', 'lime') +call s:HL('InterestingWord3', 'coal', 'saltwatertaffy') +call s:HL('InterestingWord4', 'coal', 'toffee') +call s:HL('InterestingWord5', 'coal', 'dress') +call s:HL('InterestingWord6', 'coal', 'taffy') + + +" }}} +" Makegreen {{{ + +" hi GreenBar term=reverse ctermfg=white ctermbg=green guifg=coal guibg=#9edf1c +" hi RedBar term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048 + +" }}} +" Rainbow Parentheses {{{ + +call s:HL('level16c', 'mediumgravel', '', 'bold') +call s:HL('level15c', 'dalespale', '', '') +call s:HL('level14c', 'dress', '', '') +call s:HL('level13c', 'orange', '', '') +call s:HL('level12c', 'tardis', '', '') +call s:HL('level11c', 'lime', '', '') +call s:HL('level10c', 'toffee', '', '') +call s:HL('level9c', 'saltwatertaffy', '', '') +call s:HL('level8c', 'coffee', '', '') +call s:HL('level7c', 'dalespale', '', '') +call s:HL('level6c', 'dress', '', '') +call s:HL('level5c', 'orange', '', '') +call s:HL('level4c', 'tardis', '', '') +call s:HL('level3c', 'lime', '', '') +call s:HL('level2c', 'toffee', '', '') +call s:HL('level1c', 'saltwatertaffy', '', '') + +" }}} +" ShowMarks {{{ + +call s:HL('ShowMarksHLl', 'tardis', 'blackgravel') +call s:HL('ShowMarksHLu', 'tardis', 'blackgravel') +call s:HL('ShowMarksHLo', 'tardis', 'blackgravel') +call s:HL('ShowMarksHLm', 'tardis', 'blackgravel') + +" }}} + +" }}} +" Filetype-specific {{{ + +" Clojure {{{ + +call s:HL('clojureSpecial', 'taffy', '', '') +call s:HL('clojureDefn', 'taffy', '', '') +call s:HL('clojureDefMacro', 'taffy', '', '') +call s:HL('clojureDefine', 'taffy', '', '') +call s:HL('clojureMacro', 'taffy', '', '') +call s:HL('clojureCond', 'taffy', '', '') + +call s:HL('clojureKeyword', 'orange', '', 'none') + +call s:HL('clojureFunc', 'dress', '', 'none') +call s:HL('clojureRepeat', 'dress', '', 'none') + +call s:HL('clojureParen0', 'lightgravel', '', 'none') + +call s:HL('clojureAnonArg', 'snow', '', 'bold') + +" }}} +" CSS {{{ + +if g:badwolf_css_props_highlight + call s:HL('cssColorProp', 'dirtyblonde', '', 'none') + call s:HL('cssBoxProp', 'dirtyblonde', '', 'none') + call s:HL('cssTextProp', 'dirtyblonde', '', 'none') + call s:HL('cssRenderProp', 'dirtyblonde', '', 'none') + call s:HL('cssGeneratedContentProp', 'dirtyblonde', '', 'none') +else + call s:HL('cssColorProp', 'fg', '', 'none') + call s:HL('cssBoxProp', 'fg', '', 'none') + call s:HL('cssTextProp', 'fg', '', 'none') + call s:HL('cssRenderProp', 'fg', '', 'none') + call s:HL('cssGeneratedContentProp', 'fg', '', 'none') +end + +call s:HL('cssValueLength', 'toffee', '', 'bold') +call s:HL('cssColor', 'toffee', '', 'bold') +call s:HL('cssBraces', 'lightgravel', '', 'none') +call s:HL('cssIdentifier', 'orange', '', 'bold') +call s:HL('cssClassName', 'orange', '', 'none') + +" }}} +" Diff {{{ + +call s:HL('gitDiff', 'lightgravel', '',) + +call s:HL('diffRemoved', 'dress', '',) +call s:HL('diffAdded', 'lime', '',) +call s:HL('diffFile', 'coal', 'taffy', 'bold') +call s:HL('diffNewFile', 'coal', 'taffy', 'bold') + +call s:HL('diffLine', 'coal', 'orange', 'bold') +call s:HL('diffSubname', 'orange', '', 'none') + +" }}} +" Django Templates {{{ + +call s:HL('djangoArgument', 'dirtyblonde', '',) +call s:HL('djangoTagBlock', 'orange', '') +call s:HL('djangoVarBlock', 'orange', '') +" hi djangoStatement guifg=#ff3853 gui=bold +" hi djangoVarBlock guifg=#f4cf86 + +" }}} +" HTML {{{ + +" Punctuation +call s:HL('htmlTag', 'darkroast', 'bg', 'none') +call s:HL('htmlEndTag', 'darkroast', 'bg', 'none') + +" Tag names +call s:HL('htmlTagName', 'coffee', '', 'bold') +call s:HL('htmlSpecialTagName', 'coffee', '', 'bold') +call s:HL('htmlSpecialChar', 'lime', '', 'none') + +" Attributes +call s:HL('htmlArg', 'coffee', '', 'none') + +" Stuff inside an tag + +if g:badwolf_html_link_underline + call s:HL('htmlLink', 'lightgravel', '', 'underline') +else + call s:HL('htmlLink', 'lightgravel', '', 'none') +endif + +" }}} +" Java {{{ + +call s:HL('javaClassDecl', 'taffy', '', 'bold') +call s:HL('javaScopeDecl', 'taffy', '', 'bold') +call s:HL('javaCommentTitle', 'gravel', '') +call s:HL('javaDocTags', 'snow', '', 'none') +call s:HL('javaDocParam', 'dalespale', '', '') + +" }}} +" LaTeX {{{ + +call s:HL('texStatement', 'tardis', '', 'none') +call s:HL('texMathZoneX', 'orange', '', 'none') +call s:HL('texMathZoneA', 'orange', '', 'none') +call s:HL('texMathZoneB', 'orange', '', 'none') +call s:HL('texMathZoneC', 'orange', '', 'none') +call s:HL('texMathZoneD', 'orange', '', 'none') +call s:HL('texMathZoneE', 'orange', '', 'none') +call s:HL('texMathZoneV', 'orange', '', 'none') +call s:HL('texMathZoneX', 'orange', '', 'none') +call s:HL('texMath', 'orange', '', 'none') +call s:HL('texMathMatcher', 'orange', '', 'none') +call s:HL('texRefLabel', 'dirtyblonde', '', 'none') +call s:HL('texRefZone', 'lime', '', 'none') +call s:HL('texComment', 'darkroast', '', 'none') +call s:HL('texDelimiter', 'orange', '', 'none') +call s:HL('texZone', 'brightgravel', '', 'none') + +augroup badwolf_tex + au! + + au BufRead,BufNewFile *.tex syn region texMathZoneV start="\\(" end="\\)\|%stopzone\>" keepend contains=@texMathZoneGroup + au BufRead,BufNewFile *.tex syn region texMathZoneX start="\$" skip="\\\\\|\\\$" end="\$\|%stopzone\>" keepend contains=@texMathZoneGroup +augroup END + +" }}} +" LessCSS {{{ + +call s:HL('lessVariable', 'lime', '', 'none') + +" }}} +" Lispyscript {{{ + +call s:HL('lispyscriptDefMacro', 'lime', '', '') +call s:HL('lispyscriptRepeat', 'dress', '', 'none') + +" }}} +" Mail {{{ + +call s:HL('mailSubject', 'orange', '', 'bold') +call s:HL('mailHeader', 'lightgravel', '', '') +call s:HL('mailHeaderKey', 'lightgravel', '', '') +call s:HL('mailHeaderEmail', 'snow', '', '') +call s:HL('mailURL', 'toffee', '', 'underline') +call s:HL('mailSignature', 'gravel', '', 'none') + +call s:HL('mailQuoted1', 'gravel', '', 'none') +call s:HL('mailQuoted2', 'dress', '', 'none') +call s:HL('mailQuoted3', 'dirtyblonde', '', 'none') +call s:HL('mailQuoted4', 'orange', '', 'none') +call s:HL('mailQuoted5', 'lime', '', 'none') + +" }}} +" Markdown {{{ + +call s:HL('markdownHeadingRule', 'lightgravel', '', 'bold') +call s:HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold') +call s:HL('markdownOrderedListMarker', 'lightgravel', '', 'bold') +call s:HL('markdownListMarker', 'lightgravel', '', 'bold') +call s:HL('markdownItalic', 'snow', '', 'bold') +call s:HL('markdownBold', 'snow', '', 'bold') +call s:HL('markdownH1', 'orange', '', 'bold') +call s:HL('markdownH2', 'lime', '', 'bold') +call s:HL('markdownH3', 'lime', '', 'none') +call s:HL('markdownH4', 'lime', '', 'none') +call s:HL('markdownH5', 'lime', '', 'none') +call s:HL('markdownH6', 'lime', '', 'none') +call s:HL('markdownLinkText', 'toffee', '', 'underline') +call s:HL('markdownIdDeclaration', 'toffee') +call s:HL('markdownAutomaticLink', 'toffee', '', 'bold') +call s:HL('markdownUrl', 'toffee', '', 'bold') +call s:HL('markdownUrldelimiter', 'lightgravel', '', 'bold') +call s:HL('markdownLinkDelimiter', 'lightgravel', '', 'bold') +call s:HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold') +call s:HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold') +call s:HL('markdownCode', 'dirtyblonde', '', 'none') +call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none') + +" }}} +" MySQL {{{ + +call s:HL('mysqlSpecial', 'dress', '', 'bold') + +" }}} +" Python {{{ + +hi def link pythonOperator Operator +call s:HL('pythonBuiltin', 'dress') +call s:HL('pythonBuiltinObj', 'dress') +call s:HL('pythonBuiltinFunc', 'dress') +call s:HL('pythonEscape', 'dress') +call s:HL('pythonException', 'lime', '', 'bold') +call s:HL('pythonExceptions', 'lime', '', 'none') +call s:HL('pythonPrecondit', 'lime', '', 'none') +call s:HL('pythonDecorator', 'taffy', '', 'none') +call s:HL('pythonRun', 'gravel', '', 'bold') +call s:HL('pythonCoding', 'gravel', '', 'bold') + +" }}} +" SLIMV {{{ + +" Rainbow parentheses +call s:HL('hlLevel0', 'gravel') +call s:HL('hlLevel1', 'orange') +call s:HL('hlLevel2', 'saltwatertaffy') +call s:HL('hlLevel3', 'dress') +call s:HL('hlLevel4', 'coffee') +call s:HL('hlLevel5', 'dirtyblonde') +call s:HL('hlLevel6', 'orange') +call s:HL('hlLevel7', 'saltwatertaffy') +call s:HL('hlLevel8', 'dress') +call s:HL('hlLevel9', 'coffee') + +" }}} +" Vim {{{ + +call s:HL('VimCommentTitle', 'lightgravel', '', 'bold') + +call s:HL('VimMapMod', 'dress', '', 'none') +call s:HL('VimMapModKey', 'dress', '', 'none') +call s:HL('VimNotation', 'dress', '', 'none') +call s:HL('VimBracket', 'dress', '', 'none') + +" }}} + +" }}} + diff --git a/vim/colors/ego.vim b/vim/colors/ego.vim new file mode 100644 index 0000000..ddb70ad --- /dev/null +++ b/vim/colors/ego.vim @@ -0,0 +1,116 @@ +" Vim color file +" Maintainer: Robby Colvin +" Last Change: 2010-04-30 +" Version: 0.1 +" based on 'ego' theme for Xcode: +" http://developers.enormego.com/view/xcode_ego_theme + +set background=dark +hi clear +if exists("syntax_on") + syntax reset +endif + +let g:colors_name = "ego" + +" GUI Colors +hi Cursor gui=NONE guibg=#8DA1A1 ctermbg=247 guifg=#ffffff ctermfg=15 +hi CursorIM gui=bold guifg=#ffffff ctermfg=15 guibg=#8DA1A1 ctermbg=247 +hi CursorLine gui=NONE guibg=#3D4646 ctermbg=238 " Uncomment for lighter line bgcolor: #202129 +hi CursorColumn gui=NONE guibg=#3D4646 ctermbg=238 " Uncomment for lighter line bgcolor: #202129 +hi Directory gui=NONE guifg=#82c057 ctermfg=107 guibg=bg +hi DiffAdd gui=NONE guifg=fg guibg=#9bb2ee ctermbg=111 +hi DiffChange gui=NONE guifg=fg guibg=#82c057 ctermbg=107 +hi DiffDelete gui=NONE guifg=fg guibg=#000000 ctermbg=0 +hi DiffText gui=bold guifg=fg guibg=bg +hi ErrorMsg gui=NONE guifg=#FFFF99 ctermfg=228 guibg=#FF0000 ctermbg=9 +hi VertSplit gui=NONE guifg=#000000 ctermfg=0 guibg=#686868 ctermbg=242 +hi Folded gui=bold guibg=#305060 ctermbg=239 guifg=#b0d0e0 ctermfg=152 +hi FoldColumn gui=NONE guibg=#305060 ctermbg=239 guifg=#b0d0e0 ctermfg=152 +hi IncSearch gui=reverse guifg=fg guibg=bg +hi LineNr gui=NONE guibg=#000000 ctermbg=0 guifg=#686868 ctermfg=242 +hi ModeMsg gui=NONE guibg=#82c057 ctermbg=107 guifg=#C8F482 ctermfg=192 +hi MoreMsg gui=bold guifg=#C8F482 ctermfg=192 guibg=bg +hi NonText gui=NONE guibg=#000000 ctermbg=0 guifg=#95D5F1 ctermfg=117 +hi Normal gui=NONE guibg=#18191F ctermbg=234 guifg=#F6F6F6 ctermfg=15 +hi Question gui=bold guifg=#C8F482 ctermfg=192 guibg=bg +hi Search gui=NONE guibg=#95D5F1 ctermbg=117 guifg=#18191F ctermfg=234 +hi SpecialKey gui=NONE guibg=#103040 ctermbg=235 guifg=#324262 ctermfg=238 +hi StatusLine gui=bold guibg=#484848 ctermbg=238 guifg=#000000 ctermfg=0 +hi StatusLineNC gui=NONE guibg=#686868 ctermbg=242 guifg=#E0E0E0 ctermfg=7 +hi Title gui=bold guifg=#9d7ff2 ctermfg=141 guibg=bg +hi Visual gui=reverse guibg=#ffffff ctermbg=15 guifg=#55747c ctermfg=66 +hi VisualNOS gui=bold,underline guifg=fg guibg=bg +hi WarningMsg gui=bold guifg=#FF0000 ctermfg=9 guibg=bg +hi WildMenu gui=bold guibg=#F6DA7B ctermbg=222 guifg=#000000 ctermfg=0 +hi Pmenu guibg=#e38081 ctermbg=174 guifg=#ffffff ctermfg=15 +hi PmenuSel guibg=#3D4646 ctermbg=238 guifg=#ffffff ctermfg=15 +hi NonText guibg=bg guifg=#e29aeb ctermfg=176 +hi Scrollbar guibg=bg + +hi ColorColumn guibg=#3D4646 ctermbg=238 + +" General Syntax Colors + +" Light green +hi Comment gui=NONE guifg=#C8F482 ctermfg=192 guibg=bg + +" Green +hi Identifier gui=NONE guifg=#82c057 ctermfg=107 guibg=bg +hi Type gui=NONE guifg=#82c057 ctermfg=107 guibg=bg +hi Function gui=NONE guifg=#82c057 ctermfg=107 guibg=bg + +" Yellow +hi Statement gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg +hi Conditional gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg +hi Operator gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg +hi Label gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg +hi Define gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg +hi Macro gui=NONE guifg=#F6DA7B ctermfg=222 guibg=bg + +" Rose +hi String gui=NONE guifg=#E38081 ctermfg=174 guibg=bg + +" Pink +hi Todo gui=bold guifg=#e29aeb ctermfg=176 guibg=bg + +" Light Purple +hi Character gui=NONE guifg=#9d7ff2 ctermfg=141 guibg=bg + +" Dark Purple +hi Number gui=NONE guifg=#776CC4 ctermfg=98 guibg=bg +hi Float gui=NONE guifg=#776CC4 ctermfg=98 guibg=bg +hi Boolean gui=bold guifg=#776CC4 ctermfg=98 guibg=bg + +" Cyan +hi StorageClass gui=NONE guifg=#95D5F1 ctermfg=117 guibg=bg +hi Structure gui=NONE guifg=#95D5F1 ctermfg=117 guibg=bg +hi Typedef gui=NONE guifg=#95D5F1 ctermfg=117 guibg=bg +hi Constant gui=NONE guifg=#95D5F1 ctermfg=117 guibg=bg + +" Blue #9bb2ee + +" Dunno color +hi Special gui=NONE guifg=#55747c ctermfg=66 guibg=bg +hi Delimiter gui=NONE guifg=#55747c ctermfg=66 guibg=bg +hi SpecialChar gui=NONE guifg=#55747c ctermfg=66 guibg=bg +hi SpecialComment gui=NONE guifg=#55747c ctermfg=66 guibg=bg +hi Tag gui=NONE guifg=#55747c ctermfg=66 guibg=bg +hi Debug gui=NONE guifg=#55747c ctermfg=66 guibg=bg + +" Brown +hi Repeat gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg +hi PreProc gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg +hi Include gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg +hi PreCondit gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg +hi Keyword gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg +hi Exception gui=NONE guifg=#C67C48 ctermfg=173 guibg=bg + +" Other +hi Underlined gui=underline guifg=#C8F482 ctermfg=192 guibg=bg +hi Ignore guifg=#55747c ctermfg=66 +hi Error guifg=#FFFF99 ctermfg=228 guibg=#FF0000 ctermbg=9 + +" Ruby-specific +hi rubySharpBang gui=bold guifg=#e29aeb ctermfg=176 +hi rubyRegexp guifg=#9BB2EE ctermfg=111 diff --git a/vim/colors/google.vim b/vim/colors/google.vim new file mode 100644 index 0000000..365e7b6 --- /dev/null +++ b/vim/colors/google.vim @@ -0,0 +1,105 @@ +" description: color scheme based on google's +" author: kamil.stachowski@gmail.com +" license: gpl 3+ +" version: 0.2 (2008.11.27) + +" changelog: +" 0.2: 2008.11.27 +" changed MatchParen to link to Type (thanks to Jarosław Mężyk) +" added Diff* +" 0.1: 2008.11.20 +" initial version + + +set background=dark + +hi clear +if exists("syntax_on") + syntax reset +endif + +let colors_name = "google" + + +" black 000000 +" blue dark 6694e3 +" blue dark2 2a5db0 +" blue light e0ecff +" green dark 006633 +" green light 46aa64 +" grey aaaaaa +" red d96666 +" white ffffff +" yellow ffffb5 + +" pmenu + +hi Comment guifg=#aaaaaa guibg=#ffffff gui=none +hi Constant guifg=#6694e3 guibg=#ffffff gui=none +hi Cursor guifg=#ffffff guibg=#000000 gui=none +hi CursorLine guibg=#efefef gui=none +hi DiffAdd guifg=#ffffff guibg=#006633 gui=none +hi DiffChange guifg=#000000 guibg=#ffffb5 gui=none +hi DiffDelete guifg=#000000 guibg=#d96666 gui=none +hi DiffText guifg=#d96666 guibg=#ffffb5 gui=none +hi Folded guibg=#efefef guifg=#000000 gui=italic +hi Identifier guifg=#7799bb guibg=#ffffff gui=none +hi ModeMsg guifg=#ffffff guibg=#6694e3 gui=bold +hi NonText guifg=#f0f0f0 guibg=#ffffff gui=none +hi Normal guifg=#000000 guibg=#ffffff gui=none +hi PreProc guifg=#46aa64 guibg=#ffffff gui=none +hi Search guifg=#000000 guibg=#ffffb5 +hi Special guifg=#2a5db0 guibg=#ffffff gui=none +hi Statement guifg=#2a5db0 guibg=#ffffff gui=bold,underline +hi StatusLine guifg=#ffffff guibg=#6694e3 gui=bold +hi StatusLineNC guifg=#aaaaaa guibg=#e0ecff gui=none +hi Todo guifg=#ffffff guibg=#d96666 gui=bold +hi Type guifg=#006633 guibg=#ffffff gui=bold +hi Underlined guifg=#000000 guibg=#ffffff gui=underline +hi VertSplit guifg=#e0ecff guibg=#e0ecff gui= none +hi Visual guifg=#ffffff guibg=#6694e3 gui=none +hi! link Macro PreProc +hi! link Boolean Constant +hi! link Character Constant +hi! link Conditional Statement +hi! link CursorColumn CursorLine +hi! link Debug PreProc +hi! link Define PreProc +hi! link Delimiter Identifier +hi! link Directory Statement +hi! link Error Todo +hi! link ErrorMsg Error +hi! link Exception Statement +hi! link Float Constant +hi! link FoldColumn Folded +hi! link Function Identifier +hi! link Function Identifier +hi! link Ignore Comment +hi! link Include PreProc +hi! link IncSearch Search +hi! link Keyword Identifier +hi! link Keyword Identifier +hi! link Label Statement +hi! link LineNr Comment +hi! link MatchParen Statement +hi! link MoreMsg Identifier +hi! link NonText Comment +hi! link Number Constant +hi! link Operator Identifier +hi! link Question MoreMsg +hi! link PreCondit PreProc +hi! link Repeat Statement +hi! link SignColumn Identifier +hi! link SpecialChar Special +hi! link SpecialComment Special +hi! link SpecialKey Special +hi! link SpellBad Error +hi! link SpellCap Error +hi! link SpellLocal Error +hi! link SpellRare Error +hi! link StorageClass Type +hi! link String Constant +hi! link Structure Type +hi! link Title Structure +hi! link Typedef Type +hi! link WarningMsg Error diff --git a/vim/colors/h80.vim b/vim/colors/h80.vim new file mode 100644 index 0000000..9f15e2a --- /dev/null +++ b/vim/colors/h80.vim @@ -0,0 +1,44 @@ +" author Helder Correia < helder (.) pereira (.) correia (@) gmail (.) com > +" version 1.0 +" feel free to modify and/or redistribute this file + +set background=dark + +hi clear + +if exists( "syntax_on" ) + syntax reset +endif + +let g:colors_name="h80" + +hi Normal guifg=White guibg=#000020 + +" highlight groups +hi Cursor guifg=#e3e3e3 guibg=#D74141 +hi VertSplit guifg=#075554 guibg=#C0FFFF gui=none +hi Folded guifg=black guibg=#FFC0C0 +hi FoldColumn guifg=tan guibg=#800080 +hi ModeMsg guifg=#404040 guibg=#C0C0C0 +hi MoreMsg guifg=darkturquoise guibg=#188F90 +hi NonText guifg=#9FADC5 guibg=#334C75 +hi Question guifg=#F4BB7E +hi Search guifg=bg guibg=fg +hi SpecialKey guifg=#BF9261 +hi StatusLine guifg=#c0ffff guibg=#004443 gui=none +hi StatusLineNC guifg=#004443 guibg=#067C7B gui=bold +hi Title guifg=#8DB8C3 +hi Visual guifg=black guibg=#C0FFC0 gui=bold +hi WarningMsg guifg=#F60000 gui=underline + +" syntax highlighting groups +hi Comment guifg=#666666 gui=italic +hi Constant guifg=#A9EE5A gui=bold,italic +hi Identifier guifg=#555555 +hi Function guifg=#555555 +hi Statement guifg=#ff9742 gui=bold,italic +hi PreProc guifg=#F9449A +hi Type guifg=#55AAFF gui=bold,italic +hi Special guifg=#A9EE8A +hi Todo guifg=#FFFFFF guibg=#FF0000 + diff --git a/vim/colors/madeofcode.vim b/vim/colors/madeofcode.vim new file mode 100644 index 0000000..b65f391 --- /dev/null +++ b/vim/colors/madeofcode.vim @@ -0,0 +1,147 @@ +" Vim color file - madeofcode +" Generated by http://bytefluent.com/vivify 2012-03-14 +set background=dark +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif + +set t_Co=256 +let g:colors_name = "madeofcode" + +hi IncSearch guifg=NONE guibg=#233466 guisp=#233466 gui=NONE ctermfg=NONE ctermbg=17 cterm=NONE +"hi WildMenu -- no settings -- +"hi SignColumn -- no settings -- +hi SpecialComment guifg=#f8f8f8 guibg=NONE guisp=NONE gui=NONE ctermfg=15 ctermbg=NONE cterm=NONE +hi Typedef guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi Title guifg=#f8f8f8 guibg=NONE guisp=NONE gui=bold ctermfg=15 ctermbg=NONE cterm=bold +hi Folded guifg=#c050c2 guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=170 ctermbg=234 cterm=NONE +hi PreCondit guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi Include guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +"hi TabLineSel -- no settings -- +hi StatusLineNC guifg=#f8f8f8 guibg=#363745 guisp=#363745 gui=NONE ctermfg=15 ctermbg=238 cterm=NONE +"hi CTagsMember -- no settings -- +hi NonText guifg=#353c4f guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=239 ctermbg=234 cterm=NONE +"hi CTagsGlobalConstant -- no settings -- +"hi DiffText -- no settings -- +"hi ErrorMsg -- no settings -- +"hi Ignore -- no settings -- +hi Debug guifg=#f8f8f8 guibg=NONE guisp=NONE gui=NONE ctermfg=15 ctermbg=NONE cterm=NONE +hi PMenuSbar guifg=NONE guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=NONE ctermbg=234 cterm=NONE +hi Identifier guifg=#99cf50 guibg=NONE guisp=NONE gui=NONE ctermfg=149 ctermbg=NONE cterm=NONE +hi SpecialChar guifg=#f8f8f8 guibg=NONE guisp=NONE gui=NONE ctermfg=15 ctermbg=NONE cterm=NONE +hi Conditional guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi StorageClass guifg=#99cf50 guibg=NONE guisp=NONE gui=NONE ctermfg=149 ctermbg=NONE cterm=NONE +hi Todo guifg=#c050c2 guibg=#000000 guisp=#000000 gui=bold,italic ctermfg=170 ctermbg=NONE cterm=bold +hi Special guifg=#545454 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE +hi LineNr guifg=#81818a guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=245 ctermbg=234 cterm=NONE +hi StatusLine guifg=#f8f8f8 guibg=#363745 guisp=#363745 gui=bold ctermfg=15 ctermbg=238 cterm=bold +hi Normal guifg=#f8f8f8 guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=15 ctermbg=234 cterm=NONE +hi Label guifg=#8fff58 guibg=#102522 guisp=#102522 gui=NONE ctermfg=119 ctermbg=235 cterm=NONE +"hi CTagsImport -- no settings -- +hi PMenuSel guifg=NONE guibg=#05448d guisp=#05448d gui=NONE ctermfg=NONE ctermbg=24 cterm=NONE +hi Search guifg=NONE guibg=#233466 guisp=#233466 gui=NONE ctermfg=NONE ctermbg=17 cterm=NONE +"hi CTagsGlobalVariable -- no settings -- +hi Delimiter guifg=#f8f8f8 guibg=NONE guisp=NONE gui=NONE ctermfg=15 ctermbg=NONE cterm=NONE +hi Statement guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +"hi SpellRare -- no settings -- +"hi EnumerationValue -- no settings -- +hi Comment guifg=#c050c2 guibg=#000000 guisp=#000000 gui=italic ctermfg=170 ctermbg=NONE cterm=NONE +hi Character guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi Float guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi Number guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi Boolean guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi Operator guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi CursorLine guifg=NONE guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=NONE ctermbg=234 cterm=NONE +"hi Union -- no settings -- +"hi TabLineFill -- no settings -- +"hi Question -- no settings -- +"hi WarningMsg -- no settings -- +"hi VisualNOS -- no settings -- +"hi DiffDelete -- no settings -- +"hi ModeMsg -- no settings -- +hi CursorColumn guifg=NONE guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=NONE ctermbg=234 cterm=NONE +hi Define guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi Function guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +"hi FoldColumn -- no settings -- +hi PreProc guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +"hi EnumerationName -- no settings -- +hi Visual guifg=NONE guibg=#05448d guisp=#05448d gui=NONE ctermfg=NONE ctermbg=24 cterm=NONE +"hi MoreMsg -- no settings -- +"hi SpellCap -- no settings -- +hi VertSplit guifg=#363745 guibg=#363745 guisp=#363745 gui=NONE ctermfg=238 ctermbg=238 cterm=NONE +hi Exception guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi Keyword guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi Type guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +"hi DiffChange -- no settings -- +hi Cursor guifg=NONE guibg=#00ffff guisp=#00ffff gui=NONE ctermfg=NONE ctermbg=14 cterm=NONE +"hi SpellLocal -- no settings -- +"hi Error -- no settings -- +hi PMenu guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi SpecialKey guifg=#353c4f guibg=#090a1b guisp=#090a1b gui=NONE ctermfg=239 ctermbg=234 cterm=NONE +hi Constant guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +"hi DefinedName -- no settings -- +hi Tag guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi String guifg=#8fff58 guibg=#102522 guisp=#102522 gui=NONE ctermfg=119 ctermbg=235 cterm=NONE +hi PMenuThumb guifg=NONE guibg=#81818a guisp=#81818a gui=NONE ctermfg=NONE ctermbg=245 cterm=NONE +hi MatchParen guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +"hi LocalVariable -- no settings -- +hi Repeat guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +"hi SpellBad -- no settings -- +"hi CTagsClass -- no settings -- +hi Directory guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi Structure guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi Macro guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline +"hi DiffAdd -- no settings -- +"hi TabLine -- no settings -- +hi htmlarg guifg=#45c1ea guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi javascriptfunction guifg=#99cf50 guibg=NONE guisp=NONE gui=NONE ctermfg=149 ctermbg=NONE cterm=NONE +hi erubycomment guifg=#c050c2 guibg=#000000 guisp=#000000 gui=italic ctermfg=170 ctermbg=NONE cterm=NONE +hi rubyclass guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi rubyrailsarmethod guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +hi htmlspecialchar guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi rubyexception guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi csscommonattr guifg=#cf6a4c guibg=NONE guisp=NONE gui=NONE ctermfg=173 ctermbg=NONE cterm=NONE +hi rubyescape guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi rubyfunction guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi rubyrailsuserclass guifg=#00ffbc guibg=NONE guisp=NONE gui=NONE ctermfg=49 ctermbg=NONE cterm=NONE +"hi cssbraces -- no settings -- +hi rubyglobalvariable guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi htmltagname guifg=#45c1ea guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi rubyblockparameter guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi erubyrailsmethod guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +hi javascriptrailsfunction guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +"hi javascriptbraces -- no settings -- +hi rubyregexpdelimiter guifg=#e9c062 guibg=NONE guisp=NONE gui=NONE ctermfg=179 ctermbg=NONE cterm=NONE +hi csscolor guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi rubyconstant guifg=#00ffbc guibg=NONE guisp=NONE gui=NONE ctermfg=49 ctermbg=NONE cterm=NONE +hi rubyrailsmethod guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +"hi erubydelimiter -- no settings -- +hi rubypseudovariable guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi rubyrailsarassociationmethod guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +hi rubyrailsrendermethod guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +hi rubyinstancevariable guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi rubyinterpolationdelimiter guifg=#545454 guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE +hi rubyclassvariable guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi htmltag guifg=#45c1ea guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi rubycontrol guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi yamlalias guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi yamldocumentheader guifg=#8fff58 guibg=#102522 guisp=#102522 gui=NONE ctermfg=119 ctermbg=235 cterm=NONE +hi csspseudoclassid guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi cssvaluelength guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi rubystringdelimiter guifg=#8fff58 guibg=#102522 guisp=#102522 gui=NONE ctermfg=119 ctermbg=235 cterm=NONE +hi cssfunctionname guifg=#f1d950 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE +hi yamlanchor guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi rubyregexp guifg=#e9c062 guibg=NONE guisp=NONE gui=NONE ctermfg=179 ctermbg=NONE cterm=NONE +hi rubysymbol guifg=#0a9cff guibg=NONE guisp=NONE gui=NONE ctermfg=33 ctermbg=NONE cterm=NONE +hi cssurl guifg=#588aff guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE +hi rubyinclude guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +hi cssclassname guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi yamlkey guifg=#6fd3ff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE +hi rubyoperator guifg=#ff3854 guibg=NONE guisp=NONE gui=NONE ctermfg=13 ctermbg=NONE cterm=NONE +"hi clear -- no settings -- +hi htmlendtag guifg=#45c1ea guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE + diff --git a/vim/colors/muon.vim b/vim/colors/muon.vim new file mode 100644 index 0000000..94bfdf2 --- /dev/null +++ b/vim/colors/muon.vim @@ -0,0 +1,95 @@ +"Maintainer: Greg Sexton +"Last Change: 2012-08-04 +"Version: 1.0 +"URL: http://www.gregsexton.org/vim-color-schemes/muon/ + +set background=dark +if version > 580 + "no guarantees for version 5.8 and below, but this makes it stop complaining + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="muon" + +hi Normal ctermfg=250 ctermbg=234 gui=None guifg=#bcbcbc guibg=#1c1c1c +hi LineNr ctermfg=239 ctermbg=234 gui=None guifg=#4e4e4e guibg=#1c1c1c +hi NonText ctermfg=234 ctermbg=234 gui=None guifg=#1c1c1c guibg=#1c1c1c + +hi VertSplit ctermfg=237 ctermbg=235 cterm=none gui=None guifg=#3a3a3a guibg=#262626 +hi StatusLine ctermfg=249 ctermbg=235 cterm=underline gui=underline guifg=#b2b2b2 guibg=#262626 +hi StatusLineNC ctermfg=243 ctermbg=235 cterm=none gui=None guifg=#767676 guibg=#262626 + +hi DiffDelete ctermfg=234 ctermbg=233 gui=None guifg=#1c1c1c guibg=#121212 +hi DiffAdd ctermbg=236 gui=None guibg=#303030 +hi DiffChange ctermbg=235 gui=None guibg=#262626 +hi DiffText ctermfg=161 ctermbg=234 cterm=underline gui=underline guifg=#df005f guibg=#1c1c1c + +hi Cursor ctermfg=234 ctermbg=250 gui=None guifg=#1c1c1c guibg=#bcbcbc + +hi Visual ctermfg=234 ctermbg=122 gui=None guifg=#1c1c1c guibg=#87ffdf + +hi Folded ctermfg=244 ctermbg=235 gui=None guifg=#808080 guibg=#262626 +hi FoldColumn ctermfg=244 ctermbg=234 gui=None guifg=#808080 guibg=#1c1c1c + +hi IncSearch ctermfg=234 ctermbg=214 cterm=underline gui=underline guifg=#1c1c1c guibg=#ffaf00 +hi Search ctermfg=234 ctermbg=214 cterm=none gui=None guifg=#1c1c1c guibg=#ffaf00 + +hi ModeMsg ctermfg=117 ctermbg=234 cterm=bold gui=bold guifg=#87dfff guibg=#1c1c1c +hi MoreMsg ctermfg=122 ctermbg=234 cterm=none gui=None guifg=#87ffdf guibg=#1c1c1c +hi Question ctermfg=122 ctermbg=234 cterm=bold gui=bold guifg=#87ffdf guibg=#1c1c1c +hi WarningMsg ctermfg=122 ctermbg=234 cterm=none gui=None guifg=#87ffdf guibg=#1c1c1c +hi ErrorMsg ctermfg=255 ctermbg=160 cterm=none gui=None guifg=#eeeeee guibg=#df0000 +hi Error ctermfg=196 ctermbg=234 cterm=none gui=None guifg=#ff0000 guibg=#1c1c1c + +hi SpecialKey ctermfg=214 ctermbg=234 gui=None guifg=#ffaf00 guibg=#1c1c1c +hi Title ctermfg=075 ctermbg=234 cterm=bold gui=bold guifg=#5fafff guibg=#1c1c1c +hi Directory ctermfg=117 ctermbg=234 cterm=bold gui=bold guifg=#87dfff guibg=#1c1c1c + +hi SignColumn ctermfg=214 ctermbg=235 gui=None guifg=#ffaf00 guibg=#262626 + +hi WildMenu ctermfg=075 ctermbg=235 cterm=bold gui=bold guifg=#5fafff guibg=#262626 + +if version >= 700 " Vim 7.x specific colors + hi CursorLine ctermbg=235 cterm=none gui=None guibg=#262626 + hi CursorColumn ctermbg=235 cterm=none gui=None guibg=#262626 + + hi MatchParen ctermfg=196 ctermbg=234 cterm=bold,reverse gui=bold,reverse guifg=#ff0000 guibg=#1c1c1c + + hi Tabline ctermfg=245 ctermbg=235 cterm=underline gui=underline guifg=#8a8a8a guibg=#262626 + hi TablineSel ctermfg=250 ctermbg=234 cterm=bold gui=bold guifg=#bcbcbc guibg=#1c1c1c + hi TablineFill ctermfg=250 ctermbg=237 cterm=underline gui=underline guifg=#bcbcbc guibg=#3a3a3a + + hi Pmenu ctermfg=250 ctermbg=235 cterm=none gui=None guifg=#bcbcbc guibg=#262626 + hi PmenuSel ctermfg=117 ctermbg=234 cterm=underline gui=underline guifg=#87dfff guibg=#1c1c1c + hi PmenuSbar ctermfg=116 ctermbg=234 cterm=none gui=None guifg=#87dfdf guibg=#1c1c1c + hi PmenuThumb ctermfg=116 ctermbg=116 cterm=none gui=None guifg=#87dfdf guibg=#87dfdf + + hi SpellBad ctermfg=198 ctermbg=234 cterm=underline gui=underline guifg=#ff0087 guibg=#1c1c1c + hi SpellCap ctermfg=198 ctermbg=234 cterm=none gui=None guifg=#ff0087 guibg=#1c1c1c + hi SpellRare ctermfg=198 ctermbg=234 cterm=none gui=None guifg=#ff0087 guibg=#1c1c1c + hi SpellLocal ctermfg=198 ctermbg=234 cterm=none gui=None guifg=#ff0087 guibg=#1c1c1c +endif + +if version >= 703 " Vim 7.3 specific colors + hi ColorColumn ctermbg=235 gui=None guibg=#262626 +endif + +" syntax highlighting groups +hi Comment ctermfg=240 ctermbg=234 gui=None guifg=#585858 guibg=#1c1c1c +hi Constant ctermfg=086 ctermbg=234 gui=None guifg=#5fffdf guibg=#1c1c1c +hi Identifier ctermfg=080 ctermbg=234 cterm=bold gui=bold guifg=#5fdfdf guibg=#1c1c1c +hi String ctermfg=074 ctermbg=234 gui=None guifg=#5fafdf guibg=#1c1c1c +hi Statement ctermfg=159 ctermbg=234 cterm=none gui=None guifg=#afffff guibg=#1c1c1c +hi PreProc ctermfg=122 ctermbg=234 gui=None guifg=#87ffdf guibg=#1c1c1c +hi Function ctermfg=121 ctermbg=234 cterm=bold gui=bold guifg=#87ffaf guibg=#1c1c1c +hi Type ctermfg=117 ctermbg=234 cterm=bold gui=bold guifg=#87dfff guibg=#1c1c1c +hi Special ctermfg=050 ctermbg=234 gui=None guifg=#00ffdf guibg=#1c1c1c +hi Delimiter ctermfg=153 ctermbg=234 gui=None guifg=#afdfff guibg=#1c1c1c +hi Number ctermfg=086 ctermbg=234 gui=None guifg=#5fffdf guibg=#1c1c1c +hi Ignore ctermfg=214 ctermbg=234 gui=None guifg=#ffaf00 guibg=#1c1c1c +hi Todo ctermfg=196 ctermbg=234 gui=None guifg=#ff0000 guibg=#1c1c1c +hi Exception ctermfg=080 ctermbg=234 cterm=bold gui=bold guifg=#5fdfdf guibg=#1c1c1c + +"vim: sw=4 diff --git a/vim/colors/smarties.vim b/vim/colors/smarties.vim new file mode 100644 index 0000000..61a865f --- /dev/null +++ b/vim/colors/smarties.vim @@ -0,0 +1,503 @@ +" Vim color file +" +" "A dark and colorful color scheme for Vim." +" +" Inspired by jellybeans.vim (https://github.com/nanotech/jellybeans.vim) +" +" File: smarties.vim +" URL: github.com/justb3a/smarties.vim +" Last Change: September 21th, 2016 +" License: MIT + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "smarties" + +if has("gui_running") || &t_Co == 88 || &t_Co == 256 + let s:low_color = 0 +else + let s:low_color = 1 +endif + +" returns an approximate grey index for the given grey level +fun! s:grey_number(x) + if &t_Co == 88 + if a:x < 23 + return 0 + elseif a:x < 69 + return 1 + elseif a:x < 103 + return 2 + elseif a:x < 127 + return 3 + elseif a:x < 150 + return 4 + elseif a:x < 173 + return 5 + elseif a:x < 196 + return 6 + elseif a:x < 219 + return 7 + elseif a:x < 243 + return 8 + else + return 9 + endif + else + if a:x < 14 + return 0 + else + let l:n = (a:x - 8) / 10 + let l:m = (a:x - 8) % 10 + if l:m < 5 + return l:n + else + return l:n + 1 + endif + endif + endif +endfun + +" returns the actual grey level represented by the grey index +fun! s:grey_level(n) + if &t_Co == 88 + if a:n == 0 + return 0 + elseif a:n == 1 + return 46 + elseif a:n == 2 + return 92 + elseif a:n == 3 + return 115 + elseif a:n == 4 + return 139 + elseif a:n == 5 + return 162 + elseif a:n == 6 + return 185 + elseif a:n == 7 + return 208 + elseif a:n == 8 + return 231 + else + return 255 + endif + else + if a:n == 0 + return 0 + else + return 8 + (a:n * 10) + endif + endif +endfun + +" returns the palette index for the given grey index +fun! s:grey_color(n) + if &t_Co == 88 + if a:n == 0 + return 16 + elseif a:n == 9 + return 79 + else + return 79 + a:n + endif + else + if a:n == 0 + return 16 + elseif a:n == 25 + return 231 + else + return 231 + a:n + endif + endif +endfun + +" returns an approximate color index for the given color level +fun! s:rgb_number(x) + if &t_Co == 88 + if a:x < 69 + return 0 + elseif a:x < 172 + return 1 + elseif a:x < 230 + return 2 + else + return 3 + endif + else + if a:x < 75 + return 0 + else + let l:n = (a:x - 55) / 40 + let l:m = (a:x - 55) % 40 + if l:m < 20 + return l:n + else + return l:n + 1 + endif + endif + endif +endfun + +" returns the actual color level for the given color index +fun! s:rgb_level(n) + if &t_Co == 88 + if a:n == 0 + return 0 + elseif a:n == 1 + return 139 + elseif a:n == 2 + return 205 + else + return 255 + endif + else + if a:n == 0 + return 0 + else + return 55 + (a:n * 40) + endif + endif +endfun + +" returns the palette index for the given R/G/B color indices +fun! s:rgb_color(x, y, z) + if &t_Co == 88 + return 16 + (a:x * 16) + (a:y * 4) + a:z + else + return 16 + (a:x * 36) + (a:y * 6) + a:z + endif +endfun + +" returns the palette index to approximate the given R/G/B color levels +fun! s:color(r, g, b) + " get the closest grey + let l:gx = s:grey_number(a:r) + let l:gy = s:grey_number(a:g) + let l:gz = s:grey_number(a:b) + + " get the closest color + let l:x = s:rgb_number(a:r) + let l:y = s:rgb_number(a:g) + let l:z = s:rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " there are two possibilities + let l:dgr = s:grey_level(l:gx) - a:r + let l:dgg = s:grey_level(l:gy) - a:g + let l:dgb = s:grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = s:rgb_level(l:gx) - a:r + let l:dg = s:rgb_level(l:gy) - a:g + let l:db = s:rgb_level(l:gz) - a:b + let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) + if l:dgrey < l:drgb + " use the grey + return s:grey_color(l:gx) + else + " use the color + return s:rgb_color(l:x, l:y, l:z) + endif + else + " only one possibility + return s:rgb_color(l:x, l:y, l:z) + endif +endfun + +" returns the palette index to approximate the 'rrggbb' hex string +fun! s:rgb(rgb) + let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 + let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 + let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 + return s:color(l:r, l:g, l:b) +endfun + +" sets the highlighting for the given group +fun! s:X(group, fg, bg, attr, lcfg, lcbg) + if s:low_color + let l:fge = empty(a:lcfg) + let l:bge = empty(a:lcbg) + + if !l:fge && !l:bge + exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg + elseif !l:fge && l:bge + exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE" + elseif l:fge && !l:bge + exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg + endif + else + let l:fge = empty(a:fg) + let l:bge = empty(a:bg) + + if !l:fge && !l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg) + elseif !l:fge && l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE" + elseif l:fge && !l:bge + exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg) + endif + endif + + if a:attr == "" + exec "hi ".a:group." gui=none cterm=none" + else + let l:noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",") + if empty(l:noitalic) + let l:noitalic = "none" + endif + exec "hi ".a:group." gui=".a:attr." cterm=".l:noitalic + endif +endfun +" }}} + +if !exists("g:smarties_background_color") + let g:smarties_background_color = "151515" +end + +call s:X("Normal","3366ff",g:smarties_background_color,"","Blue","") " keep +set background=dark + +if !exists("g:smarties_use_lowcolor_black") || g:jellybeans_use_lowcolor_black + let s:termBlack = "Black" +else + let s:termBlack = "Grey" +endif + +if version >= 700 + call s:X("CursorLine","","1c1c1c","","",s:termBlack) + call s:X("CursorColumn","","1c1c1c","","",s:termBlack) + call s:X("MatchParen","ffffff","80a090","bold","","DarkCyan") + + call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack) + call s:X("TabLineFill","9098a0","","","",s:termBlack) + call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White") + + " Auto-completion + call s:X("Pmenu","ffffff","606060","","White",s:termBlack) + call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White") +endif + +call s:X("Visual","","404040","","",s:termBlack) +call s:X("Cursor","","b0d0f0","","","") + +call s:X("LineNr","605958",g:smarties_background_color,"none",s:termBlack,"") +call s:X("CursorLineNr","ccc5c4","","none","White","") +call s:X("Comment","888888","","italic","Grey","") +call s:X("Todo","c7c7c7","","bold","White",s:termBlack) + +call s:X("StatusLine","000000","dddddd","italic","","White") +call s:X("StatusLineNC","ffffff","403c41","italic","White","Black") +call s:X("VertSplit","777777","403c41","",s:termBlack,s:termBlack) +call s:X("WildMenu","f0a0c0","302028","","Magenta","") + +call s:X("Folded","a0a8b0","384048","italic",s:termBlack,"") +call s:X("FoldColumn","535D66","1f1f1f","","",s:termBlack) +call s:X("SignColumn","777777","333333","","",s:termBlack) +call s:X("ColorColumn","","000000","","",s:termBlack) + +call s:X("Title","70b950","","bold","Green","") + +call s:X("Constant","cf6a4c","","","Red","") +call s:X("Special","ff0000","","","Red","") +call s:X("Delimiter","ff0000","","","Red","") + +call s:X("String","39a252","","","Green","") +call s:X("StringDelimiter","556633","","","DarkGreen","") + +call s:X("Identifier","33ccff","","","DarkCyan","") +call s:X("Structure","8fbfdc","","","LightBlue","") +call s:X("Function","fae368","","","Yellow","") +call s:X("Statement","ff33cc","","","Pink","") +call s:X("PreProc","69bfe8","","","StrongBlue","") + +hi! link Operator Normal + +call s:X("Type","ff9933","","","Orange","") +call s:X("NonText","606060",g:smarties_background_color,"",s:termBlack,"") + +call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") + +call s:X("Search","f0a0c0","302028","underline","Magenta","") + +call s:X("Directory","dad085","","","Yellow","") +call s:X("ErrorMsg","","902020","","","DarkRed") +hi! link Error ErrorMsg +hi! link MoreMsg Special +call s:X("Question","65C254","","","Green","") + + +" Spell Checking + +call s:X("SpellBad","","902020","underline","","DarkRed") +call s:X("SpellCap","","0000df","underline","","Blue") +call s:X("SpellRare","","540063","underline","","DarkMagenta") +call s:X("SpellLocal","","2D7067","underline","","Green") + +" Diff + +hi! link diffRemoved Constant +hi! link diffAdded String + +" VimDiff + +call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen") +call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed") +call s:X("DiffChange","","2B5B77","","White","DarkBlue") +call s:X("DiffText","8fbfdc","000000","reverse","Yellow","") + +" PHP + +hi! link phpFunctions Function +call s:X("StorageClass","c59f6f","","","Red","") +hi! link phpSuperglobal Identifier +hi! link phpQuoteSingle StringDelimiter +hi! link phpQuoteDouble StringDelimiter +hi! link phpBoolean Constant +hi! link phpNull Constant +hi! link phpArrayPair Operator + +" Python + +hi! link pythonOperator Statement + +" Ruby + +hi! link rubySharpBang Comment +call s:X("rubyClass","447799","","","DarkBlue","") +call s:X("rubyIdentifier","c6b6fe","","","Cyan","") +hi! link rubyConstant Type +hi! link rubyFunction Function + +call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","") +call s:X("rubySymbol","7697d6","","","Blue","") +hi! link rubyGlobalVariable rubyInstanceVariable +hi! link rubyModule rubyClass +call s:X("rubyControl","7597c6","","","Blue","") + +hi! link rubyString String +hi! link rubyStringDelimiter StringDelimiter +hi! link rubyInterpolationDelimiter Identifier + +call s:X("rubyRegexpDelimiter","540063","","","Magenta","") +call s:X("rubyRegexp","dd0093","","","DarkMagenta","") +call s:X("rubyRegexpSpecial","a40073","","","Magenta","") + +call s:X("rubyPredefinedIdentifier","de5577","","","Red","") + +" Erlang + +hi! link erlangAtom rubySymbol +hi! link erlangBIF rubyPredefinedIdentifier +hi! link erlangFunction rubyPredefinedIdentifier +hi! link erlangDirective Statement +hi! link erlangNode Identifier + +" JavaScript + +hi! link javaScriptValue Constant +hi! link javaScriptRegexpString rubyRegexp + +" CoffeeScript + +hi! link coffeeRegExp javaScriptRegexpString + +" Lua + +hi! link luaOperator Conditional + +" C + +hi! link cFormat Identifier +hi! link cOperator Constant + +" Objective-C/Cocoa + +hi! link objcClass Type +hi! link cocoaClass objcClass +hi! link objcSubclass objcClass +hi! link objcSuperclass objcClass +hi! link objcDirective rubyClass +hi! link objcStatement Constant +hi! link cocoaFunction Function +hi! link objcMethodName Identifier +hi! link objcMethodArg Normal +hi! link objcMessageName Identifier + +" Debugger.vim + +call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue") +call s:X("DbgBreakPt","","4F0037","","","DarkMagenta") + +" vim-indent-guides + +if !exists("g:indent_guides_auto_colors") + let g:indent_guides_auto_colors = 0 +endif +call s:X("IndentGuidesOdd","","232323","","","") +call s:X("IndentGuidesEven","","1b1b1b","","","") + +" Plugins, etc. + +hi! link TagListFileName Directory +call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") + +if !exists("g:smarties_background_color_256") + let g:smarties_background_color_256=233 +end +" Manual overrides for 256-color terminals. Dark colors auto-map badly. +if !s:low_color + hi StatusLineNC ctermbg=235 + hi Folded ctermbg=236 + hi FoldColumn ctermbg=234 + hi SignColumn ctermbg=236 + hi CursorColumn ctermbg=234 + hi CursorLine ctermbg=234 + hi SpecialKey ctermbg=234 + exec "hi NonText ctermbg=".g:smarties_background_color_256 + exec "hi LineNr ctermbg=".g:smarties_background_color_256 + hi DiffText ctermfg=81 + exec "hi Normal ctermbg=".g:smarties_background_color_256 + hi DbgBreakPt ctermbg=53 + hi IndentGuidesOdd ctermbg=235 + hi IndentGuidesEven ctermbg=234 +endif + +if exists("g:smarties_overrides") + fun! s:load_colors(defs) + for [l:group, l:v] in items(a:defs) + call s:X(l:group, get(l:v, 'guifg', ''), get(l:v, 'guibg', ''), + \ get(l:v, 'attr', ''), + \ get(l:v, 'ctermfg', ''), get(l:v, 'ctermbg', '')) + if !s:low_color + for l:prop in ['ctermfg', 'ctermbg'] + let l:override_key = '256'.l:prop + if has_key(l:v, l:override_key) + exec "hi ".l:group." ".l:prop."=".l:v[l:override_key] + endif + endfor + endif + unlet l:group + unlet l:v + endfor + endfun + call s:load_colors(g:smarties_overrides) + delf s:load_colors +endif + +" delete functions {{{ +delf s:X +delf s:rgb +delf s:color +delf s:rgb_color +delf s:rgb_level +delf s:rgb_number +delf s:grey_color +delf s:grey_level +delf s:grey_number +" }}} diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..31fd659 --- /dev/null +++ b/vimrc @@ -0,0 +1,36 @@ +call plug#begin() + Plug 'dense-analysis/ale' + Plug 'rodjek/vim-puppet' + Plug 'itchyny/lightline.vim' + Plug 'gerases/vim-rspec-puppet' +call plug#end() + +let g:ale_sh_shellcheck_options = '-s bash' +let g:ale_fixers = {'python': ['black', 'isort']} +let g:ale_completion_enabled = 1 +let g:lightline = { + \ 'colorscheme': 'wombat', + \ } +nnoremap t :call Run_Spec() +nnoremap rl :call Run_Spec(line('.')) +nnoremap A :ALEFix +nnoremap yoA :ALEToggle +nnoremap [W :ALEFirst +nnoremap ]W :ALELast +nnoremap [w :ALEPrevious +nnoremap ]w :ALENext +" sort in visual using tab +vnoremap :sort +nmap gd :ALEGoToDefinition +nmap gr :ALEFindReferences +let g:ale_sign_column_always=1 +let g:ale_change_sign_column_color=1 +:highlight SignColumn ctermbg=238 +set laststatus=2 +set paste +"colorscheme google +"colorscheme smarties +"colorscheme ego +"colorscheme madeofcode +"colorscheme h80 +colorscheme badwolf diff --git a/xinitrc b/xinitrc new file mode 100644 index 0000000..c80e785 --- /dev/null +++ b/xinitrc @@ -0,0 +1,68 @@ +#!/bin/sh +#--------------------------- +#-- .xinitrc -- +#-- by shane -- +#-- CC BY-SA 3.0 -- +#--------------------------- + +# numlock +numlockx & + +# Merge custom X resources +if [ -f $HOME/.Xresources ]; then + xrdb -merge ~/.Xresources +fi + +# volumeicon +volumeicon & + +# clipboard mabager +greenclip daemon & + +# xfce power manager +xfce4-power-manager & + +# autolock +xautolock -locker i3lock-fancy -time 10 & + +# connection manager +wicd-client --tray & + +# backlight setting +xbacklight -set 50 + +# http://unix.stackexchange.com/a/295652/88209 +source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh + +# set xxkbmap before to apply custom keyboard mapping +setxkbmap it + +# custom keyboard mapping +if [ -f $HOME/.Xmodmap ]; then + /usr/bin/xmodmap $HOME/.Xmodmap +fi + +# single press of control to escape https://github.com/alols/xcape +xcape -e 'Control_L=Escape' + +# hide unused mouse +unclutter & + +# gnome-keyring +eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) +export SSH_AUTH_SOCK + +# geoclue agent +/usr/lib/geoclue-2.0/demos/agent & + +# qt5ct theming +export QT_QPA_PLATFORMTHEME=qt5ct + +# workrave +workrave & + +# check monitors status and set monitor setup +autorandr -c + +# wm +exec /usr/bin/awesome