diff --git a/bin/aws/configure b/bin/aws/configure index a93dfe5..0212ec8 100755 --- a/bin/aws/configure +++ b/bin/aws/configure @@ -1,5 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env/env.zsh" +source "$HOME/.config/wryn/env.zsh" source $ZSH_COLOR_UTIL ##################################################################### diff --git a/bin/aws/s3/sync-media b/bin/aws/s3/sync-media index 21f367a..3453256 100755 --- a/bin/aws/s3/sync-media +++ b/bin/aws/s3/sync-media @@ -1,5 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env/env.zsh" +source "$HOME/.config/wryn/env.zsh" source $ZSH_COLOR_UTIL ##################################################################### @@ -10,8 +10,8 @@ case $1 in esac case $2 in - nodelete ) NODELETE=1 ;; # whether or not to pass '--delete' to s3 sync - # default is --delete + delete ) DELETE=1 ;; # whether or not to pass '--delete' to s3 sync + # default is not to delete esac [ ! $PULL ] && [ ! $PUSH ] && FATAL 'must specify "pull" or "push"' @@ -25,8 +25,8 @@ PULL_MEDIA() { [ ! -d $LOCAL_TARGET ] && mkdir -p $LOCAL_TARGET - local NO_DELETE="$2" - [ ! $NO_DELETE ] && FLAGS=--delete + local DELETE="$2" + [ $DELETE ] && FLAGS=--delete CHECK "downloading latest $1" aws --profile $DOTWRYN_AWS_PROFILE \ @@ -40,8 +40,8 @@ PUSH_MEDIA() { local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1" local LOCAL_TARGET="$HOME/$1" - local NO_DELETE="$2" - [ ! $NO_DELETE ] && FLAGS=--delete + local DELETE="$2" + [ $DELETE ] && FLAGS=--delete CHECK "uploading $1" aws --profile $DOTWRYN_AWS_PROFILE \ @@ -53,6 +53,6 @@ PUSH_MEDIA() { for m in $S3_SYNC_MEDIA do - [ $PULL ] && PULL_MEDIA $m $NODELETE - [ $PUSH ] && PUSH_MEDIA $m $NODELETE + [ $PULL ] && PULL_MEDIA $m $DELETE + [ $PUSH ] && PUSH_MEDIA $m $DELETE done diff --git a/bin/backlight b/bin/backlight new file mode 100755 index 0000000..02e9c3e --- /dev/null +++ b/bin/backlight @@ -0,0 +1,19 @@ +#!/bin/zsh +source $HOME/.config/wryn/env.zsh + +case $1 in + up ) + xbacklight + 10 \ + || gmux_backlight +100 + ;; + down ) + xbacklight - 10 \ + || gmux_backlight -100 + ;; + * ) + echo 'must specify "up" or "down"' + exit 1 + ;; +esac + +PLAY_SFX backlight diff --git a/bin/tmux/bg-apps/apps b/bin/bg-apps/apps similarity index 95% rename from bin/tmux/bg-apps/apps rename to bin/bg-apps/apps index af4bfee..07fee2e 100755 --- a/bin/tmux/bg-apps/apps +++ b/bin/bg-apps/apps @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/bin/zsh tmux new -d -s apps -n 'foreman' 'htop' \; \ split-window -d -t apps:foreman "while true; do clear; ${0:a:h}/apps; echo 'Keeping apps fresh...'; sleep 30; done" \ diff --git a/bin/tmux/bg-apps/midi b/bin/bg-apps/midi similarity index 86% rename from bin/tmux/bg-apps/midi rename to bin/bg-apps/midi index 3f3c137..bb6ecd6 100755 --- a/bin/tmux/bg-apps/midi +++ b/bin/bg-apps/midi @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/bin/zsh cd $HOME/Projects/gizmos/xorg-midi/code source ../env/bin/activate diff --git a/bin/desktop/feh/randomize-background.sh b/bin/desktop/feh/randomize-background.sh deleted file mode 100755 index 9e63831..0000000 --- a/bin/desktop/feh/randomize-background.sh +++ /dev/null @@ -1,4 +0,0 @@ -source "$HOME/.config/wryn/env/env.zsh" - -[ -d "$WALLPAPER_PATH" ] \ - && feh --recursive --randomize --bg-fill "$WALLPAPER_PATH"; diff --git a/bin/desktop/gmux-backlight/down.sh b/bin/desktop/gmux-backlight/down.sh deleted file mode 100755 index 7ea3dd4..0000000 --- a/bin/desktop/gmux-backlight/down.sh +++ /dev/null @@ -1 +0,0 @@ -gmux_backlight -100 diff --git a/bin/desktop/gmux-backlight/up.sh b/bin/desktop/gmux-backlight/up.sh deleted file mode 100755 index 83f5a21..0000000 --- a/bin/desktop/gmux-backlight/up.sh +++ /dev/null @@ -1 +0,0 @@ -gmux_backlight +100 diff --git a/bin/desktop/i3/launch-all-scratchpad-applications.sh b/bin/desktop/i3/launch-all-scratchpad-applications.sh deleted file mode 100755 index 6463521..0000000 --- a/bin/desktop/i3/launch-all-scratchpad-applications.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/zsh - -APPLICATION_BIN="$HOME/.config/wryn/default-applications" -APPLICATION_CLASSES=( - 'audio ^Audio$' - 'scrcpy ^scrcpy$' - 'discord ^discord$' - 'email ^Thunderbird$' - 'media ^youtubemusic-nativefier' - 'message ^android-messages-desktop$' - 'phone ^google-voice-desktop' - 'slack ^Slack$' - ) - -for APP_CLS_STR in $APPLICATION_CLASSES; do - APPLICATION_CLASS=($(echo $APP_CLS_STR)) - APPLICATION=${APPLICATION_CLASS[1]} - CLIENT_CLASS=${APPLICATION_CLASS[2]} - - echo "launching $APPLICATION_BIN/$APPLICATION" - xdotool search --class "$CLIENT_CLASS" >/dev/null 2>&1 && echo "found existing" || { - i3-msg "exec --no-startup-id $APPLICATION_BIN/$APPLICATION;" - } -done - -sleep 10; - -for APP_CLS_STR in $APPLICATION_CLASSES; do - APPLICATION_CLASS=($(echo $APP_CLS_STR)) - CLIENT_CLASS=${APPLICATION_CLASS[2]} - echo "hiding application $CLIENT_CLASS" - i3-msg "[class=$CLIENT_CLASS] move scratchpad"; -done diff --git a/bin/desktop/i3/launch-or-show-application.sh b/bin/desktop/i3/launch-or-show-application.sh deleted file mode 100755 index 45b0189..0000000 --- a/bin/desktop/i3/launch-or-show-application.sh +++ /dev/null @@ -1,30 +0,0 @@ -CLIENT_CLASS="$1" -APPLICATION="$2" - -echo "client class:'$CLIENT_CLASS'" -echo "application :'$APPLICATION'" - -xdotool search --class "$CLIENT_CLASS" >/dev/null 2>&1 || { - i3-msg "exec --no-startup-id $APPLICATION;" -} - -XFFSET=0.0 -YFFSET=0.0 -FACTOR=0.8 -case $(basename $APPLICATION) in - audio ) FACTOR=0.4 YFFSET=200 ;; - email ) FACTOR=0.8 XFFSET=-200 ;; -esac - -WINDOW_SIZE=$(\ - xrandr \ - | grep 'connected primary' \ - | sed 's/.*connected primary \([^x]*\)x\([^+]*\).*/\1 \2/' \ - | awk -v f=$FACTOR -v x=$XFFSET -v y=$YFFSET \ - '{print int($1*f+x)," ",int($2*f+y);}'\ -) - -i3-msg "[class=$CLIENT_CLASS] move scratchpad" -i3-msg "[class=$CLIENT_CLASS] resize set $WINDOW_SIZE" -i3-msg "[class=$CLIENT_CLASS] scratchpad show" -i3-msg "[class=$CLIENT_CLASS] move position center" diff --git a/bin/desktop/kitty/alternate-terminal.sh b/bin/desktop/kitty/alternate-terminal.sh deleted file mode 100755 index d81bf66..0000000 --- a/bin/desktop/kitty/alternate-terminal.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -source "$HOME/.config/wryn/env/env.zsh" - -CONFIG_DIR="$DOTWRYN/config/kitty" - -[ -f "$CONFIG_DIR/temp.conf" ] && return 1 # race condition lock - -mv "$CONFIG_DIR/theme.conf" "$CONFIG_DIR/temp.conf" -mv "$CONFIG_DIR/alternate.conf" "$CONFIG_DIR/theme.conf" - -i3-sensible-terminal & -sleep 0.1 - -mv "$CONFIG_DIR/theme.conf" "$CONFIG_DIR/alternate.conf" -mv "$CONFIG_DIR/temp.conf" "$CONFIG_DIR/theme.conf" diff --git a/bin/desktop/pulseaudio/sink-volume/default-down.sh b/bin/desktop/pulseaudio/sink-volume/default-down.sh deleted file mode 100755 index faf6a93..0000000 --- a/bin/desktop/pulseaudio/sink-volume/default-down.sh +++ /dev/null @@ -1,2 +0,0 @@ -pactl set-sink-volume @DEFAULT_SINK@ -10% -$HOME/.config/wryn/sfx volume & diff --git a/bin/desktop/pulseaudio/sink-volume/default-mute.sh b/bin/desktop/pulseaudio/sink-volume/default-mute.sh deleted file mode 100755 index 791fa92..0000000 --- a/bin/desktop/pulseaudio/sink-volume/default-mute.sh +++ /dev/null @@ -1,3 +0,0 @@ -pactl set-sink-mute @DEFAULT_SINK@ toggle -$HOME/.config/wryn/sfx mute & -notify-send 'Default Sink' "$(amixer sget Master | grep -q '\[on\]' && echo unmuted || echo muted)" diff --git a/bin/desktop/pulseaudio/sink-volume/default-up.sh b/bin/desktop/pulseaudio/sink-volume/default-up.sh deleted file mode 100755 index 1817e23..0000000 --- a/bin/desktop/pulseaudio/sink-volume/default-up.sh +++ /dev/null @@ -1,2 +0,0 @@ -pactl set-sink-volume @DEFAULT_SINK@ +10% -$HOME/.config/wryn/sfx volume & diff --git a/bin/desktop/pulseaudio/source-volume/default-mute.sh b/bin/desktop/pulseaudio/source-volume/default-mute.sh deleted file mode 100755 index 516771b..0000000 --- a/bin/desktop/pulseaudio/source-volume/default-mute.sh +++ /dev/null @@ -1 +0,0 @@ -pactl set-source-mute @DEFAULT_SOURCE@ toggle diff --git a/bin/desktop/xbacklight/down.sh b/bin/desktop/xbacklight/down.sh deleted file mode 100755 index 11cc72e..0000000 --- a/bin/desktop/xbacklight/down.sh +++ /dev/null @@ -1,2 +0,0 @@ -$HOME/.config/wryn/sfx backlight & -xbacklight - 10 diff --git a/bin/desktop/xbacklight/up.sh b/bin/desktop/xbacklight/up.sh deleted file mode 100755 index 5c3a858..0000000 --- a/bin/desktop/xbacklight/up.sh +++ /dev/null @@ -1,2 +0,0 @@ -$HOME/.config/wryn/sfx backlight & -xbacklight + 10 diff --git a/bin/desktop/youtube-music/controller.sh b/bin/desktop/youtube-music/controller.sh deleted file mode 100755 index f41a757..0000000 --- a/bin/desktop/youtube-music/controller.sh +++ /dev/null @@ -1,19 +0,0 @@ -# -# Chrome / YouTube only accepts keypresses when window is active -# -# This activates the YouTube window and sends the keypress -# - -xdotool search --name 'YouTube Music' >/dev/null 2>&1 || return 1; - -TIMEOUT='0.3'; - -case $1 in - next) KEY_COMMAND='j';; - prev) KEY_COMMAND='k';; - *) KEY_COMMAND='space';; -esac - -xdotool search --name 'YouTube Music' windowactivate; -sleep $TIMEOUT; -xdotool key --clearmodifiers "$KEY_COMMAND"; diff --git a/bin/desktop/youtube-music/next.sh b/bin/desktop/youtube-music/next.sh deleted file mode 100755 index 12281a9..0000000 --- a/bin/desktop/youtube-music/next.sh +++ /dev/null @@ -1,3 +0,0 @@ -source "$HOME/.config/wryn/env/env.zsh" - -"$DOTWRYN/bin/desktop/youtube-music/controller.sh" next diff --git a/bin/desktop/youtube-music/playpause.sh b/bin/desktop/youtube-music/playpause.sh deleted file mode 100755 index f83e0bd..0000000 --- a/bin/desktop/youtube-music/playpause.sh +++ /dev/null @@ -1,3 +0,0 @@ -source "$HOME/.config/wryn/env/env.zsh" - -"$DOTWRYN/bin/desktop/youtube-music/controller.sh" playpause diff --git a/bin/desktop/youtube-music/previous.sh b/bin/desktop/youtube-music/previous.sh deleted file mode 100755 index fce634d..0000000 --- a/bin/desktop/youtube-music/previous.sh +++ /dev/null @@ -1,3 +0,0 @@ -source "$HOME/.config/wryn/env/env.zsh" - -"$DOTWRYN/bin/desktop/youtube-music/controller.sh" prev diff --git a/bin/desktop/youtube-music/return-controller.sh b/bin/desktop/youtube-music/return-controller.sh deleted file mode 100755 index 57ae275..0000000 --- a/bin/desktop/youtube-music/return-controller.sh +++ /dev/null @@ -1,26 +0,0 @@ -# -# Chrome / YouTube only accepts keypresses when window is active -# -# This activates the YouTube window, sends the keypress, then reactivates the original window -# - -xdotool search --name 'YouTube Music' >/dev/null 2>&1 || return 1; - -ACTIVE_DESKTOP="$(xdotool get_desktop)" -ACTIVE_WINDOW_ID="$(xdotool getactivewindow)" -ACTIVE_WINDOW_NAME="$(xdotool getwindowname $ACTIVE_WINDOW_ID)" - -TIMEOUT='0.1'; - -case $1 in - next) KEY_COMMAND='j';; - prev) KEY_COMMAND='k';; - *) KEY_COMMAND='space';; -esac - -xdotool search --name 'YouTube Music' windowactivate; -sleep $TIMEOUT; -xdotool key --clearmodifiers "$KEY_COMMAND"; - -xdotool set_desktop "$ACTIVE_DESKTOP"; -[[ "$ACTIVE_WINDOW_NAME" != "Desktop" ]] && xdotool windowactivate "$ACTIVE_WINDOW_ID"; diff --git a/bin/i3/launch-or-show b/bin/i3/launch-or-show new file mode 100755 index 0000000..ac238f6 --- /dev/null +++ b/bin/i3/launch-or-show @@ -0,0 +1,49 @@ +#!/bin/zsh +##################################################################### + +USAGE="$0 APPLICATION CLIENT_CLASS" + +function ERROR() { + local ERROR_CODE=$1 + local MESSAGE="$2" + + echo -e "$MESSAGE\n\nUSAGE : $USAGE\n" >&2 + + [ $MESSAGE ] && notify-send "Application Launcher" "$MESSAGE" + exit $ERROR_CODE +} + +##################################################################### + +APPLICATION="$1" +which $APPLICATION >/dev/null 2>&1 \ + || ERROR 2 "Application '$APPLICATION' not found" + +CLIENT_CLASS="${@:2}" +[ ! $CLIENT_CLASS ] && CLIENT_CLASS="$APPLICATION" + + +XFFSET=0.0 +YFFSET=0.0 +FACTOR=0.8 +case $APPLICATION in + pavucontrol ) FACTOR=0.4 YFFSET=200 ;; +esac + + +xdotool search --class "$CLIENT_CLASS" >/dev/null 2>&1 || { + i3-msg "exec --no-startup-id $APPLICATION;" +} + +WINDOW_SIZE=$(\ + xrandr \ + | grep 'connected primary' \ + | sed 's/.*connected primary \([^x]*\)x\([^+]*\).*/\1 \2/' \ + | awk -v f=$FACTOR -v x=$XFFSET -v y=$YFFSET \ + '{print int($1*f+x)," ",int($2*f+y);}'\ +) + +i3-msg "[class=$CLIENT_CLASS] move scratchpad" +i3-msg "[class=$CLIENT_CLASS] resize set $WINDOW_SIZE" +i3-msg "[class=$CLIENT_CLASS] scratchpad show" +i3-msg "[class=$CLIENT_CLASS] move position center" diff --git a/bin/desktop/i3/logout.sh b/bin/i3/logout similarity index 92% rename from bin/desktop/i3/logout.sh rename to bin/i3/logout index 876cbb8..27444d3 100755 --- a/bin/desktop/i3/logout.sh +++ b/bin/i3/logout @@ -1,3 +1,4 @@ +#!/bin/zsh i3-nagbar \ -t warning \ -m 'Do you really want to exit i3?' \ diff --git a/bin/i3/update-local-config b/bin/i3/update-local-config index 84fe75b..8564e8f 100755 --- a/bin/i3/update-local-config +++ b/bin/i3/update-local-config @@ -1,5 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env/env.zsh" +source "$HOME/.config/wryn/env.zsh" source $ZSH_COLOR_UTIL ##################################################################### @@ -14,7 +14,7 @@ BORDER_PIXEL_SIZE="$3" LOCAL_CONFIG="$HOME/.config/i3/config" -MODEL_CONFIG="$DOTWRYN/config/i3/config" +MODEL_CONFIG="$DOTWRYN/config/i3.conf" REGEX_FONT='^\(font [^0-9]*\)\(.*\)' REGEX_DMENU="^\\(.*dmenu_run .*-fn '[^0-9]*\\)\\([0-9]*\\)'" @@ -27,7 +27,7 @@ DEFAULT_BORDER_PIXEL_SIZE=$(sed -n "s/$REGEX_BORDER/\\2/p" $MODEL_CONFIG) ##################################################################### RESET_CONFIG_TO_DEFAULT() { - STATUS 'relinking config to .wryn/config/i3/config' + STATUS 'relinking default config' ln -s $MODEL_CONFIG $LOCAL_CONFIG } diff --git a/bin/i3/utils b/bin/i3/utils new file mode 100755 index 0000000..38931f7 --- /dev/null +++ b/bin/i3/utils @@ -0,0 +1,27 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" + +COMMAND=$1 +case $COMMAND in + next ) $DOTWRYN/bin/youtube-music next ;; + prev ) $DOTWRYN/bin/youtube-music prev ;; + play ) $DOTWRYN/bin/youtube-music play ;; + + volumeup ) $DOTWRYN/bin/pulseaudio sink up ;; + volumedown ) $DOTWRYN/bin/pulseaudio sink down ;; + volumemute ) $DOTWRYN/bin/pulseaudio sink mute ;; + micmute ) $DOTWRYN/bin/pulseaudio source mute ;; + + backlightup ) $DOTWRYN/bin/backlight up ;; + backlightdown ) $DOTWRYN/bin/backlight down ;; + + lock ) $DOTWRYN/bin/i3lock ;; + + bgrandomize ) $DOTWRYN/bin/randomize-background ;; + + alternateterm ) $DOTWRYN/bin/kitty/alternate-theme ;; + + logout ) $DOTWRYN/bin/i3/logout ;; + + launch ) $DOTWRYN/bin/i3/launch-or-show ${@:2} ;; +esac diff --git a/bin/desktop/i3lock/lock.sh b/bin/i3lock similarity index 60% rename from bin/desktop/i3lock/lock.sh rename to bin/i3lock index fb1844a..f6bc306 100755 --- a/bin/desktop/i3lock/lock.sh +++ b/bin/i3lock @@ -1,3 +1,4 @@ +#!/bin/zsh # requires i3lock-color INSIDE_VER='001020' RING_VER='004040' @@ -14,15 +15,15 @@ KEYREMOVE='4444ff' TIME='aaaaaa' DATE='888888' -i3lock\ - -e\ - --pass-screen-keys --pass-media-keys --pass-volume-keys --pass-power-keys\ - -B 6\ - --force-clock\ - --insidever-color=$INSIDE_VER --ringver-color=$RING_VER --verif-color=$INSIDE_VER\ - --insidewrong-color=$INSIDE_WRONG --ringwrong-color=$RING_WRONG --wrong-color=$INSIDE_WRONG\ - --inside-color=002010 --ring-color=103020\ - --line-color=$LINE\ - --time-color=$TIME --date-color=$DATE\ - --keyhl-color=$KEYDOWN --bshl-color=$KEYREMOVE\ +i3lock \ + -e \ + --pass-screen-keys --pass-media-keys --pass-volume-keys --pass-power-keys \ + -B 6 \ + --force-clock \ + --insidever-color=$INSIDE_VER --ringver-color=$RING_VER --verif-color=$INSIDE_VER \ + --insidewrong-color=$INSIDE_WRONG --ringwrong-color=$RING_WRONG --wrong-color=$INSIDE_WRONG \ + --inside-color=002010 --ring-color=103020 \ + --line-color=$LINE \ + --time-color=$TIME --date-color=$DATE \ + --keyhl-color=$KEYDOWN --bshl-color=$KEYREMOVE \ ; diff --git a/bin/kitty/alternate-theme b/bin/kitty/alternate-theme new file mode 100755 index 0000000..b4a6e72 --- /dev/null +++ b/bin/kitty/alternate-theme @@ -0,0 +1,15 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" + +function _SET_THEME() { + local THEME="$1" + local LOCAL_THEME="$HOME/.config/kitty/theme.conf" + rm -- $LOCAL_THEME + ln -s "$DOTWRYN/colorschemes/kitty.$THEME" "$LOCAL_THEME" +} + + +_SET_THEME alternate +i3-sensible-terminal & +sleep 0.1 +_SET_THEME main diff --git a/bin/desktop/sfx/play.sh b/bin/play-sound similarity index 79% rename from bin/desktop/sfx/play.sh rename to bin/play-sound index e88ed85..ac34ff9 100755 --- a/bin/desktop/sfx/play.sh +++ b/bin/play-sound @@ -1,8 +1,9 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" 2>/dev/null +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" PLAY() { eval "$MEDIA_ENGINE" "$SFX_PATH/$1" + true } case $1 in @@ -15,5 +16,7 @@ case $1 in undock ) PLAY yaru-desktop-login.oga ;; homedock ) PLAY homedock.oga ;; gamedock ) PLAY gamedock.oga ;; - * ) ls $SFX_PATH ;; + * ) + [ -f "$SFX_PATH/$1" ] && PLAY $1 || ls $SFX_PATH + ;; esac diff --git a/bin/pulseaudio b/bin/pulseaudio new file mode 100755 index 0000000..7404b8f --- /dev/null +++ b/bin/pulseaudio @@ -0,0 +1,43 @@ +#!/bin/zsh +source $HOME/.config/wryn/env.zsh +##################################################################### + +USAGE="$0 (sink|source) (up|down|mute)" + +function ERROR() { + local ERROR_CODE=$1 + local MESSAGE="$2" + + echo -e "$MESSAGE\n\nUSAGE : $USAGE\n" >&2 + + exit $ERROR_CODE +} + +##################################################################### + +DEVICE="$1" +COMMAND="$2" + +case $DEVICE in + sink | source ) ;; + * ) ERROR 1 "Unsupported device '$DEVICE'" ;; +esac + +VOLUME_INCREMENT=10% +DEFAULT_DEVICE="@DEFAULT_$(echo $DEVICE | tr '[:lower:]' '[:upper:]')@" +case $COMMAND in + up ) + pactl set-$DEVICE-volume $DEFAULT_DEVICE +$VOlUME_INCREMENT + PLAY_SFX volume + ;; + down ) + pactl set-$DEVICE-volume $DEFAULT_DEVICE -$VOlUME_INCREMENT + PLAY_SFX volume + ;; + mute ) + pactl set-$DEVICE-mute $DEFAULT_DEVICE toggle + PLAY_SFX mute + notify-send "default $DEVICE" "$(amixer sget Master | grep -q '\[on\]' && echo unmuted || echo muted)" + ;; + * ) ERROR "Unsupported command '$COMMAND'" ;; +esac diff --git a/bin/randomize-background b/bin/randomize-background new file mode 100755 index 0000000..fa79746 --- /dev/null +++ b/bin/randomize-background @@ -0,0 +1,5 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" + +[ -d "$WALLPAPER_PATH" ] \ + && feh --recursive --randomize --bg-fill "$WALLPAPER_PATH" diff --git a/bin/vim/rebuild_plugins b/bin/vim/rebuild-plugins similarity index 100% rename from bin/vim/rebuild_plugins rename to bin/vim/rebuild-plugins diff --git a/bin/vim/update_colorschemes b/bin/vim/update_colorschemes deleted file mode 100755 index a28fc95..0000000 --- a/bin/vim/update_colorschemes +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -source "$HOME/.config/wryn/env/env.zsh" - -[ ! -d "$HOME/.vim" ] && mkdir "$HOME/.vim" -[ ! -d "$HOME/.vim/colors" ] && mkdir "$HOME/.vim/colors" - -for file in $(find "$DOTWRYN/config/colorschemes/vim" -name \*.vim); do - cp $file ~/.vim/colors/; -done -echo "vim colorschemes updated" diff --git a/bin/xorg/activate-default b/bin/xorg/activate-default new file mode 100755 index 0000000..7f75e2c --- /dev/null +++ b/bin/xorg/activate-default @@ -0,0 +1,14 @@ +#!/bin/zsh +_HOSTNAME=$(hostnamectl --static) + +case $_HOSTNAME in + butterfree ) DEFAULT=undock ;; + altaria ) DEFAULT=hdmi4k ;; +esac + +LAYOUT="${0:a:h}/$_HOSTNAME/$DEFAULT" + +[ -f $LAYOUT ] && { + until xrandr -q >/dev/null 2>&1; do sleep .1; done + $LAYOUT +} diff --git a/bin/xorg/altaria/common b/bin/xorg/altaria/common new file mode 100644 index 0000000..5bc8a69 --- /dev/null +++ b/bin/xorg/altaria/common @@ -0,0 +1,2 @@ +#!/bin/zsh +source $HOME/.config/wryn/env.zsh diff --git a/bin/xorg/altaria/hdmi4k b/bin/xorg/altaria/hdmi4k new file mode 100755 index 0000000..70fe79f --- /dev/null +++ b/bin/xorg/altaria/hdmi4k @@ -0,0 +1,12 @@ +#!/bin/zsh +source ${0:a:h}/common + +xrandr \ + --output HDMI-0 \ + --primary \ + --mode 3840x2160 \ + --rotate normal \ + --pos 0x0 \ + ; + +PLAY_SFX login diff --git a/bin/xorg/butterfree/common b/bin/xorg/butterfree/common new file mode 100644 index 0000000..19ecff6 --- /dev/null +++ b/bin/xorg/butterfree/common @@ -0,0 +1,39 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" +NATIVE_MONITOR='eDP1' + +GET_PRIMARY_MONITOR() { + xrandr \ + | grep 'primary' \ + | awk '{print $1;}' \ + | head -n 1 +} + +PRIMARY_MONITOR=$(GET_PRIMARY_MONITOR) + +GET_DEFAULT_EXTERNAL_MONITOR() { + xrandr \ + | grep ' connect' \ + | awk '{print $1;}' \ + | grep -v "$NATIVE_MONITOR" \ + | head -n 1 +} +EXTERNAL_MONITOR=$(GET_DEFAULT_EXTERNAL_MONITOR) + +DISCONNECT_OTHER() { + local SFX="$1" + + for D in $(xrandr | awk '{print $1;}' | grep -v $(GET_PRIMARY_MONITOR)) + do + xrandr --output $D --off + done + + $DOTWRYN/bin/randomize-background + + [ $SFX ] && ( PLAY_SFX $SFX ) & + return 0 +} + +NOTIFY() { + notify-send 'xrandr screenlayout' $@ +} diff --git a/bin/xorg/butterfree/gamedock b/bin/xorg/butterfree/gamedock new file mode 100755 index 0000000..6e13aec --- /dev/null +++ b/bin/xorg/butterfree/gamedock @@ -0,0 +1,15 @@ +#!/bin/zsh +source ${0:a:h}/common +[ ! $PRIMARY_MONITOR ] && { + NOTIFY 'Unable to detect primary monitor' + return +} + +xrandr \ + --output $PRIMARY_MONITOR \ + --primary \ + --mode 1920x1080 \ + --rotate normal \ + --pos 0x0 \ + && DISCONNECT_OTHER gamedock \ + || NOTIFY "Unable to set '$PRIMARY_MONITOR' to 1920x1080" diff --git a/bin/xorg/butterfree/hdmidock b/bin/xorg/butterfree/hdmidock new file mode 100755 index 0000000..f1270f9 --- /dev/null +++ b/bin/xorg/butterfree/hdmidock @@ -0,0 +1,15 @@ +#!/bin/zsh +source ${0:a:h}/common +[ ! $EXTERNAL_MONITOR ] && { + NOTIFY 'No external monitor connected!' + return +} + +xrandr \ + --output $EXTERNAL_MONITOR \ + --primary \ + --auto \ + --rotate normal \ + --pos 0x0 \ + && DISCONNECT_OTHER login \ + || NOTIFY "Unable to connect '$EXTERNAL_MONITOR' to 1920x1080" diff --git a/bin/xorg/butterfree/undock b/bin/xorg/butterfree/undock new file mode 100755 index 0000000..94c973e --- /dev/null +++ b/bin/xorg/butterfree/undock @@ -0,0 +1,15 @@ +#!/bin/zsh +source ${0:a:h}/common +[ ! $NATIVE_MONITOR ] && { + NOTIFY "Must specify NATIVE_MONITOR" + return +} + +xrandr \ + --output $NATIVE_MONITOR \ + --primary \ + --mode "2560x1440" \ + --rotate normal \ + --pos 0x0 \ + && DISCONNECT_OTHER undock \ + || NOTIFY "Native monitor '$PRIMARY_MONITOR' unresponsive" diff --git a/bin/youtube-music b/bin/youtube-music new file mode 100755 index 0000000..4a01769 --- /dev/null +++ b/bin/youtube-music @@ -0,0 +1,33 @@ +#!/bin/zsh +##################################################################### + +USAGE="$0 (next|prev|playpause)" + +function ERROR() { + local ERROR_CODE=$1 + local MESSAGE="$2" + + echo -e "$MESSAGE\n\nUSAGE : $USAGE\n" >&2 + notify-send "YouTube media controller" "$MESSAGE" + + exit $ERROR_CODE +} + +##################################################################### + +COMMAND="$1" +case $COMMAND in + next ) COMMAND_KEY='j';; + prev ) COMMAND_KEY='k';; + playpause ) COMMAND_KEY='space';; + * ) ERROR 1 "unsupported command '$COMMAND'" ;; +esac + +xdotool search --name 'YouTube Music' windowactivate \ + || ERROR 2 "YouTube Music is not running" + + +# Chrome / YouTube only accepts keypresses when window is active +xdotool search --name 'YouTube Music' windowactivate +sleep 0.3 +xdotool key --clearmodifiers "$COMMAND_KEY" diff --git a/config/colorschemes/kitty/autumn.conf b/colorschemes/autumn.conf similarity index 100% rename from config/colorschemes/kitty/autumn.conf rename to colorschemes/autumn.conf diff --git a/config/colorschemes/kitty/christmas.conf b/colorschemes/christmas.conf similarity index 100% rename from config/colorschemes/kitty/christmas.conf rename to colorschemes/christmas.conf diff --git a/config/colorschemes/kitty/easter.conf b/colorschemes/easter.conf similarity index 100% rename from config/colorschemes/kitty/easter.conf rename to colorschemes/easter.conf diff --git a/config/colorschemes/kitty/halloween.conf b/colorschemes/halloween.conf similarity index 100% rename from config/colorschemes/kitty/halloween.conf rename to colorschemes/halloween.conf diff --git a/colorschemes/kitty.alternate b/colorschemes/kitty.alternate new file mode 120000 index 0000000..546e976 --- /dev/null +++ b/colorschemes/kitty.alternate @@ -0,0 +1 @@ +/home/w0ryn/.wryn/colorschemes/valentines.conf \ No newline at end of file diff --git a/colorschemes/kitty.main b/colorschemes/kitty.main new file mode 120000 index 0000000..bda895c --- /dev/null +++ b/colorschemes/kitty.main @@ -0,0 +1 @@ +/home/w0ryn/.wryn/colorschemes/main.conf \ No newline at end of file diff --git a/config/colorschemes/kitty/main.conf b/colorschemes/main.conf similarity index 100% rename from config/colorschemes/kitty/main.conf rename to colorschemes/main.conf diff --git a/config/colorschemes/kitty/purple.conf b/colorschemes/purple.conf similarity index 100% rename from config/colorschemes/kitty/purple.conf rename to colorschemes/purple.conf diff --git a/config/colorschemes/kitty/spring.conf b/colorschemes/spring.conf similarity index 100% rename from config/colorschemes/kitty/spring.conf rename to colorschemes/spring.conf diff --git a/config/colorschemes/kitty/st-patricks.conf b/colorschemes/st-patricks.conf similarity index 100% rename from config/colorschemes/kitty/st-patricks.conf rename to colorschemes/st-patricks.conf diff --git a/config/colorschemes/kitty/summer.conf b/colorschemes/summer.conf similarity index 100% rename from config/colorschemes/kitty/summer.conf rename to colorschemes/summer.conf diff --git a/config/colorschemes/kitty/thanksgiving.conf b/colorschemes/thanksgiving.conf similarity index 100% rename from config/colorschemes/kitty/thanksgiving.conf rename to colorschemes/thanksgiving.conf diff --git a/config/colorschemes/kitty/valentines.conf b/colorschemes/valentines.conf similarity index 100% rename from config/colorschemes/kitty/valentines.conf rename to colorschemes/valentines.conf diff --git a/config/colorschemes/kitty/winter.conf b/colorschemes/winter.conf similarity index 100% rename from config/colorschemes/kitty/winter.conf rename to colorschemes/winter.conf diff --git a/config/code-activator-zsh/settings.zsh b/config/code-activator.conf similarity index 100% rename from config/code-activator-zsh/settings.zsh rename to config/code-activator.conf diff --git a/config/colorschemes/linux-console b/config/colorschemes/linux-console deleted file mode 100644 index 2e748bb..0000000 --- a/config/colorschemes/linux-console +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/zsh - -TARGET="$HOME/.config/wryn/tty-colorscheme" -[ ! -f $TARGET ] && TARGET="$DOTWRYN/config/kitty/theme.conf" - -GET_COLOR_FROM_KITTY_THEME() { - grep "$1" $TARGET | awk '{print $2}' | sed 's/ //g; s/#//g' | tr '[:lower:]' '[:upper:]' -} - -[[ "$TERM" =~ ^linux$ ]] && { - /bin/echo -e "\ - \e]P0$(GET_COLOR_FROM_KITTY_THEME '^background ') - \e]P1$(GET_COLOR_FROM_KITTY_THEME '^color1 ') - \e]P2$(GET_COLOR_FROM_KITTY_THEME '^color2 ') - \e]P3$(GET_COLOR_FROM_KITTY_THEME '^color3 ') - \e]P4$(GET_COLOR_FROM_KITTY_THEME '^color4 ') - \e]P5$(GET_COLOR_FROM_KITTY_THEME '^color5 ') - \e]P6$(GET_COLOR_FROM_KITTY_THEME '^color6 ') - \e]P7$(GET_COLOR_FROM_KITTY_THEME '^foreground ') - \e]P8$(GET_COLOR_FROM_KITTY_THEME '^color9 ') - \e]P9$(GET_COLOR_FROM_KITTY_THEME '^color10 ') - \e]PA$(GET_COLOR_FROM_KITTY_THEME '^color11 ') - \e]PB$(GET_COLOR_FROM_KITTY_THEME '^color12 ') - \e]PC$(GET_COLOR_FROM_KITTY_THEME '^color13 ') - \e]PD$(GET_COLOR_FROM_KITTY_THEME '^color14 ') - \e]PE$(GET_COLOR_FROM_KITTY_THEME '^color7 ') - \e]PF$(GET_COLOR_FROM_KITTY_THEME '^color15 ') - " - clear -} diff --git a/config/colorschemes/vim/codedark.vim b/config/colorschemes/vim/codedark.vim deleted file mode 100644 index a108176..0000000 --- a/config/colorschemes/vim/codedark.vim +++ /dev/null @@ -1,257 +0,0 @@ -" Vim Code Dark (color scheme) -" https://github.com/tomasiser/vim-code-dark - -scriptencoding utf-8 - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="codedark" - -" Highlighting function (inspiration from https://github.com/chriskempson/base16-vim) -if &t_Co >= 256 - let g:codedark_term256=1 -elseif !exists("g:codedark_term256") - let g:codedark_term256=0 -endif -fun! hi(group, fg, bg, attr, sp) - if !empty(a:fg) - exec "hi " . a:group . " guifg=" . a:fg.gui . " ctermfg=" . (g:codedark_term256 ? a:fg.cterm256 : a:fg.cterm) - endif - if !empty(a:bg) - exec "hi " . a:group . " guibg=" . a:bg.gui . " ctermbg=" . (g:codedark_term256 ? a:bg.cterm256 : a:bg.cterm) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif - if !empty(a:sp) - exec "hi " . a:group . " guisp=" . a:sp.gui - endif -endfun - -" ------------------ -" Color definitions: -" ------------------ - -" Terminal colors (base16): -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" -if exists('base16colorspace') && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" -else - let s:cterm01 = "00" - let s:cterm02 = "08" - let s:cterm04 = "07" - let s:cterm06 = "07" - let s:cterm09 = "06" - let s:cterm0F = "03" -endif - -" General appearance colors: -" (some of them may be unused) - -let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} -let s:cdFront = {'gui': '#D4D4D4', 'cterm': s:cterm05, 'cterm256': '188'} -let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} - -let s:cdTabCurrent = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} -let s:cdTabOther = {'gui': '#2D2D2D', 'cterm': s:cterm01, 'cterm256': '236'} -let s:cdTabOutside = {'gui': '#252526', 'cterm': s:cterm01, 'cterm256': '235'} - -let s:cdLeftDark = {'gui': '#252526', 'cterm': s:cterm01, 'cterm256': '235'} -let s:cdLeftMid = {'gui': '#373737', 'cterm': s:cterm03, 'cterm256': '237'} -let s:cdLeftLight = {'gui': '#3F3F46', 'cterm': s:cterm03, 'cterm256': '238'} - -let s:cdPopupFront = {'gui': '#BBBBBB', 'cterm': s:cterm06, 'cterm256': '250'} -let s:cdPopupBack = {'gui': '#2D2D30', 'cterm': s:cterm01, 'cterm256': '236'} -let s:cdPopupHighlightBlue = {'gui': '#073655', 'cterm': s:cterm0D, 'cterm256': '24'} -let s:cdPopupHighlightGray = {'gui': '#3D3D40', 'cterm': s:cterm03, 'cterm256': '237'} - -let s:cdSplitLight = {'gui': '#898989', 'cterm': s:cterm04, 'cterm256': '245'} -let s:cdSplitDark = {'gui': '#444444', 'cterm': s:cterm03, 'cterm256': '238'} -let s:cdSplitThumb = {'gui': '#424242', 'cterm': s:cterm04, 'cterm256': '238'} - -let s:cdCursorDarkDark = {'gui': '#222222', 'cterm': s:cterm01, 'cterm256': '235'} -let s:cdCursorDark = {'gui': '#51504F', 'cterm': s:cterm03, 'cterm256': '239'} -let s:cdCursorLight = {'gui': '#AEAFAD', 'cterm': s:cterm04, 'cterm256': '145'} -let s:cdSelection = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} -let s:cdLineNumber = {'gui': '#5A5A5A', 'cterm': s:cterm04, 'cterm256': '240'} - -let s:cdDiffRedDark = {'gui': '#4B1818', 'cterm': s:cterm08, 'cterm256': '52'} -let s:cdDiffRedLight = {'gui': '#6F1313', 'cterm': s:cterm08, 'cterm256': '52'} -let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} -let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} -let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} - -let s:cdSearchCurrent = {'gui': '#49545F', 'cterm': s:cterm09, 'cterm256': '239'} -let s:cdSearch = {'gui': '#4C4E50', 'cterm': s:cterm0A, 'cterm256': '239'} - -" Syntax colors: - -if !exists("g:codedark_conservative") - let g:codedark_conservative=0 -endif - -let s:cdGray = {'gui': '#808080', 'cterm': s:cterm04, 'cterm256': '08'} -let s:cdViolet = {'gui': '#646695', 'cterm': s:cterm04, 'cterm256': '60'} -let s:cdBlue = {'gui': '#569CD6', 'cterm': s:cterm0D, 'cterm256': '75'} -let s:cdLightBlue = {'gui': '#9CDCFE', 'cterm': s:cterm0C, 'cterm256': '117'} -if g:codedark_conservative | let s:cdLightBlue = s:cdFront | endif -let s:cdGreen = {'gui': '#608B4E', 'cterm': s:cterm0B, 'cterm256': '65'} -let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '43'} -let s:cdLightGreen = {'gui': '#B5CEA8', 'cterm': s:cterm09, 'cterm256': '151'} -let s:cdRed = {'gui': '#F44747', 'cterm': s:cterm08, 'cterm256': '203'} -let s:cdOrange = {'gui': '#CE9178', 'cterm': s:cterm0F, 'cterm256': '173'} -let s:cdLightRed = {'gui': '#D16969', 'cterm': s:cterm08, 'cterm256': '167'} -if g:codedark_conservative | let s:cdLightRed = s:cdOrange | endif -let s:cdYellowOrange = {'gui': '#D7BA7D', 'cterm': s:cterm0A, 'cterm256': '179'} -let s:cdYellow = {'gui': '#DCDCAA', 'cterm': s:cterm0A, 'cterm256': '187'} -if g:codedark_conservative | let s:cdYellow = s:cdFront | endif -let s:cdPink = {'gui': '#C586C0', 'cterm': s:cterm0E, 'cterm256': '176'} -if g:codedark_conservative | let s:cdPink = s:cdBlue | endif - -" Vim editor colors -" hi(GROUP, FOREGROUND, BACKGROUND, ATTRIBUTE, SPECIAL) -call hi('Normal', s:cdFront, s:cdBack, 'none', {}) -call hi('ColorColumn', {}, s:cdCursorDarkDark, 'none', {}) -call hi('Cursor', s:cdCursorDark, s:cdCursorLight, 'none', {}) -call hi('CursorLine', {}, s:cdCursorDarkDark, 'none', {}) -call hi('Directory', s:cdBlue, s:cdBack, 'none', {}) -call hi('DiffAdd', {}, s:cdDiffGreenDark, 'none', {}) -call hi('DiffChange', {}, s:cdDiffRedDark, 'none', {}) -call hi('DiffDelete', {}, s:cdDiffRedLight, 'none', {}) -call hi('DiffText', {}, s:cdDiffRedLight, 'none', {}) -call hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) -call hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) -call hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) -call hi('Folded', s:cdLeftLight, s:cdLeftDark, 'underline', {}) -call hi('FoldColumn', s:cdLineNumber, s:cdBack, 'none', {}) -call hi('SignColumn', {}, s:cdBack, 'none', {}) -call hi('IncSearch', s:cdNone, s:cdSearchCurrent, 'none', {}) -call hi('LineNr', s:cdLineNumber, s:cdBack, 'none', {}) -call hi('CursorLineNr', s:cdPopupFront, s:cdBack, 'none', {}) -call hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {}) -call hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('NonText', s:cdLineNumber, s:cdBack, 'none', {}) -call hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {}) -call hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {}) -call hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {}) -call hi('PmenuThumb', {}, s:cdPopupFront, 'none', {}) -call hi('Question', s:cdBlue, s:cdBack, 'none', {}) -call hi('Search', s:cdNone, s:cdSearch, 'none', {}) -call hi('SpecialKey', s:cdBlue, s:cdNone, 'none', {}) -call hi('SpellBad', s:cdNone, s:cdNone, 'underline', {}) -call hi('SpellCap', s:cdNone, s:cdNone, 'underline', {}) -call hi('SpellLocal', s:cdNone, s:cdNone, 'underline', {}) -call hi('StatusLine', s:cdFront, s:cdLeftMid, 'none', {}) -call hi('StatusLineNC', s:cdFront, s:cdLeftDark, 'none', {}) -call hi('TabLine', s:cdFront, s:cdTabOther, 'none', {}) -call hi('TabLineFill', s:cdFront, s:cdTabOutside, 'none', {}) -call hi('TabLineSel', s:cdFront, s:cdTabCurrent, 'none', {}) -call hi('Title', s:cdNone, s:cdNone, 'bold', {}) -call hi('Visual', s:cdNone, s:cdSelection, 'none', {}) -call hi('VisualNOS', s:cdNone, s:cdSelection, 'none', {}) -call hi('WarningMsg', s:cdOrange, s:cdBack, 'none', {}) -call hi('WildMenu', s:cdNone, s:cdSelection, 'none', {}) - -call hi('Comment', s:cdGreen, {}, 'none', {}) - -call hi('Constant', s:cdBlue, {}, 'none', {}) -call hi('String', s:cdOrange, {}, 'none', {}) -call hi('Character', s:cdOrange, {}, 'none', {}) -call hi('Number', s:cdLightGreen, {}, 'none', {}) -call hi('Boolean', s:cdBlue, {}, 'none', {}) -call hi('Float', s:cdLightGreen, {}, 'none', {}) - -call hi('Identifier', s:cdLightBlue, {}, 'none', {}) -call hi('Function', s:cdYellow, {}, 'none', {}) - -call hi('Statement', s:cdPink, {}, 'none', {}) -call hi('Conditional', s:cdPink, {}, 'none', {}) -call hi('Repeat', s:cdPink, {}, 'none', {}) -call hi('Label', s:cdPink, {}, 'none', {}) -call hi('Operator', s:cdFront, {}, 'none', {}) -call hi('Keyword', s:cdPink, {}, 'none', {}) -call hi('pythonOperator', s:cdPink, {}, 'none', {}) -call hi('Exception', s:cdPink, {}, 'none', {}) - -call hi('PreProc', s:cdPink, {}, 'none', {}) -call hi('Include', s:cdPink, {}, 'none', {}) -call hi('Define', s:cdPink, {}, 'none', {}) -call hi('Macro', s:cdPink, {}, 'none', {}) -call hi('PreCondit', s:cdPink, {}, 'none', {}) - -call hi('Type', s:cdBlue, {}, 'none', {}) -call hi('StorageClass', s:cdBlue, {}, 'none', {}) -call hi('Structure', s:cdBlue, {}, 'none', {}) -call hi('Typedef', s:cdBlue, {}, 'none', {}) - -call hi('Special', s:cdFront, {}, 'none', {}) -call hi('SpecialChar', s:cdFront, {}, 'none', {}) -call hi('Tag', s:cdFront, {}, 'none', {}) -call hi('Delimiter', s:cdFront, {}, 'none', {}) -call hi('SpecialComment', s:cdGreen, {}, 'none', {}) -call hi('Debug', s:cdFront, {}, 'none', {}) - -call hi('Underlined', s:cdNone, {}, 'underline', {}) -call hi("Conceal", s:cdFront, s:cdBack, 'none', {}) - -call hi('Ignore', s:cdFront, {}, 'none', {}) - -call hi('Error', s:cdRed, {}, 'undercurl', s:cdRed) - -call hi('Todo', s:cdNone, s:cdLeftMid, 'none', {}) - -" HTML: -call hi('htmlTag', s:cdGray, {}, 'none', {}) -call hi('htmlEndTag', s:cdGray, {}, 'none', {}) -call hi('htmlTagName', s:cdBlue, {}, 'none', {}) -call hi('htmlSpecialTagName', s:cdBlue, {}, 'none', {}) -call hi('htmlArg', s:cdLightBlue, {}, 'none', {}) - -" CSS: -call hi('cssBraces', s:cdFront, {}, 'none', {}) -call hi('cssInclude', s:cdPink, {}, 'none', {}) -call hi('cssTagName', s:cdYellowOrange, {}, 'none', {}) -call hi('cssClassName', s:cdYellowOrange, {}, 'none', {}) -call hi('cssPseudoClass', s:cdYellowOrange, {}, 'none', {}) -call hi('cssPseudoClassId', s:cdYellowOrange, {}, 'none', {}) -call hi('cssPseudoClassLang', s:cdYellowOrange, {}, 'none', {}) -call hi('cssIdentifier', s:cdYellowOrange, {}, 'none', {}) -call hi('cssProp', s:cdLightBlue, {}, 'none', {}) -call hi('cssDefinition', s:cdLightBlue, {}, 'none', {}) -call hi('cssAttr', s:cdOrange, {}, 'none', {}) -call hi('cssAttrRegion', s:cdOrange, {}, 'none', {}) -call hi('cssColor', s:cdOrange, {}, 'none', {}) -call hi('cssFunction', s:cdOrange, {}, 'none', {}) -call hi('cssFunctionName', s:cdOrange, {}, 'none', {}) -call hi('cssVendor', s:cdOrange, {}, 'none', {}) -call hi('cssValueNumber', s:cdOrange, {}, 'none', {}) -call hi('cssValueLength', s:cdOrange, {}, 'none', {}) -call hi('cssUnitDecorators', s:cdOrange, {}, 'none', {}) - -" JavaScript: -call hi('jsVariableDef', s:cdLightBlue, {}, 'none', {}) -call hi('jsFuncArgs', s:cdLightBlue, {}, 'none', {}) -call hi('jsRegexpString', s:cdLightRed, {}, 'none', {}) -call hi('jsThis', s:cdBlue, {}, 'none', {}) - -" Ruby: -call hi('rubyClassNameTag', s:cdBlueGreen, {}, 'none', {}) - diff --git a/config/colorschemes/vim/lanox.vim b/config/colorschemes/vim/lanox.vim deleted file mode 100644 index b6cbc90..0000000 --- a/config/colorschemes/vim/lanox.vim +++ /dev/null @@ -1,158 +0,0 @@ -" -" -" _ _ -" | | __ _ _ __ ___ __ __ __ __(_) _ __ ___ -" | | / _` || '_ \ / _ \\ \/ / \ \ / /| || '_ ` _ \ -" | || (_| || | | || (_) |> < _\ V / | || | | | | | -" |_| \__,_||_| |_| \___//_/\_\(_)\_/ |_||_| |_| |_| - -" -" Dark vim colorscheme based on colors from Wes Anderson films -" -" File: lanox.vim -" URL: -" Author: Lano Puljic -" License: MIT -" -" Copyright (c) 2015 Lano Puljic -" -" 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. - -highlight clear -set background=dark - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "lanox" - -"------------------------- -"- Editor Settings - -"------------------------- -hi Normal ctermfg=252 ctermbg=000 cterm=NONE guifg=#D0D0D0 guibg=#000000 gui=NONE -hi Cursor ctermfg=16 ctermbg=253 cterm=NONE guifg=#000000 guibg=#DADADA gui=NONE -hi LineNr ctermfg=236 ctermbg=233 cterm=NONE guifg=#838586 guibg=#2f2f2f gui=NONE -hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#2f2f2f gui=NONE - -"------------------------- -"- Varible Types - -"------------------------- -hi Constant ctermfg=135 ctermbg=NONE cterm=bold guifg=#AF5FFF guibg=NONE gui=NONE -hi String ctermfg=220 ctermbg=NONE cterm=NONE guifg=#f1c40f guibg=NONE gui=NONE -hi Character ctermfg=144 ctermbg=NONE cterm=NONE guifg=#AFAF87 guibg=NONE gui=NONE -hi Number ctermfg=135 ctermbg=NONE cterm=bold guifg=#AF5FFF guibg=NONE gui=NONE -hi Boolean ctermfg=135 ctermbg=NONE cterm=NONE guifg=#6c71c4 guibg=NONE gui=NONE -hi Float ctermfg=135 ctermbg=NONE cterm=NONE guifg=#6c71c4 guibg=NONE gui=NONE -hi Function ctermfg=41 ctermbg=NONE cterm=NONE guifg=#2ecc71 guibg=NONE gui=NONE -hi Identifier ctermfg=208 ctermbg=NONE cterm=NONE guifg=#FF8700 guibg=NONE gui=NONE - -"------------------------- -"- Language Constructs - -"------------------------- -hi Statement ctermfg=161 ctermbg=NONE cterm=bold guifg=#D7005F guibg=NONE gui=NONE -hi Conditional ctermfg=161 ctermbg=NONE cterm=bold guifg=#D7005F guibg=NONE gui=bold -hi Repeat ctermfg=161 ctermbg=NONE cterm=bold guifg=#D7005F guibg=NONE gui=bold -hi Label ctermfg=229 ctermbg=NONE cterm=none guifg=#FFFFAF guibg=NONE gui=NONE -hi Operator ctermfg=167 ctermbg=NONE cterm=bold guifg=#D75F5F guibg=NONE gui=bold -hi Keyword ctermfg=161 ctermbg=NONE cterm=bold guifg=#D7005F guibg=NONE gui=NONE -hi Exception ctermfg=118 ctermbg=NONE cterm=bold guifg=#87FF00 guibg=NONE gui=NONE -hi Comment ctermfg=247 ctermbg=NONE cterm=NONE guifg=#9E9E9E guibg=NONE gui=NONE -hi Special ctermfg=81 ctermbg=232 cterm=NONE guifg=#5FD7FF guibg=#080808 gui=NONE -hi SpecialChar ctermfg=161 ctermbg=NONE cterm=bold guifg=#D7005F guibg=NONE gui=NONE -hi Tag ctermfg=161 ctermbg=NONE cterm=NONE guifg=#D7005F guibg=NONE gui=NONE -hi Delimiter ctermfg=220 ctermbg=NONE cterm=NONE guifg=#FFD700 guibg=NONE gui=NONE -hi SpecialComment ctermfg=247 ctermbg=NONE cterm=bold guifg=#9E9E9E guibg=NONE gui=NONE -hi Debug ctermfg=225 ctermbg=NONE cterm=bold guifg=#FFD7FF guibg=NONE gui=NONE - -"------------------------- -"- Diff - -"------------------------- -hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#ecf0f1 guibg=#44800a gui=bold -hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#880505 guibg=NONE gui=NONE -hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#ecf0f1 guibg=#1d3251 gui=NONE -hi DiffText ctermfg=231 ctermbg=40 cterm=bold guifg=#ecf0f1 guibg=#00df00 gui=bold - -"------------------------- -"- Completion Menu - -"------------------------- -hi Pmenu ctermfg=41 ctermbg=235 cterm=NONE guifg=#2ecc71 guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=238 cterm=NONE guifg=NONE guibg=#444444 gui=NONE -hi PreCondit ctermfg=118 ctermbg=NONE cterm=bold guifg=#87FF00 guibg=NONE gui=NONE -hi PreProc ctermfg=118 ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE - -"--------------------------- -"- Searching - -"--------------------------- -hi Search ctermfg=15 ctermbg=196 cterm=bold guifg=#f7f3ff guibg=#e14d42 term=reverse gui=bold -hi IncSearch ctermfg=16 ctermbg=39 cterm=bold guifg=#000000 guibg=#6c71c4 term=reverse gui=bold -hi Directory ctermfg=118 ctermbg=NONE cterm=bold guifg=NONE guibg=NONE term=NONE gui=NONE - -"--------------------------- -"- Promopt/Status - -"--------------------------- -hi StatusLine ctermfg=238 ctermbg=253 cterm=NONE guifg=#444444 guibg=#DADADA gui=NONE -hi StatusLineNC ctermfg=244 ctermbg=232 cterm=NONE guifg=#808080 guibg=#080808 gui=NONE -hi WildMenu ctermfg=81 ctermbg=16 cterm=NONE guifg=#5FD7FF guibg=#000000 gui=NONE -hi Question ctermfg=81 ctermbg=NONE cterm=NONE guifg=#5FD7FF guibg=NONE gui=NONE -hi Title ctermfg=166 ctermbg=NONE cterm=NONE guifg=#D75F00 guibg=NONE gui=NONE -hi ModeMsg ctermfg=229 ctermbg=NONE cterm=NONE guifg=#FFFFAF guibg=NONE gui=NONE -hi MoreMsg ctermfg=229 ctermbg=NONE cterm=NONE guifg=#FFFFAF guibg=NONE gui=NONE - -"--------------------------- -"- Visual Aid - -"--------------------------- -hi MatchParen ctermfg=16 ctermbg=208 cterm=bold guifg=#000000 guibg=#FF8700 gui=NONE -hi Visual ctermfg=NONE ctermbg=236 cterm=NONE guifg=#262626 guibg=NONE gui=NONE -hi VisualNOS ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi NonText ctermfg=240 ctermbg=233 cterm=NONE guifg=#585858 guibg=#121212 gui=NONE -hi Todo ctermfg=231 ctermbg=232 cterm=underline guifg=#FFFFFF guibg=#080808 gui=NONE -hi Underlined ctermfg=244 ctermbg=NONE cterm=underline guifg=#808080 guibg=NONE gui=NONE -hi Error ctermfg=219 ctermbg=89 cterm=NONE guifg=#FFAFFF guibg=#87005F gui=NONE -hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold guifg=#FF00AF guibg=#000000 gui=NONE -hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold guifg=#FFFFFF guibg=#444444 gui=NONE -hi Ignore ctermfg=244 ctermbg=232 cterm=NONE guifg=#808080 guibg=#080808 gui=NONE -hi SpecialKey ctermfg=245 ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE - -"--------------------------- -"- Window/Tab/Delimiter - -"--------------------------- -hi VertSplit ctermfg=244 ctermbg=232 cterm=bold guifg=#808080 guibg=#080808 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE guifg=NONE guibg=NONE gui=NONE - -"--------------------------- -"- Number column - -"--------------------------- -hi CursorColumn ctermfg=NONE ctermbg=234 cterm=NONE guifg=NONE guibg=#1C1C1C gui=NONE -hi FoldColumn ctermfg=67 ctermbg=233 cterm=NONE guifg=#5F87AF guibg=#121212 gui=NONE -hi SignColumn ctermfg=118 ctermbg=235 cterm=NONE guifg=#87FF00 guibg=#262626 gui=NONE -hi Folded ctermfg=67 ctermbg=233 cterm=NONE guifg=#5F87AF guibg=#121212 gui=NONE - -"--------------------------- -"- C Like - -"--------------------------- -hi StorageClass ctermfg=208 ctermbg=NONE cterm=NONE guifg=#FF8700 guibg=NONE gui=NONE -hi Structure ctermfg=81 ctermbg=NONE cterm=NONE guifg=#5fd7ff guibg=NONE gui=NONE -hi Typedef ctermfg=81 ctermbg=NONE cterm=NONE guifg=#5fd7ff guibg=NONE gui=NONE -hi Type ctermfg=81 ctermbg=NONE cterm=NONE guifg=#5fd7ff guibg=NONE gui=NONE -hi Define ctermfg=81 ctermbg=NONE cterm=NONE guifg=#5fd7ff guibg=NONE gui=NONE -hi Macro ctermfg=193 ctermbg=NONE cterm=NONE guifg=#D7FF87 guibg=NONE gui=NONE diff --git a/config/colorschemes/vim/lilydjwg_dark.vim b/config/colorschemes/vim/lilydjwg_dark.vim deleted file mode 100644 index 9ee84bc..0000000 --- a/config/colorschemes/vim/lilydjwg_dark.vim +++ /dev/null @@ -1,92 +0,0 @@ -" local syntax file - set colors on a per-machine basis: -" vim: tw=0 ts=4 sw=4 -" Vim color file -" Version: 1.1 -" Maintainer: lilydjwg -" Last Change: 2009 May 18 - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "lilydjwg_dark" - -hi Comment guifg=#686868 ctermfg=59 -hi Constant guifg=#10a303 ctermfg=34 -hi Cursor guifg=#FF66FF guibg=#00AAFF ctermfg=207 ctermbg=39 -hi CursorIM guifg=#00AAFF guibg=#FF66FF ctermfg=39 ctermbg=207 -" hi CursorIM gui=None cterm=None -hi CursorLine guibg=#333333 ctermbg=236 cterm=None -hi DiffAdd guifg=#000000 guibg=#33ff33 ctermfg=16 ctermbg=83 -hi DiffChange guifg=#dddddd guibg=#5555CC ctermfg=253 ctermbg=63 -hi DiffDelete guifg=#000000 guibg=#ee6699 ctermfg=16 ctermbg=175 -hi DiffText guifg=#ffffff guibg=#8888ff ctermfg=231 ctermbg=105 -hi Directory guifg=#ff99ff ctermfg=213 -hi Error gui=underline guifg=#ff0000 guibg=#111133 cterm=underline ctermfg=196 ctermbg=20 -hi ErrorMsg guifg=#FFFF00 guibg=#0000FF ctermfg=226 ctermbg=21 -hi FoldColumn guifg=#0033FF guibg=#333333 ctermfg=27 ctermbg=236 -hi Folded guifg=#9933FF guibg=#333333 ctermfg=128 ctermbg=236 -hi Identifier guifg=#986CFF guibg=#2d222d ctermfg=135 -hi Ignore gui=None cterm=None -hi IncSearch gui=bold,reverse guifg=#33ff1c guibg=#3454ff cterm=bold,reverse ctermfg=40 ctermbg=69 -hi LineNr guifg=#FF77DD ctermfg=212 -hi MatchParen guifg=#99FF99 guibg=#444444 ctermfg=120 ctermbg=238 -hi ModeMsg gui=bold guifg=#AAAA3C guibg=#222211 cterm=bold ctermfg=136 -hi MoreMsg guifg=#FFFF00 ctermfg=226 -hi NonText guifg=#8400ff guibg=#1C1C1C ctermfg=129 ctermbg=234 -hi Normal guifg=#00CCFF guibg=#222222 ctermfg=39 ctermbg=235 -hi Pmenu guifg=#3366FF guibg=#1a1a1a ctermfg=33 ctermbg=233 -hi PmenuSbar guibg=#000000 ctermbg=16 -hi PmenuSel guifg=#80ff00 guibg=#1a1a1a ctermfg=82 ctermbg=233 -hi PmenuThumb gui=reverse cterm=reverse -hi PreProc guifg=#FF99FF guibg=#29222f ctermfg=213 -hi Question gui=bold guifg=#009966 guibg=#113322 cterm=bold ctermfg=42 -hi Search guifg=#3404ff guibg=#FFFF00 ctermfg=57 ctermbg=226 -hi SignColumn guifg=#00FFFF guibg=#C0C0C0 ctermfg=51 ctermbg=251 -hi Special guifg=#FF00FF guibg=#2d222d ctermfg=201 -hi SpecialKey guifg=#00AEA0 guibg=#22302D ctermfg=37 -hi SpellBad gui=undercurl cterm=undercurl -hi SpellCap gui=undercurl cterm=undercurl -hi SpellLocal gui=undercurl cterm=undercurl -hi SpellRare gui=undercurl cterm=undercurl -hi Statement gui=bold guifg=#d86868 guibg=#2d2222 cterm=bold ctermfg=167 -hi StatusLine gui=reverse guifg=#00c4ff guibg=#000000 cterm=reverse ctermfg=39 ctermbg=16 -hi StatusLineNC guifg=#A4A4FF guibg=#444400 ctermfg=141 ctermbg=58 -hi TabLine guifg=#0066FF guibg=#001133 ctermfg=32 ctermbg=17 -hi TabLineFill gui=None cterm=None -hi TabLineSel gui=underline guifg=#999944 guibg=#112233 cterm=underline ctermfg=100 -hi Title guifg=#ffff44 guibg=#2F2F2F ctermfg=227 ctermbg=236 -hi Todo gui=bold,underline guifg=#FF4444 guibg=#333300 cterm=bold,underline ctermfg=203 ctermbg=58 -hi Type guifg=#FFA500 guibg=#2d2211 ctermfg=214 -hi Underlined gui=underline guifg=#0088c5 guibg=#222d3d ctermfg=32 -hi VertSplit gui=reverse guifg=#00C4FF guibg=#0000FF cterm=reverse ctermfg=45 ctermbg=21 -hi Visual guibg=#3D3D3D ctermfg=237 -hi VisualNOS gui=None cterm=None -hi WarningMsg guifg=#FFA500 guibg=#000080 ctermfg=214 ctermbg=18 -hi WildMenu gui=None cterm=None -hi link Boolean Constant -hi link Character Constant -hi link Conditional Statement -hi link CursorColumn CursorLine -hi link Debug Special -hi link Define PreProc -hi link Delimiter Special -hi link Exception Statement -hi link Float Constant -hi link Function Identifier -hi link Include PreProc -hi link Keyword Statement -hi link Label Statement -hi link Macro PreProc -hi link Number Constant -hi link Operator Statement -hi link PreCondit PreProc -hi link Repeat Statement -hi link SpecialChar Special -hi link SpecialComment Special -hi link StorageClass Type -hi link String Constant -hi link Structure Type -hi link Tag Special -hi link Typedef Type diff --git a/config/colorschemes/vim/made_of_code.vim b/config/colorschemes/vim/made_of_code.vim deleted file mode 100644 index 777f298..0000000 --- a/config/colorschemes/vim/made_of_code.vim +++ /dev/null @@ -1,103 +0,0 @@ -" Vim color file -" Converted from Textmate theme Made of Code using Coloration v0.3.2 (http://github.com/sickill/coloration) - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "Made of Code" - -hi Cursor ctermfg=NONE ctermbg=51 cterm=NONE guifg=NONE guibg=#00ffff gui=NONE -hi Visual ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#05448d gui=NONE -hi CursorLine ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE -hi LineNr ctermfg=102 ctermbg=17 cterm=NONE guifg=#81818a guibg=#212231 gui=NONE -hi VertSplit ctermfg=59 ctermbg=59 cterm=NONE guifg=#4e4f5b guibg=#4e4f5b gui=NONE -hi MatchParen ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi StatusLine ctermfg=231 ctermbg=59 cterm=bold guifg=#f8f8f8 guibg=#4e4f5b gui=bold -hi StatusLineNC ctermfg=231 ctermbg=59 cterm=NONE guifg=#f8f8f8 guibg=#4e4f5b gui=NONE -hi Pmenu ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#05448d gui=NONE -hi IncSearch ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#233466 gui=NONE -hi Search ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#233466 gui=NONE -hi Directory ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Folded ctermfg=133 ctermbg=16 cterm=NONE guifg=#c050c2 guibg=#090a1b gui=NONE - -hi Normal ctermfg=231 ctermbg=16 cterm=NONE guifg=#f8f8f8 guibg=#090a1b gui=NONE -hi Boolean ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Character ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Comment ctermfg=133 ctermbg=0 cterm=NONE guifg=#c050c2 guibg=#000000 gui=italic -hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi Constant ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Define ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Float ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Function ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE -hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi Label ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE -hi NonText ctermfg=59 ctermbg=16 cterm=NONE guifg=#353c4f guibg=#151626 gui=NONE -hi Number ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi Operator ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi PreProc ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f8 guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=17 cterm=NONE guifg=#353c4f guibg=#212231 gui=NONE -hi Statement ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi StorageClass ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE -hi String ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE -hi Tag ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f8 guibg=NONE gui=bold -hi Todo ctermfg=133 ctermbg=0 cterm=inverse,bold guifg=#c050c2 guibg=#000000 gui=inverse,bold,italic -hi Type ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi rubyClass ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi rubyFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubySymbol ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi rubyConstant ctermfg=49 ctermbg=NONE cterm=NONE guifg=#00ffbc guibg=NONE gui=NONE -hi rubyStringDelimiter ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE -hi rubyBlockParameter ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi rubyInstanceVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi rubyInclude ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi rubyGlobalVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi rubyRegexp ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE -hi rubyEscape ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi rubyControl ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi rubyOperator ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi rubyException ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi rubyRailsUserClass ctermfg=49 ctermbg=NONE cterm=NONE guifg=#00ffbc guibg=NONE gui=NONE -hi rubyRailsARAssociationMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi rubyRailsARMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi rubyRailsRenderMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi rubyRailsMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi erubyComment ctermfg=133 ctermbg=0 cterm=NONE guifg=#c050c2 guibg=#000000 gui=italic -hi erubyRailsMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi htmlTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE -hi htmlEndTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE -hi htmlTagName ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE -hi htmlArg ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE -hi javaScriptRailsFunction ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlKey ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi yamlAnchor ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi yamlAlias ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi yamlDocumentHeader ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE -hi cssURL ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE -hi cssFunctionName ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE -hi cssColor ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi cssClassName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE -hi cssValueLength ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cf6a4c guibg=NONE gui=NONE -hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/config/colorschemes/vim/moss.vim b/config/colorschemes/vim/moss.vim deleted file mode 100644 index c7e617b..0000000 --- a/config/colorschemes/vim/moss.vim +++ /dev/null @@ -1,243 +0,0 @@ -" ------------------------------------------------------------------ -" Vim color file -" Name: moss (苔) -" Maintainer: Li Chunlin -" Last Change: 2010-08-06 -" Version: 2.1 -" URL: http://vim.sourceforge.net/script.php?script_id=2779 -" ------------------------------------------------------------------ - -" Init -" ------------------------------------------------------------------ -set background=dark -highlight clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "moss" - -if has("gui_running") - " Highlighting groups for various occasions - " ------------------------------------------------------------------ - hi SpecialKey guifg=RosyBrown4 - hi NonText guifg=MidnightBlue guibg=#0C2628 - hi Directory gui=BOLD guifg=DarkOliveGreen3 - hi ErrorMsg guifg=LightGoldenRod guibg=Firebrick - hi IncSearch gui=BOLD guifg=Firebrick1 - hi Search gui=REVERSE guifg=NONE guibg=NONE - hi MoreMsg guifg=DarkCyan - hi ModeMsg guifg=OliveDrab2 - hi LineNr guifg=DarkSeaGreen3 guibg=#0C2628 - hi Question guifg=Green - hi StatusLine gui=BOLD guifg=LemonChiffon3 guibg=#334680 - hi StatusLineNC gui=BOLD guifg=Honeydew4 guibg=Gray26 - hi VertSplit gui=BOLD guifg=Gray20 guibg=Gray26 - hi Title gui=BOLD guifg=RoyalBlue3 - hi Visual guifg=PowderBlue guibg=#22364C - hi VisualNOS gui=BOLD,UNDERLINE guifg=SlateGray - hi WarningMsg guifg=Gold - hi WildMenu gui=BOLD guifg=Black guibg=Chartreuse3 - hi Folded guifg=PaleGreen3 guibg=DarkSlateGray - hi FoldColumn gui=BOLD guifg=PaleGreen3 guibg=DarkSlateGray - hi DiffAdd guifg=SandyBrown guibg=DarkOliveGreen - hi DiffChange guibg=#3C444C - hi DiffDelete guifg=Gray20 guibg=Black - hi DiffText guifg=Chocolate guibg=#033B40 - - " new Vim 7.0 items - if v:version >= 700 - hi CursorColumn guibg=#063C36 - hi CursorLine guibg=#063C36 - hi SignColumn guifg=PaleGoldenrod guibg=Turquoise4 - hi TabLine guifg=CornflowerBlue guibg=Gray26 - hi TabLineSel guifg=RoyalBlue guibg=#082926 - hi TabLineFill gui=UNDERLINE guifg=CornflowerBlue guibg=Gray20 - hi Pmenu guifg=White guibg=MediumPurple4 - hi PmenuSel guifg=Wheat guibg=#22364C - hi PmenuSbar guifg=Tan guibg=SeaShell4 - hi PmenuThumb guifg=IndianRed guibg=SeaShell4 - hi MatchParen gui=BOLD guifg=GoldenRod guibg=DarkCyan - endif - - hi Cursor guifg=Black guibg=LimeGreen - hi CursorIM guifg=Black guibg=OrangeRed - - " Syntax highlighting groups - " ------------------------------------------------------------------ - - hi Normal gui=NONE guifg=LightBlue3 guibg=#082926 - hi Comment gui=ITALIC guifg=BurlyWood4 - - hi Constant gui=NONE guifg=CadetBlue3 - hi link String Constant - hi link Character Constant - hi Number gui=NONE guifg=Turquoise3 - hi link Boolean Number - hi link Float Number - - hi Identifier gui=NONE guifg=SteelBlue3 - hi Function gui=NONE guifg=Aquamarine3 - - hi Statement gui=NONE guifg=SpringGreen3 - hi link Conditional Statement - hi link Repeat Statement - hi link Label Statement - hi Operator gui=NONE guifg=SeaGreen3 - hi link Keyword Statement - hi link Exception Statement - - hi PreProc gui=NONE guifg=DodgerBlue3 - hi link Include PreProc - hi link Define PreProc - hi link Macro PreProc - hi link PreCondit PreProc - - hi Type gui=NONE guifg=DeepSkyBlue3 - hi link StorageClass Type - hi link Structure Type - hi link Typedef Type - - hi Special gui=NONE guifg=SlateBlue - hi link Specialchar Special - hi link Tag Special - hi link Delimiter Special - hi link Debug Special - - hi Underlined gui=UNDERLINE guifg=SkyBlue3 - hi Ignore gui=NONE guifg=Gray18 - hi Error gui=NONE guifg=Khaki3 guibg=VioletRed4 - hi Todo gui=BOLD guifg=GoldenRod3 guibg=NONE - -elseif &t_Co == 88 || &t_Co == 256 - - " Highlighting groups for various occasions - " ------------------------------------------------------------------ - hi SpecialKey ctermfg=95 - hi NonText ctermfg=17 - hi Directory cterm=bold ctermfg=149 - hi ErrorMsg ctermfg=228 ctermbg=124 - hi IncSearch cterm=bold ctermfg=203 - hi Search cterm=reverse ctermfg=152 - hi MoreMsg ctermfg=30 - hi ModeMsg ctermfg=191 - hi LineNr ctermfg=151 - hi Question ctermfg=46 - hi StatusLine cterm=bold ctermfg=187 ctermbg=60 - hi StatusLineNC cterm=bold ctermfg=108 ctermbg=238 - hi VertSplit cterm=bold cterm=bold ctermfg=236 ctermbg=238 - hi Title ctermfg=68 - hi Visual ctermfg=152 ctermbg=60 - hi VisualNOS cterm=bold,underline ctermfg=60 - hi WarningMsg ctermfg=220 - hi WildMenu cterm=bold ctermfg=16 ctermbg=76 - hi Folded ctermfg=114 ctermbg=66 - hi FoldColumn cterm=bold ctermfg=114 ctermbg=66 - hi DiffAdd ctermfg=215 ctermbg=107 - hi DiffChange ctermbg=60 - hi DiffDelete ctermfg=236 ctermbg=16 - hi DiffText ctermfg=166 ctermbg=23 - - " new Vim 7.0 items - if v:version >= 700 - hi SignColumn ctermfg=229 ctermbg=30 - hi TabLine ctermfg=69 ctermbg=238 - hi TabLineSel ctermfg=69 - hi TabLineFill cterm=underline ctermfg=69 ctermbg=236 - hi Pmenu ctermfg=231 ctermbg=97 - hi PmenuSel ctermfg=223 ctermbg=60 - hi PmenuSbar ctermfg=180 ctermbg=245 - hi PmenuThumb ctermfg=167 ctermbg=245 - hi MatchParen cterm=bold ctermfg=172 ctermbg=30 - endif - - hi Cursor ctermfg=16 ctermbg=77 - hi CursorIM ctermfg=16 ctermbg=202 - - " Syntax highlighting groups - " ------------------------------------------------------------------ - hi Normal ctermfg=152 ctermbg=232 - hi Comment cterm=NONE ctermfg=101 - - hi Constant ctermfg=116 - hi String ctermfg=116 - hi Character ctermfg=116 - hi Number ctermfg=44 - hi Boolean ctermfg=116 - hi Float ctermfg=116 - - hi Identifier ctermfg=74 - hi Function ctermfg=79 - - hi Statement ctermfg=41 - hi Conditional ctermfg=41 - hi Repeat ctermfg=41 - hi Label ctermfg=41 - hi Operator ctermfg=78 - hi Keyword ctermfg=41 - hi Exception ctermfg=41 - - hi PreProc ctermfg=26 - hi Include ctermfg=26 - hi Define ctermfg=26 - hi Macro ctermfg=26 - hi PreCondit ctermfg=26 - - hi Type ctermfg=38 - hi StorageClass ctermfg=38 - hi Structure ctermfg=38 - hi Typedef ctermfg=38 - - hi Special ctermfg=62 - hi Specialchar ctermfg=62 - hi Tag ctermfg=62 - hi Delimiter ctermfg=62 - hi Debug ctermfg=62 - - hi Underlined cterm=underline ctermfg=74 - hi Ignore ctermfg=236 - hi Error ctermfg=186 ctermbg=89 - hi Todo cterm=bold ctermfg=172 ctermbg=NONE - -else - - " Highlighting groups for various occasions - " ------------------------------------------------------------------ - hi SpecialKey ctermfg=LightMagenta - hi NonText ctermfg=Black - hi Directory cterm=bold ctermfg=LightYellow - hi ErrorMsg ctermfg=Yellow ctermbg=Red - hi IncSearch cterm=bold ctermfg=Red - hi Search cterm=reverse ctermfg=Yellow - hi MoreMsg ctermfg=DarkCyan - hi ModeMsg ctermfg=Yellow - hi LineNr ctermfg=Gray - hi Question ctermfg=Green - hi StatusLine cterm=bold ctermfg=Gray ctermbg=DarkBlue - hi StatusLineNC cterm=bold ctermfg=Black ctermbg=Gray - hi VertSplit cterm=bold cterm=bold ctermfg=DarkGray ctermbg=Gray - hi Title ctermfg=Blue - hi Visual ctermfg=Blue ctermbg=LightGreen - hi VisualNOS cterm=bold,underline ctermfg=DarkBlue - hi WarningMsg ctermfg=Yellow - hi WildMenu cterm=bold ctermfg=Black ctermbg=Green - hi Folded ctermfg=LightGray ctermbg=DarkCyan - hi FoldColumn cterm=bold ctermfg=LightGray ctermbg=DarkCyan - hi Cursor ctermfg=Black ctermbg=Green - hi CursorIM ctermfg=Black ctermbg=Red - - " Syntax highlighting groups - " ------------------------------------------------------------------ - hi Normal ctermfg=White ctermbg=Black - hi Comment cterm=NONE ctermfg=Gray - hi Constant ctermfg=LightCyan - hi Identifier ctermfg=DarkCyan - hi Statement ctermfg=Green - hi PreProc ctermfg=DarkBlue - hi Type ctermfg=DarkCyan - hi Special ctermfg=LightBlue - hi Underlined cterm=underline - hi Ignore ctermfg=Black - hi Error ctermfg=LightYellow ctermbg=DarkMagenta - hi Todo cterm=bold ctermfg=LightYellow - -endif diff --git a/config/colorschemes/vim/nightsky.vim b/config/colorschemes/vim/nightsky.vim deleted file mode 100644 index 8560467..0000000 --- a/config/colorschemes/vim/nightsky.vim +++ /dev/null @@ -1,147 +0,0 @@ -" Vim color file based on nightsky -" Maintainer: Ian Kelling -" Last Change: - - -" cool help screens -" :he group-name -" :he highlight-groups -" :he cterm-colors - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="northsky" - - -" Search & normal -hi Normal guifg=#eeeeee guibg=black -hi Search guibg=#3D5B8C guifg=yellow gui=bold -hi IncSearch guifg=bg guibg=cyan gui=bold -if &t_Co == "256" - hi Normal ctermfg=255 ctermbg=16 - hi Search ctermfg=226 ctermbg=60 - hi IncSearch ctermfg=16 ctermbg=51 -else - hi Normal ctermfg=lightgray ctermbg=black - hi Search ctermbg=darkblue ctermfg=yellow - hi IncSearch ctermfg=bg ctermbg=cyan -endif - -" highlight groups -hi Cursor guifg=bg guibg=fg -hi VertSplit guibg=#C0FFFF guifg=#075554 gui=none -hi Folded guifg=plum1 guibg=#061A3E -hi FoldColumn guibg=#800080 guifg=tan -hi ModeMsg guifg=#404040 guibg=#C0C0C0 -hi MoreMsg guifg=darkturquoise guibg=#188F90 -hi NonText guibg=#191919 guifg=#9FADC5 -hi Question guifg=#F4BB7E -hi SpecialKey guifg=#BF9261 -hi StatusLine guibg=#222222 guifg=#b0b0b0 gui=none -hi StatusLineNC guibg=#001111 guifg=DimGrey gui=none -hi Title guifg=#8DB8C3 -hi Visual gui=bold guifg=black guibg=#84AF84 -hi WarningMsg guifg=#F60000 gui=underline -if &t_Co == "256" - hi Cursor ctermfg=254 ctermbg=166 - hi VertSplit ctermfg=23 ctermbg=159 - hi Folded ctermfg=219 ctermbg=17 - hi FoldColumn ctermfg=180 ctermbg=90 - hi ModeMsg ctermfg=238 ctermbg=250 - hi MoreMsg ctermfg=44 ctermbg=30 - hi NonText ctermfg=146 ctermbg=234 - hi Question ctermfg=216 - hi SpecialKey ctermfg=137 - hi StatusLine ctermfg=145 ctermbg=235 - hi StatusLineNC ctermfg=242 ctermbg=16 - hi Title ctermfg=109 - hi Visual ctermfg=16 ctermbg=108 - hi WarningMsg ctermfg=196 -else - hi Cursor ctermfg=white ctermbg=red - hi VertSplit ctermfg=darkblue ctermbg=cyan - hi Folded ctermfg=lightmagenta ctermbg=bg - hi FoldColumn ctermfg=lightgray ctermbg=darkmagenta - hi ModeMsg ctermfg=black ctermbg=gray - hi MoreMsg ctermfg=cyan ctermbg=darkcyan - hi NonText ctermfg=gray ctermbg=darkgrey - hi Question ctermfg=yellow - hi SpecialKey ctermfg=brown - hi StatusLine ctermfg=lightgray ctermbg=darkgray - hi StatusLineNC ctermfg=darkgray ctermbg=black - hi Title ctermfg=blue - hi Visual ctermfg=black ctermbg=darkgreen - hi WarningMsg ctermfg=red -endif - -" syntax highlighting groups -hi Comment guifg=DarkGray -hi Constant guifg=#72A5E4 gui=bold -hi Number guifg=chartreuse2 gui=bold -hi Identifier guifg=#ADCBF1 -hi Statement guifg=yellow -hi PreProc guifg=#14967C -hi Type guifg=#FFAE66 -hi Special guifg=#EEBABA -hi Ignore guifg=grey60 -hi Todo guibg=#9C8C84 guifg=#244C0A -hi Label guifg=#ffc0c0 -if &t_Co == "256" - hi Comment ctermfg=248 - hi Constant ctermfg=74 - hi Number ctermfg=118 - hi Identifier ctermfg=153 - hi Statement ctermfg=226 - hi PreProc ctermfg=30 - hi Type ctermfg=215 - hi Special ctermfg=217 - hi Ignore ctermfg=246 - hi Todo ctermfg=22 ctermbg=138 - hi Label ctermfg=217 -else - hi Comment ctermfg=darkgray - hi Constant ctermfg=lightcyan - hi Number ctermfg=green - hi Identifier ctermfg=gray - hi Statement ctermfg=yellow - hi PreProc ctermfg=darkgreen - hi Type ctermfg=white "brown - hi Special ctermfg=brown "darkmagenta - hi Ignore ctermfg=gray - hi Todo ctermfg=darkblue ctermbg=darkgray - hi Label ctermfg=darkmagenta -endif - -" Vim defaults -hi ErrorMsg guifg=White guibg=Red -hi DiffAdd guibg=DarkBlue -hi DiffChange guibg=aquamarine4 -hi DiffDelete gui=bold guifg=Yellow guibg=DarkBlue -hi DiffText gui=bold guibg=#940303 -hi Directory guifg=Cyan -hi LineNr guifg=DarkGreen -hi WildMenu guifg=Black guibg=Yellow -hi lCursor guibg=SeaGreen1 guifg=NONE -hi Underlined gui=underline guifg=#80a0ff -hi Error guifg=White guibg=Red -if &t_Co == "256" - hi ErrorMsg ctermfg=231 ctermbg=196 - hi DiffAdd ctermbg=18 - hi DiffChange ctermbg=66 - hi DiffDelete ctermfg=226 ctermbg=18 - hi DiffText ctermbg=88 - hi Directory ctermfg=51 - hi LineNr ctermfg=22 - hi WildMenu ctermfg=16 ctermbg=226 - hi lCursor ctermbg=85 - hi Underlined ctermfg=111 - hi Error ctermfg=231 ctermbg=196 -else - hi lCursor ctermbg=lightgreen ctermfg=NONE -endif - - -" vim:sw=4 ts=4 sts=4 diff --git a/config/colorschemes/vim/pf_earth.vim b/config/colorschemes/vim/pf_earth.vim deleted file mode 100644 index fc155bb..0000000 --- a/config/colorschemes/vim/pf_earth.vim +++ /dev/null @@ -1,186 +0,0 @@ -" Vim color file -" Name: pf_earch - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif - -let colors_name = "pf_earth" - -" map a urxvt cube number to an xterm-256 cube number -fun! M(a) - return strpart("0135", a:a, 1) + 0 -endfun - -" map a urxvt colour to an xterm-256 colour -fun! X(a) - if &t_Co == 88 - return a:a - else - if a:a == 8 - return 237 - elseif a:a < 16 - return a:a - elseif a:a > 79 - return 232 + (3 * (a:a - 80)) - else - let l:b = a:a - 16 - let l:x = l:b % 4 - let l:y = (l:b / 4) % 4 - let l:z = (l:b / 16) - return 16 + M(l:x) + (6 * M(l:y)) + (36 * M(l:z)) - endif - endif -endfun - -if has("gui_running") - hi Normal gui=NONE guifg=#E7FFD8 guibg=#262320 - hi IncSearch guifg=#66ffff gui=reverse - hi Search guifg=#000000 guibg=#cae682 ctermfg=0 ctermbg=195 - hi ErrorMsg gui=BOLD guifg=#ffffff guibg=#ff3300 - hi WarningMsg gui=BOLD guifg=#ffffff guibg=#ff6600 - hi ModeMsg gui=BOLD guifg=#7e7eae guibg=NONE - hi MoreMsg gui=BOLD guifg=#7e7eae guibg=NONE - hi Question gui=BOLD guifg=#ffcd00 guibg=NONE - hi StatusLine gui=NONE guifg=#b9b9b9 guibg=#2F2A26 - hi StatusLineNC gui=NONE guifg=#474A39 guibg=#2F2A26 - hi VertSplit gui=NONE guifg=#b9b9b9 guibg=#3e3e5e - hi WildMenu gui=BOLD guifg=#ffcd00 guibg=#1e1e2e - - hi DiffText gui=NONE guifg=#ffffcd guibg=#00cd00 - hi DiffChange gui=NONE guifg=#ffffcd guibg=#008bff - hi DiffDelete gui=NONE guifg=#ffffcd guibg=#cd0000 - hi DiffAdd gui=NONE guifg=#ffffcd guibg=#00cd00 - - hi Cursor gui=NONE guifg=#404040 guibg=#D78332 - hi lCursor gui=NONE guifg=#404040 guibg=#8b8bff - hi CursorIM gui=NONE guifg=#404040 guibg=#8b8bff - hi CursorLine gui=NONE guibg=#222725 gui=none - - hi Folded gui=NONE guifg=#cfcfcd guibg=#4b208f - hi FoldColumn gui=NONE guifg=#8b8bcd guibg=#2e2e2e - - hi Directory gui=NONE guifg=#00ff8b guibg=NONE - hi LineNr gui=NONE guifg=#595A48 guibg=#2E2A26 - hi NonText gui=BOLD guifg=#8b8bcd guibg=NONE - hi SpecialKey gui=BOLD guifg=#8b00cd guibg=NONE - hi Title gui=BOLD guifg=#af4f4b guibg=#1e1e27 - hi Visual guifg=NONE guibg=#364458 - - hi Comment gui=italic guifg=#4F4B42 - hi Constant gui=NONE guifg=#ffcd8b guibg=NONE - hi Boolean gui=italic guifg=#B15A40 guibg=NONE - hi String guifg=#B99B74 gui=none - hi Error gui=NONE guifg=#ffffff guibg=#ff0000 - hi Identifier gui=NONE guifg=#CEB429 guibg=NONE - hi Ignore gui=NONE guifg=#8b8bcd guibg=NONE - "hi Number gui=NONE guifg=#506dbd guibg=NONE - hi Number guifg=#C0E06C ctermfg=207 - " def/end - hi PreProc gui=NONE guifg=#838861 guibg=NONE - hi Special gui=NONE guifg=#c080d0 guibg=NONE - " do/end - hi Statement gui=NONE guifg=#5FE8D0 guibg=NONE - hi Operator gui=NONE guifg=#828A66 guibg=NONE - "hi Todo gui=BOLD guifg=#303030 guibg=#c080d0 - "hi Todo guifg=#efef8f guibg=NONE gui=underline - hi Todo guifg=#FFFFFF guibg=bg gui=bold - hi Type gui=NONE guifg=#ff8bff guibg=NONE - hi Underlined gui=BOLD guifg=#ffffcd guibg=NONE - hi TaglistTagName gui=BOLD guifg=#808bed guibg=NONE - - " match parenthesis, brackets - hi MatchParen guifg=#00ff00 guibg=NONE gui=bold - hi MatchParen ctermfg=46 ctermbg=NONE cterm=bold - - " Popup Menu - " ---------- - " normal item in popup - hi Pmenu guifg=#e0e0e0 guibg=#303840 gui=none - hi Pmenu ctermfg=253 ctermbg=233 cterm=none - " selected item in popup - hi PmenuSel guifg=#cae682 guibg=#505860 gui=none - hi PmenuSel ctermfg=186 ctermbg=237 cterm=none - " scrollbar in popup - hi PMenuSbar guibg=#505860 gui=none - hi PMenuSbar ctermbg=59 cterm=none - " thumb of the scrollbar in the popup - hi PMenuThumb guibg=#808890 gui=none - hi PMenuThumb ctermbg=102 cterm=none - - " Ruby Highlighting - hi rubySymbol guifg=#DA8332 gui=italic - hi rubyClass guifg=#b3d38c gui=italic - hi rubyGlobalVariable guifg=#45B6DC - hi rubyClassVariable guifg=#CB9064 - hi rubyInstanceVariable guifg=#C3BF55 - hi rubyConstant guifg=#8EB564 gui=italic - hi rubyBlockParameter guifg=#CC6BDC - hi link rubyClass Keyword - hi link rubyModule Keyword - hi link rubyOperator Operator - hi link rubyIdentifier Identifier - hi rubyRegexp guifg=#B18A3D ctermfg=brown - hi rubyRegexpDelimiter guifg=#FF8000 ctermfg=brown - "hi rubyFunction guifg=#0066bb gui=bold - "hi rubyKeyword guifg=#66cd66 - "hi rubyIndentifier guifg=#008aff - "hi rubyGlobalVariable guifg=#dd7700 - "hi rubyPredefinedIdentifier guifg=#555555 gui=bold - "hi rubyString guifg=#0086d2 - "hi rubyStringDelimiter guifg=#dd7700 - "hi rubySpaceError guibg=#270000 - "hi rubyDocumentation guifg=#aaaaaa - "hi rubyData guifg=#555555 -else - exec "hi Normal cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(80) . "" - exec "hi IncSearch cterm=BOLD ctermfg=" . X("80") . " ctermbg=" . X(73) . "" - exec "hi Search cterm=NONE ctermfg=" . X("80") . " ctermbg=" . X(73) . "" - exec "hi ErrorMsg cterm=BOLD ctermfg=" . X("79") . " ctermbg=" . X(64) . "" - exec "hi WarningMsg cterm=BOLD ctermfg=" . X("79") . " ctermbg=" . X(68) . "" - exec "hi ModeMsg cterm=BOLD ctermfg=" . X("39") . "" - exec "hi MoreMsg cterm=BOLD ctermfg=" . X("39") . "" - exec "hi Question cterm=BOLD ctermfg=" . X("72") . "" - exec "hi StatusLine cterm=BOLD ctermfg=" . X("84") . " ctermbg=" . X(81) . "" - exec "hi StatusLineNC cterm=NONE ctermfg=" . X("84") . " ctermbg=" . X(81) . "" - exec "hi VertSplit cterm=NONE ctermfg=" . X("84") . " ctermbg=" . X(82) . "" - exec "hi WildMenu cterm=BOLD ctermfg=" . X("72") . " ctermbg=" . X(80) . "" - - exec "hi DiffText cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(24) . "" - exec "hi DiffChange cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(23) . "" - exec "hi DiffDelete cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(48) . "" - exec "hi DiffAdd cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(24) . "" - - exec "hi Cursor cterm=NONE ctermfg=" . X("8") . " ctermbg=" . X(39) . "" - exec "hi lCursor cterm=NONE ctermfg=" . X("8") . " ctermbg=" . X(39) . "" - exec "hi CursorIM cterm=NONE ctermfg=" . X("8") . " ctermbg=" . X(39) . "" - - exec "hi Folded cterm=NONE ctermfg=" . X("78") . " ctermbg=" . X(35) . "" - exec "hi FoldColumn cterm=NONE ctermfg=" . X("38") . " ctermbg=" . X(80) . "" - - exec "hi Directory cterm=NONE ctermfg=" . X("29") . " ctermbg=NONE" - exec "hi LineNr cterm=NONE ctermfg=" . X("38") . " ctermbg=" . X(80) . "" - exec "hi NonText cterm=BOLD ctermfg=" . X("38") . " ctermbg=NONE" - exec "hi SpecialKey cterm=BOLD ctermfg=" . X("34") . " ctermbg=NONE" - exec "hi Title cterm=BOLD ctermfg=" . X("52") . " ctermbg=" . X(80) . "" - exec "hi Visual cterm=NONE ctermfg=" . X("80") . " ctermbg=" . X(73) . "" - - exec "hi Comment cterm=NONE ctermfg=" . X("52") . " ctermbg=NONE" - exec "hi Constant cterm=NONE ctermfg=" . X("73") . " ctermbg=NONE" - exec "hi String cterm=NONE ctermfg=" . X("73") . " ctermbg=" . X(8) . "" - exec "hi Error cterm=NONE ctermfg=" . X("79") . " ctermbg=" . X(64) . "" - exec "hi Identifier cterm=NONE ctermfg=" . X("71") . " ctermbg=NONE" - exec "hi Ignore cterm=NONE ctermfg=" . X("38") . " ctermbg=NONE" - exec "hi Number cterm=NONE ctermfg=" . X("22") . " ctermbg=NONE" - exec "hi PreProc cterm=NONE ctermfg=" . X("10") . " ctermbg=NONE" - exec "hi Special cterm=NONE ctermfg=" . X("39") . " ctermbg=NONE" - exec "hi Statement cterm=NONE ctermfg=" . X("26") . " ctermbg=NONE" - exec "hi Todo cterm=BOLD ctermfg=" . X("08") . " ctermbg=" . X(39) . "" - exec "hi Type cterm=NONE ctermfg=" . X("71") . " ctermbg=NONE" - exec "hi Underlined cterm=BOLD ctermfg=" . X("78") . " ctermbg=NONE" - exec "hi TaglistTagName cterm=BOLD ctermfg=" . X("26") . " ctermbg=NONE" -endif - -" vim: set et : diff --git a/config/colorschemes/vim/skittles_autumn.vim b/config/colorschemes/vim/skittles_autumn.vim deleted file mode 100644 index 3347062..0000000 --- a/config/colorschemes/vim/skittles_autumn.vim +++ /dev/null @@ -1,99 +0,0 @@ -" A warm, console-only variation on skittles berry. -" @author Shawn Biddle -set background=dark -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="skittles_autumn" - -hi SpecialKey ctermfg=235 -hi NonText ctermfg=240 -hi Directory ctermfg=149 -hi ErrorMsg term=standout ctermfg=117 -hi IncSearch term=reverse ctermfg=186 ctermbg=0 -hi Search term=reverse ctermfg=15 ctermbg=66 -hi MoreMsg ctermfg=228 -hi ModeMsg ctermfg=228 -hi LineNr ctermfg=242 ctermbg=none -hi Question term=standout ctermfg=80 -hi StatusLine term=reverse ctermfg=66 -hi StatusLineNC term=reverse ctermfg=8 ctermbg=232 -hi VertSplit term=reverse ctermfg=8 ctermbg=232 -hi Title ctermfg=212 -hi Visual term=reverse ctermfg=255 ctermbg=95 -hi VisualNOS ctermfg=255 ctermbg=95 -hi WarningMsg term=standout ctermfg=15 ctermbg=236 -hi WildMenu term=standout ctermfg=80 ctermbg=none -hi Folded term=standout ctermfg=66 ctermbg=0 -hi FoldColumn term=standout ctermfg=66 ctermbg=none -hi DiffAdd ctermfg=none ctermbg=234 -hi DiffChange term=bold ctermbg=238 -hi DiffDelete ctermfg=124 ctermbg=52 -hi DiffText cterm=bold ctermbg=240 -hi SignColumn term=standout ctermfg=149 ctermbg=none -hi Conceal ctermfg=none ctermbg=none -hi SpellBad term=reverse ctermfg=255 ctermbg=9 guisp=#ff0000 -hi SpellCap term=reverse ctermfg=255 ctermbg=12 guisp=#0000ff -hi SpellRare term=reverse ctermfg=255 ctermbg=13 guisp=#ff00ff -hi SpellLocal ctermfg=255 ctermbg=14 guisp=#00ffff -hi Pmenu ctermfg=80 ctermbg=234 -hi PmenuSel ctermfg=80 ctermbg=8 -hi PmenuSbar ctermfg=80 ctermbg=0 -hi PmenuThumb ctermfg=80 -hi TabLine ctermfg=255 ctermbg=242 -hi TabLineSel ctermfg=255 -hi TabLineFill term=reverse ctermfg=255 -hi CursorColumn term=reverse ctermfg=255 ctermbg=none -hi CursorLine cterm=none term=none ctermbg=235 -hi CursorLineNr cterm=bold ctermfg=125 ctermbg=none -hi clear ColorColumn -hi link ColorColumn CursorLine -hi MatchParen cterm=bold ctermfg=0 ctermbg=208 -hi Comment ctermfg=66 cterm=italic -hi Constant ctermfg=91 cterm=bold -hi Special ctermfg=80 cterm=bold -hi Statement ctermfg=196 ctermbg=none -hi PreProc ctermfg=149 -hi Type ctermfg=80 -hi Underlined ctermfg=7 -hi Ignore ctermfg=8 -hi Error term=reverse ctermfg=125 ctermbg=7 -hi Todo term=standout ctermfg=0 ctermbg=11 -hi String ctermfg=202 -hi Character ctermfg=11 -hi Number ctermfg=91 -hi link Float Number -hi link Boolean Number -hi Function ctermfg=42 -hi Repeat ctermfg=89 cterm=bold -hi link Conditional Repeat -hi Label ctermfg=228 -hi Operator ctermfg=208 -hi Keyword ctermfg=117 cterm=bold -hi Exception ctermfg=142 cterm=bold -hi Include ctermfg=255 -hi Define ctermfg=30 cterm=bold -hi link Structure Define -hi Macro ctermfg=186 -hi PreCondit ctermfg=149 cterm=bold -hi StorageClass ctermfg=208 -hi Typedef ctermfg=80 -hi Tag ctermfg=117 -hi SpecialChar ctermfg=208 cterm=bold -hi Delimiter ctermfg=245 -hi SpecialComment ctermfg=66 cterm=bold -hi Debug ctermfg=138 cterm=bold -hi Normal ctermfg=222 ctermbg=235 -hi Identifier cterm=none term=none ctermfg=222 -hi clear Cursor -hi Cursor ctermbg=26 ctermfg=7 - - -hi GitGutterChange ctermfg=202 ctermbg=none cterm=bold -hi GitGutterDelete ctermfg=125 ctermbg=none cterm=bold -hi GitGutterAdd ctermfg=190 ctermbg=none cterm=bold -hi link TagbarSignature Type - diff --git a/config/colorschemes/vim/skittles_berry.vim b/config/colorschemes/vim/skittles_berry.vim deleted file mode 100644 index dec88ef..0000000 --- a/config/colorschemes/vim/skittles_berry.vim +++ /dev/null @@ -1,94 +0,0 @@ -set background=dark -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="skittles_berry" - -hi SpecialKey ctermfg=240 guifg=#585858 -hi NonText ctermfg=250 guifg=#bcbcbc -hi Directory ctermfg=149 gui=bold guifg=#afd75f -hi ErrorMsg term=standout ctermfg=117 gui=bold guifg=#87d7ff -hi IncSearch term=reverse ctermfg=186 ctermbg=0 guifg=#d7d787 guibg=#000000 -hi Search term=reverse ctermfg=15 ctermbg=66 guifg=#ffffff guibg=#455354 -hi MoreMsg ctermfg=228 guifg=#ffff87 -hi ModeMsg ctermfg=228 guifg=#ffff87 -hi LineNr ctermfg=15 ctermbg=0 guifg=#ffffff guibg=#000000 -hi Question term=standout ctermfg=81 guifg=#5fd7ff -hi StatusLine term=reverse ctermfg=66 guifg=#5f8787 -hi StatusLineNC term=reverse ctermfg=8 ctermbg=232 guifg=#7f7f7f guibg=#080808 -hi VertSplit term=reverse ctermfg=8 ctermbg=232 gui=bold guifg=#7f7f7f guibg=#080808 -hi Title ctermfg=209 guifg=#ff875f -hi Visual term=reverse ctermfg=255 ctermbg=95 guifg=#eeeeee guibg=#875f5f -hi VisualNOS ctermfg=255 ctermbg=95 guifg=#eeeeee guibg=#875f5f -hi WarningMsg term=standout ctermfg=15 ctermbg=236 gui=bold guifg=#ffffff guibg=#303030 -hi WildMenu term=standout ctermfg=81 ctermbg=233 guifg=#5fd7ff guibg=#121212 -hi Folded term=standout ctermfg=66 ctermbg=0 guifg=#465457 guibg=#000000 -hi FoldColumn term=standout ctermfg=66 ctermbg=0 guifg=#465457 guibg=#000000 -hi DiffAdd ctermfg=NONE ctermbg=24 guifg=#f8f8f2 guibg=#13354a -hi DiffChange term=bold ctermbg=238 guifg=#89807d guibg=#4c4745 -hi DiffDelete ctermfg=125 ctermbg=125 guifg=#960050 guibg=#1e0010 -hi DiffText term=reverse cterm=bold ctermfg=0 ctermbg=202 gui=bold guifg=#ad81ff guibg=#4a7800 -hi SignColumn term=standout ctermfg=149 ctermbg=74 guifg=#a6e22e guibg=#232526 -hi Conceal ctermfg=7 ctermbg=242 guifg=#e5e5e5 guibg=#080808 -hi SpellBad term=reverse ctermfg=255 ctermbg=9 guifg=#eeeeee guisp=#ff0000 -hi SpellCap term=reverse ctermfg=255 ctermbg=12 guifg=#eeeeee guisp=#0000ff -hi SpellRare term=reverse ctermfg=255 ctermbg=13 guifg=#eeeeee guisp=#ff00ff -hi SpellLocal ctermfg=255 ctermbg=14 guifg=#eeeeee guisp=#00ffff -hi Pmenu ctermfg=81 ctermbg=0 guifg=#5fd7ff guibg=#000000 -hi PmenuSel ctermfg=81 ctermbg=8 guifg=#5fd7ff guibg=#7f7f7f -hi PmenuSbar ctermfg=81 ctermbg=232 guifg=#5fd7ff guibg=#080808 -hi PmenuThumb ctermfg=81 guifg=#5fd7ff -hi TabLine ctermfg=255 ctermbg=242 guifg=#eeeeee guibg=#080808 -hi TabLineSel ctermfg=255 guifg=#eeeeee -hi TabLineFill cterm=none term=none ctermbg=235 guibg=#262626 -hi CursorColumn cterm=none term=none ctermbg=235 guibg=#262626 -hi CursorLine cterm=none term=none ctermbg=235 guibg=#262626 -hi clear ColorColumn -hi link ColorColumn CursorLine -hi MatchParen term=reverse ctermfg=0 ctermbg=208 gui=bold guifg=#000000 guibg=#ff8700 -hi Comment ctermfg=66 guifg=#5f8787 -hi Constant ctermfg=91 gui=bold guifg=#8700af -hi Special ctermfg=81 guifg=#5fd7ff -hi Statement ctermfg=202 ctermbg=233 guifg=#ff5f00 guibg=#121212 -hi PreProc ctermfg=149 guifg=#afd75f -hi Type ctermfg=81 guifg=#5fd7ff -hi Underlined ctermfg=8 gui=underline guifg=#7f7f7f -hi Ignore ctermfg=8 guifg=#7f7f7f -hi Error term=reverse gui=reverse ctermfg=125 ctermbg=7 guifg=#af005f guibg=#e5e5e5 -hi Todo term=standout ctermfg=0 ctermbg=11 gui=bold guifg=#000000 guibg=#ffff00 -hi String ctermfg=112 guifg=#87d700 -hi Character ctermfg=228 guifg=#ffff87 -hi Number ctermfg=129 guifg=#af00ff -hi Boolean ctermfg=93 guifg=#8700af -hi Float ctermfg=141 guifg=#af87ff -hi Function ctermfg=25 guifg=#005faf -hi Conditional ctermfg=124 gui=bold guifg=#af0000 -hi Repeat ctermfg=124 gui=bold guifg=#af0000 -hi Label ctermfg=228 guifg=#ffff87 -hi Operator ctermfg=214 guifg=#ffaf00 -hi Keyword ctermfg=117 gui=bold guifg=#87d700 -hi Exception ctermfg=106 gui=bold guifg=#87af00 -hi Include ctermfg=255 guifg=#eeeeee -hi Define ctermfg=124 gui=bold guifg=#af0000 -hi Macro ctermfg=186 guifg=#d7d787 -hi PreCondit ctermfg=149 gui=bold guifg=#afd75f -hi StorageClass ctermfg=208 guifg=#ff8700 -hi Structure ctermfg=81 guifg=#5fd7ff -hi Typedef ctermfg=81 guifg=#5fd7ff -hi Tag ctermfg=117 guifg=#87d7ff -hi SpecialChar ctermfg=208 gui=bold guifg=#ff8700 -hi Delimiter ctermfg=245 guifg=#8a8a8a -hi SpecialComment ctermfg=66 gui=bold guifg=#5f8787 -hi Debug ctermfg=138 gui=bold guifg=#af8787 -hi Normal ctermfg=230 ctermbg=233 guifg=#ffffd7 guibg=#121212 -hi Identifier cterm=none term=none ctermfg=228 guifg=#ffff87 -hi clear Cursor -hi Cursor ctermbg=26 ctermfg=7 guifg=#e5e5e5 guibg=#005fd7 - -hi GitGutterChange ctermfg=202 ctermbg=233 cterm=bold -hi GitGutterDelete ctermfg=125 ctermbg=233 cterm=bold -hi GitGutterAdd ctermfg=190 ctermbg=233 cterm=bold -hi link TagbarSignature Type diff --git a/config/colorschemes/vim/snow.vim b/config/colorschemes/vim/snow.vim deleted file mode 100644 index ebacde1..0000000 --- a/config/colorschemes/vim/snow.vim +++ /dev/null @@ -1,281 +0,0 @@ -" Name: snow -" Author: nightsense -" Maintainer: nightsense -" License: MIT - -if !(has('termguicolors') && &termguicolors) && !has('gui_running') - \ && (!exists('&t_Co') || &t_Co < 256) - echoerr '[snow] There are not enough colors.' - finish -endif - -hi clear -if exists('syntax_on') - syntax reset -endif - -let g:colors_name = 'snow' - -if &background ==# 'dark' - hi Bold ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold - hi Conceal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Directory ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold - hi EndOfBuffer ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Ignore ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Italic ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,italic gui=NONE,italic - hi ModeMsg ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi MoreMsg ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Question ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi NonText ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Normal ctermfg=249 ctermbg=236 guifg=#afb7c0 guibg=#2c2d30 guisp=NONE cterm=NONE gui=NONE - hi Terminal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Title ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold - hi Underlined ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,underline gui=NONE,underline - hi Comment ctermfg=246 ctermbg=NONE guifg=#8c95a0 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi CursorLineNr ctermfg=246 ctermbg=NONE guifg=#8c95a0 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi LineNr ctermfg=246 ctermbg=NONE guifg=#8c95a0 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi FoldColumn ctermfg=249 ctermbg=NONE guifg=#afb7c0 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi PmenuSel ctermfg=249 ctermbg=236 guifg=#afb7c0 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi SignColumn ctermfg=249 ctermbg=NONE guifg=#afb7c0 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi StatusLine ctermfg=249 ctermbg=236 guifg=#afb7c0 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi StatusLineTerm ctermfg=249 ctermbg=236 guifg=#afb7c0 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi TabLineSel ctermfg=249 ctermbg=236 guifg=#afb7c0 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi VisualNOS ctermfg=246 ctermbg=236 guifg=#8c95a0 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Cursor ctermfg=252 ctermbg=236 guifg=#cbd2d9 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi IncSearch ctermfg=252 ctermbg=236 guifg=#cbd2d9 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi ColorColumn ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi CursorColumn ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi CursorLine ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi DiffChange ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi Folded ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi MatchParen ctermfg=252 ctermbg=240 guifg=#cbd2d9 guibg=#535c65 guisp=NONE cterm=NONE gui=NONE - hi Pmenu ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi QuickFixLine ctermfg=NONE ctermbg=237 guifg=NONE guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi StatusLineNC ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi StatusLineTermNC ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi TabLine ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi ToolbarButton ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE,bold gui=NONE,bold - hi WildMenu ctermfg=249 ctermbg=237 guifg=#afb7c0 guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi PmenuSbar ctermfg=240 ctermbg=240 guifg=#535c65 guibg=#535c65 guisp=NONE cterm=NONE gui=NONE - hi PmenuThumb ctermfg=249 ctermbg=249 guifg=#afb7c0 guibg=#afb7c0 guisp=NONE cterm=NONE gui=NONE - hi TabLineFill ctermfg=237 ctermbg=237 guifg=#363a3e guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi ToolbarLine ctermfg=237 ctermbg=237 guifg=#363a3e guibg=#363a3e guisp=NONE cterm=NONE gui=NONE - hi VertSplit ctermfg=240 ctermbg=240 guifg=#535c65 guibg=#535c65 guisp=NONE cterm=NONE gui=NONE - hi SpellBad ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#df969e cterm=NONE,underline gui=NONE,undercurl - hi SpellCap ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#7fb0df cterm=NONE,underline gui=NONE,undercurl - hi SpellLocal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#5eb9b7 cterm=NONE,underline gui=NONE,undercurl - hi SpellRare ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#c39dd1 cterm=NONE,underline gui=NONE,undercurl - hi StorageClass ctermfg=139 ctermbg=NONE guifg=#a88cb3 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Structure ctermfg=139 ctermbg=NONE guifg=#a88cb3 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Type ctermfg=139 ctermbg=NONE guifg=#a88cb3 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Typedef ctermfg=139 ctermbg=NONE guifg=#a88cb3 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi TooLong ctermfg=139 ctermbg=236 guifg=#a88cb3 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi WarningMsg ctermfg=139 ctermbg=236 guifg=#a88cb3 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Function ctermfg=138 ctermbg=NONE guifg=#be868c guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Identifier ctermfg=138 ctermbg=NONE guifg=#be868c guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi DiffDelete ctermfg=138 ctermbg=236 guifg=#be868c guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi DiffRemoved ctermfg=138 ctermbg=236 guifg=#be868c guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Error ctermfg=138 ctermbg=236 guifg=#be868c guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi ErrorMsg ctermfg=138 ctermbg=236 guifg=#be868c guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Debug ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Delimiter ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Special ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi SpecialChar ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi SpecialComment ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi SpecialKey ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Tag ctermfg=137 ctermbg=NONE guifg=#ab916d guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi DiffChanged ctermfg=137 ctermbg=236 guifg=#ab916d guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi DiffText ctermfg=137 ctermbg=236 guifg=#ab916d guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Search ctermfg=137 ctermbg=236 guifg=#ab916d guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Conditional ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Exception ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Keyword ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Label ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Operator ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Repeat ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Statement ctermfg=108 ctermbg=NONE guifg=#7f9d77 guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi DiffAdd ctermfg=108 ctermbg=236 guifg=#7f9d77 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi DiffAdded ctermfg=108 ctermbg=236 guifg=#7f9d77 guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Define ctermfg=73 ctermbg=NONE guifg=#5da19f guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Include ctermfg=73 ctermbg=NONE guifg=#5da19f guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Macro ctermfg=73 ctermbg=NONE guifg=#5da19f guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi PreCondit ctermfg=73 ctermbg=NONE guifg=#5da19f guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi PreProc ctermfg=73 ctermbg=NONE guifg=#5da19f guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Todo ctermfg=73 ctermbg=236 guifg=#5da19f guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - hi Boolean ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Character ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Constant ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Float ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Number ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi String ctermfg=110 ctermbg=NONE guifg=#759abd guibg=NONE guisp=NONE cterm=NONE gui=NONE - hi Visual ctermfg=110 ctermbg=236 guifg=#759abd guibg=#2c2d30 guisp=NONE cterm=NONE,reverse gui=NONE,reverse - if has("nvim") - let g:terminal_color_0 = "#2c2d30" - let g:terminal_color_1 = "#be868c" - let g:terminal_color_2 = "#7f9d77" - let g:terminal_color_3 = "#ab916d" - let g:terminal_color_4 = "#759abd" - let g:terminal_color_5 = "#a88cb3" - let g:terminal_color_6 = "#5da19f" - let g:terminal_color_7 = "#afb7c0" - let g:terminal_color_8 = "#363a3e" - let g:terminal_color_9 = "#be868c" - let g:terminal_color_10 = "#7f9d77" - let g:terminal_color_11 = "#ab916d" - let g:terminal_color_12 = "#759abd" - let g:terminal_color_13 = "#a88cb3" - let g:terminal_color_14 = "#5da19f" - let g:terminal_color_15 = "#cbd2d9" - elseif has("terminal") - let g:terminal_ansi_colors = [ - \ "#2c2d30", - \ "#be868c", - \ "#7f9d77", - \ "#ab916d", - \ "#759abd", - \ "#a88cb3", - \ "#5da19f", - \ "#afb7c0", - \ "#363a3e", - \ "#be868c", - \ "#7f9d77", - \ "#ab916d", - \ "#759abd", - \ "#a88cb3", - \ "#5da19f", - \ "#cbd2d9" - \ ] - endif - finish -endif - -hi Bold ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold -hi Conceal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Directory ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold -hi EndOfBuffer ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Ignore ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Italic ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,italic gui=NONE,italic -hi ModeMsg ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi MoreMsg ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Question ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi NonText ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Normal ctermfg=240 ctermbg=231 guifg=#535c65 guibg=#fbffff guisp=NONE cterm=NONE gui=NONE -hi Terminal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Title ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold -hi Underlined ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=NONE cterm=NONE,underline gui=NONE,underline -hi Comment ctermfg=243 ctermbg=NONE guifg=#6d7782 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi CursorLineNr ctermfg=243 ctermbg=NONE guifg=#6d7782 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi LineNr ctermfg=243 ctermbg=NONE guifg=#6d7782 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi FoldColumn ctermfg=240 ctermbg=NONE guifg=#535c65 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi PmenuSel ctermfg=240 ctermbg=231 guifg=#535c65 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi SignColumn ctermfg=240 ctermbg=NONE guifg=#535c65 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi StatusLine ctermfg=240 ctermbg=231 guifg=#535c65 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi StatusLineTerm ctermfg=240 ctermbg=231 guifg=#535c65 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi TabLineSel ctermfg=240 ctermbg=231 guifg=#535c65 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi VisualNOS ctermfg=243 ctermbg=231 guifg=#6d7782 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Cursor ctermfg=238 ctermbg=231 guifg=#434951 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi IncSearch ctermfg=238 ctermbg=231 guifg=#434951 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi ColorColumn ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi CursorLine ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi DiffChange ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi Folded ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi MatchParen ctermfg=238 ctermbg=249 guifg=#434951 guibg=#afb7c0 guisp=NONE cterm=NONE gui=NONE -hi Pmenu ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi QuickFixLine ctermfg=NONE ctermbg=255 guifg=NONE guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi StatusLineNC ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi StatusLineTermNC ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi TabLine ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi ToolbarButton ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE,bold gui=NONE,bold -hi WildMenu ctermfg=240 ctermbg=255 guifg=#535c65 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi PmenuSbar ctermfg=249 ctermbg=249 guifg=#afb7c0 guibg=#afb7c0 guisp=NONE cterm=NONE gui=NONE -hi PmenuThumb ctermfg=240 ctermbg=240 guifg=#535c65 guibg=#535c65 guisp=NONE cterm=NONE gui=NONE -hi TabLineFill ctermfg=255 ctermbg=255 guifg=#e5ebf1 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi ToolbarLine ctermfg=255 ctermbg=255 guifg=#e5ebf1 guibg=#e5ebf1 guisp=NONE cterm=NONE gui=NONE -hi VertSplit ctermfg=249 ctermbg=249 guifg=#afb7c0 guibg=#afb7c0 guisp=NONE cterm=NONE gui=NONE -hi SpellBad ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#bc4d61 cterm=NONE,underline gui=NONE,undercurl -hi SpellCap ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#007cc3 cterm=NONE,underline gui=NONE,undercurl -hi SpellLocal ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#008787 cterm=NONE,underline gui=NONE,undercurl -hi SpellRare ctermfg=NONE ctermbg=NONE guifg=NONE guibg=NONE guisp=#965dae cterm=NONE,underline gui=NONE,undercurl -hi StorageClass ctermfg=97 ctermbg=NONE guifg=#8f63a2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Structure ctermfg=97 ctermbg=NONE guifg=#8f63a2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Type ctermfg=97 ctermbg=NONE guifg=#8f63a2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Typedef ctermfg=97 ctermbg=NONE guifg=#8f63a2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi TooLong ctermfg=97 ctermbg=231 guifg=#8f63a2 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi WarningMsg ctermfg=97 ctermbg=231 guifg=#8f63a2 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Function ctermfg=131 ctermbg=NONE guifg=#ae5865 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Identifier ctermfg=131 ctermbg=NONE guifg=#ae5865 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi DiffDelete ctermfg=131 ctermbg=231 guifg=#ae5865 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi DiffRemoved ctermfg=131 ctermbg=231 guifg=#ae5865 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Error ctermfg=131 ctermbg=231 guifg=#ae5865 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi ErrorMsg ctermfg=131 ctermbg=231 guifg=#ae5865 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Debug ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Delimiter ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Special ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi SpecialChar ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi SpecialComment ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi SpecialKey ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Tag ctermfg=94 ctermbg=NONE guifg=#906c33 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi DiffChanged ctermfg=94 ctermbg=231 guifg=#906c33 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi DiffText ctermfg=94 ctermbg=231 guifg=#906c33 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Search ctermfg=179 ctermbg=238 guifg=#e5bb7e guibg=#434951 guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Conditional ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Exception ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Keyword ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Label ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Operator ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Repeat ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Statement ctermfg=65 ctermbg=NONE guifg=#4d7f43 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi DiffAdd ctermfg=65 ctermbg=231 guifg=#4d7f43 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi DiffAdded ctermfg=65 ctermbg=231 guifg=#4d7f43 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Define ctermfg=30 ctermbg=NONE guifg=#008483 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Include ctermfg=30 ctermbg=NONE guifg=#008483 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Macro ctermfg=30 ctermbg=NONE guifg=#008483 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi PreCondit ctermfg=30 ctermbg=NONE guifg=#008483 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi PreProc ctermfg=30 ctermbg=NONE guifg=#008483 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Todo ctermfg=30 ctermbg=231 guifg=#008483 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -hi Boolean ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Character ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Constant ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Float ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Number ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi String ctermfg=32 ctermbg=NONE guifg=#2b7ab2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -hi Visual ctermfg=32 ctermbg=231 guifg=#2b7ab2 guibg=#fbffff guisp=NONE cterm=NONE,reverse gui=NONE,reverse -if has("nvim") - let g:terminal_color_0 = "#fbffff" - let g:terminal_color_1 = "#ae5865" - let g:terminal_color_2 = "#4d7f43" - let g:terminal_color_3 = "#906c33" - let g:terminal_color_4 = "#2b7ab2" - let g:terminal_color_5 = "#8f63a2" - let g:terminal_color_6 = "#008483" - let g:terminal_color_7 = "#535c65" - let g:terminal_color_8 = "#e5ebf1" - let g:terminal_color_9 = "#ae5865" - let g:terminal_color_10 = "#4d7f43" - let g:terminal_color_11 = "#906c33" - let g:terminal_color_12 = "#2b7ab2" - let g:terminal_color_13 = "#8f63a2" - let g:terminal_color_14 = "#008483" - let g:terminal_color_15 = "#434951" -elseif has("terminal") - let g:terminal_ansi_colors = [ - \ "#fbffff", - \ "#ae5865", - \ "#4d7f43", - \ "#906c33", - \ "#2b7ab2", - \ "#8f63a2", - \ "#008483", - \ "#535c65", - \ "#e5ebf1", - \ "#ae5865", - \ "#4d7f43", - \ "#906c33", - \ "#2b7ab2", - \ "#8f63a2", - \ "#008483", - \ "#434951" - \ ] -endif -finish diff --git a/config/colorschemes/vim/tigrana-256-dark.vim b/config/colorschemes/vim/tigrana-256-dark.vim deleted file mode 100644 index b0765b6..0000000 --- a/config/colorschemes/vim/tigrana-256-dark.vim +++ /dev/null @@ -1,161 +0,0 @@ -" Tigrana 256 Dark -" Author: Joseph Carter -" URL: https://github.com/iKarith/tigrana -" Created: 2017 -" Version: 0.3 -" -" Based on https://github.com/baskerville/bubblegum - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name="tigrana-256-dark" - -" Main -hi Normal ctermfg=252 ctermbg=234 cterm=none guifg=#D0D0D0 guibg=#1c1c1c gui=none -hi Comment ctermfg=244 cterm=none guifg=#808080 gui=none - -" Constant -hi Constant ctermfg=229 cterm=none guifg=#FFFFAF gui=none -hi link String Constant -hi Character ctermfg=187 cterm=none guifg=#D7D7AF gui=none -hi Number ctermfg=180 cterm=none guifg=#D7AF87 gui=none -hi Boolean ctermfg=187 cterm=none guifg=#D7D7AF gui=none -hi Float ctermfg=180 cterm=none guifg=#D7AF87 gui=none - -" Variable Name -hi Identifier ctermfg=182 cterm=none guifg=#D7AFD7 gui=none -hi Function ctermfg=182 cterm=none guifg=#D7AFD7 gui=none - -" Statement -hi Statement ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Conditional ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Repeat ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Label ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Operator ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Keyword ctermfg=110 cterm=none guifg=#87AFD7 gui=none -hi Exception ctermfg=110 cterm=none guifg=#87AFD7 gui=none - -" Preprocessor -hi PreProc ctermfg=150 cterm=none guifg=#AFD787 gui=none -hi Include ctermfg=150 cterm=none guifg=#AFD787 gui=none -hi Define ctermfg=150 cterm=none guifg=#AFD787 gui=none -hi Macro ctermfg=150 cterm=none guifg=#AFD787 gui=none -hi PreCondit ctermfg=150 cterm=none guifg=#AFD787 gui=none - -" Type -hi Type ctermfg=146 cterm=none guifg=#AFAFD7 gui=none -hi StorageClass ctermfg=146 cterm=none guifg=#AFAFD7 gui=none -hi Structure ctermfg=146 cterm=none guifg=#AFAFD7 gui=none -hi Typedef ctermfg=146 cterm=none guifg=#AFAFD7 gui=none - -" Special -hi Special ctermfg=174 cterm=none guifg=#D78787 gui=none -hi SpecialChar ctermfg=174 cterm=none guifg=#D78787 gui=none -hi Tag ctermfg=174 cterm=none guifg=#D78787 gui=none -hi Delimiter ctermfg=174 cterm=none guifg=#D78787 gui=none -hi SpecialComment ctermfg=174 cterm=none guifg=#D78787 gui=none -hi Debug ctermfg=174 cterm=none guifg=#D78787 gui=none -hi Underlined ctermfg=249 cterm=underline guifg=#B2B2B2 gui=underline -hi Ignore ctermfg=235 cterm=none guifg=#262626 gui=none -hi Error ctermfg=231 ctermbg=167 cterm=none guifg=#FFFFFF guibg=#D75F5F gui=none -hi Todo ctermfg=16 cterm=none guifg=#000000 ctermbg=184 guibg=#dfdf00 gui=none - -" Window -hi StatusLine ctermfg=231 ctermbg=237 cterm=none guifg=#B2B2B2 guibg=#FFFFFF gui=none -hi StatusLineNC ctermfg=244 ctermbg=237 cterm=none guifg=#808080 guibg=#3A3A3A gui=none -hi TabLine ctermfg=249 ctermbg=237 cterm=none guifg=#B2B2B2 guibg=#3A3A3A gui=none -hi TabLineSel ctermfg=253 ctermbg=238 cterm=none guifg=#DADADA guibg=#444444 gui=none -hi TabLineFill ctermbg=237 cterm=none guibg=#3A3A3A gui=none -hi VertSplit ctermfg=237 ctermbg=237 cterm=none guifg=#3A3A3A guibg=#3A3A3A gui=none - -" Menu -hi Pmenu ctermfg=249 ctermbg=237 cterm=none guifg=#B2B2B2 guibg=#3A3A3A gui=none -hi PmenuSel ctermfg=231 ctermbg=244 cterm=none guifg=#FFFFFF guibg=#808080 gui=none -hi PmenuSbar ctermbg=59 cterm=none guibg=#5F5F5F gui=none -hi PmenuThumb ctermbg=246 cterm=none guibg=#949494 gui=none -hi WildMenu ctermfg=232 ctermbg=98 cterm=none guifg=#080808 guibg=#875FD7 gui=none - -" Selection -hi Visual ctermfg=235 ctermbg=117 cterm=none guifg=#262626 guibg=#87D7FF gui=none -hi VisualNOS ctermfg=235 ctermbg=80 cterm=none guifg=#262626 guibg=#5FD7D7 gui=none - -" Message -hi ErrorMsg ctermfg=210 cterm=none guifg=#FF8787 gui=none -hi WarningMsg ctermfg=140 cterm=none guifg=#AF87D7 gui=none -hi MoreMsg ctermfg=72 cterm=none guifg=#5FAF87 gui=none -hi ModeMsg ctermfg=222 cterm=bold guifg=#FFD787 gui=bold -hi Question ctermfg=38 cterm=none guifg=#00AFD7 gui=none - -" Mark -hi Folded ctermfg=244 cterm=none guifg=#808080 gui=none -hi FoldColumn ctermfg=79 ctermbg=233 cterm=none guifg=#5FD7AF guibg=#121212 gui=none -hi SignColumn ctermfg=184 ctermbg=233 cterm=none guifg=#D7D700 guibg=#121212 gui=none -hi ColorColumn ctermbg=233 cterm=none guibg=#121212 gui=none -hi LineNr ctermfg=244 ctermbg=233 cterm=none guifg=#808080 guibg=#121212 gui=none -hi MatchParen ctermfg=16 ctermbg=215 cterm=none guifg=#000000 guibg=#FFAF5F gui=none - -" Cursor -hi CursorColumn ctermbg=237 cterm=none guibg=#3A3A3A gui=none -hi CursorLine ctermbg=237 cterm=none guibg=#3A3A3A gui=none -hi CursorLineNr ctermfg=249 ctermbg=237 cterm=none guifg=#B2B2B2 guibg=#3A3A3A gui=none - -" Search -hi Search ctermfg=16 ctermbg=179 cterm=none guifg=#000000 guibg=#D7AF5F gui=none -hi IncSearch ctermfg=231 ctermbg=168 cterm=none guifg=#FFFFFF guibg=#D75F87 gui=none - -" Diff Mode -hi DiffAdd ctermfg=16 ctermbg=149 cterm=none guifg=#000000 guibg=#AFD75F gui=none -hi DiffChange ctermfg=16 ctermbg=217 cterm=none guifg=#000000 guibg=#FFAFAF gui=none -hi DiffText ctermfg=16 ctermbg=211 cterm=bold guifg=#000000 guibg=#FF87AF gui=bold -hi DiffDelete ctermfg=16 ctermbg=249 cterm=none guifg=#000000 guibg=#B2B2B2 gui=none - -" Spell -hi SpellBad ctermfg=217 ctermbg=bg cterm=underline guifg=#FFAFAF guibg=bg gui=underline -hi SpellCap ctermfg=189 ctermbg=bg cterm=underline guifg=#DFDFFF guibg=bg gui=underline -hi SpellRare ctermfg=168 ctermbg=bg cterm=underline guifg=#D75F87 guibg=bg gui=underline -hi SpellLocal ctermfg=98 ctermbg=bg cterm=underline guifg=#875FD7 guibg=bg gui=underline - -" Misc -hi SpecialKey ctermfg=114 cterm=none guifg=#87D787 gui=none -hi NonText ctermfg=244 cterm=none guifg=#808080 gui=none -hi Directory ctermfg=103 cterm=none guifg=#8787AF gui=none -hi Title ctermfg=109 cterm=none guifg=#87AFAF gui=none -hi Conceal ctermfg=77 cterm=none guifg=#5FD75F gui=none -hi Noise ctermfg=247 cterm=none guifg=#9E9E9E gui=none -hi helpHyperTextJump ctermfg=74 cterm=none guifg=#5FAFD7 gui=none -hi perlSharpBang ctermfg=244 cterm=none guifg=#808080 gui=none -hi rubySharpBang ctermfg=244 cterm=none guifg=#808080 gui=none -hi jsFuncCall ctermfg=116 cterm=none guifg=#87D7D7 gui=none - -" Html -hi javaScriptNumber ctermfg=179 cterm=none guifg=#D7AF5F gui=none -hi htmlTag ctermfg=147 cterm=none guifg=#AFAFFF gui=none -hi htmlEndTag ctermfg=147 cterm=none guifg=#AFAFFF gui=none -hi htmlTagName ctermfg=175 cterm=none guifg=#D787AF gui=none -hi htmlString ctermfg=187 cterm=none guifg=#D7D7AF gui=none - -" Vim -hi vimFold ctermfg=244 cterm=none guifg=#808080 gui=none -hi vimCommentTitle ctermfg=249 cterm=none guifg=#B2B2B2 gui=none - -" Diff File -hi diffFile ctermfg=244 cterm=none guifg=#808080 gui=none -hi diffLine ctermfg=186 cterm=none guifg=#D7D787 gui=none -hi diffAdded ctermfg=107 cterm=none guifg=#87AF5F gui=none -hi diffRemoved ctermfg=175 cterm=none guifg=#D787AF gui=none -hi diffChanged ctermfg=179 cterm=none guifg=#D7AF5F gui=none -hi diffSubname ctermfg=252 cterm=none guifg=#D0D0D0 gui=none -hi diffOldLine ctermfg=104 cterm=none guifg=#8787D7 gui=none - -" Mail -hi mailSubject ctermfg=109 cterm=none guifg=#87AFAF gui=none -hi mailSignature ctermfg=244 cterm=none guifg=#808080 gui=none - -" Markdown -hi markdownCode ctermfg=244 cterm=none guifg=#808080 gui=none -hi markdownCodeBlock ctermfg=244 cterm=none guifg=#808080 gui=none -hi markdownItalic ctermfg=252 cterm=none guifg=#D0D0D0 gui=none diff --git a/config/colorschemes/vim/up.vim b/config/colorschemes/vim/up.vim deleted file mode 100644 index 6469ac5..0000000 --- a/config/colorschemes/vim/up.vim +++ /dev/null @@ -1,190 +0,0 @@ -" Maintainer: Sasha Koss -" Version: 0.9 -" Last Change: 9 Dec 2010 -" Credits: Vim color scheme "up" originaly based on BusyBee colorscheme create by Patrick J. Anderson - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "up" - -"————————————————+———————————————————————————————————————————————+———+———————————————————————————————————————————————" -" | GUI | | TERMINAL " -" TYPE +———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————" -" | foreground | background | | | foreground | background | " -"————————————————+———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————" - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Guideline -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi Action guifg=#FBDE2D guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Key guifg=#FBDE2D guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Interface " -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi CursorLine guifg=NONE guibg=#202020 ctermbg=234 cterm=NONE -hi CursorColumn guifg=NONE guibg=#202020 ctermbg=234 cterm=NONE -hi MatchParen guifg=#d0ffc0 guibg=#202020 gui=bold ctermfg=157 ctermbg=234 cterm=bold -hi Pmenu guifg=#ffffff guibg=#444444 ctermfg=255 ctermbg=238 cterm=NONE -hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148 cterm=NONE -hi PmenuSbar guifg=#000000 guibg=#808080 ctermfg=0 ctermbg=248 cterm=NONE -hi PmenuThumb guifg=#ffffff guibg=#000000 ctermfg=255 ctermbg=0 cterm=NONE - -hi Normal guifg=#e2e2e5 guibg=#1B1B1B gui=none ctermfg=253 ctermbg=235 cterm=NONE -hi NonText guifg=#333333 guibg=#232323 gui=none ctermfg=244 ctermbg=235 cterm=NONE - -hi LineNr guifg=#707070 guibg=#3E3E3E gui=none ctermfg=244 ctermbg=233 cterm=NONE - -hi StatusLine guifg=#0e0e0e guibg=#fe9e21 gui=none ctermfg=253 ctermbg=238 cterm=NONE -hi StatusLineNC guifg=#f0f6e6 guibg=#68774f gui=none ctermfg=246 ctermbg=238 cterm=NONE -hi VertSplit guifg=#828282 guibg=#828282 gui=none ctermfg=238 ctermbg=238 cterm=NONE -hi Folded guifg=#a0a8b0 guibg=#384048 gui=none ctermfg=248 ctermbg=4 cterm=NONE -hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=254 cterm=bold -hi Visual guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=229 ctermbg=24 cterm=NONE -hi SpecialKey guifg=#808080 guibg=#343434 gui=none ctermfg=244 ctermbg=236 cterm=NONE - -hi Cursor guifg=#000000 guibg=#DEFF8E gui=none ctermbg=241 ctermbg=NONE cterm=NONE - - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" VimL related colors -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link vimGroup Action - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Colorscheme related colors -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link vimHiGroup Action -hi vimHiGuiRgb guifg=#ABB78D guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -" 7.3 features - -hi ColorColumn guifg=NONE guibg=#323232 gui=NONE ctermfg=NONE ctermbg=234 cterm=NONE - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Basic code highlight -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi Comment guifg=#605A4E gui=italic ctermfg=223 -hi SpecialComment guifg=#FAF4C6 gui=NONE ctermfg=229 -hi Todo guifg=#8f8f8f gui=NONE ctermfg=245 -hi Boolean guifg=#b1d631 gui=NONE ctermfg=148 -hi Identifier guifg=#b1d631 gui=NONE ctermfg=148 -hi Function guifg=#B7EF52 gui=NONE ctermfg=155 -hi Type guifg=#81C7FF gui=NONE ctermfg=75 -hi Typedef guifg=#7AFFFD gui=NONE ctermfg=81 -hi StorageClass guifg=#7AFFFD gui=NONE ctermfg=81 -hi Statement guifg=#7AFFFD gui=NONE ctermfg=81 -hi Keyword guifg=#ff9800 gui=NONE ctermfg=208 -hi Constant guifg=#14F2E7 gui=NONE ctermfg=111 -hi Number guifg=#FEFFD5 gui=NONE ctermfg=229 -hi Special guifg=#ff9800 gui=NONE ctermfg=208 -hi PreProc guifg=#faf4c6 gui=NONE ctermfg=229 -hi Define guifg=#7AFFFD gui=NONE ctermfg=81 - -hi String guifg=#8cd9a2 guibg=NONE gui=NONE ctermfg=157 -hi Character guifg=#22ff00 guibg=NONE gui=NONE ctermfg=2 -hi SpecialChar guifg=#22ff44 guibg=NONE gui=bold ctermfg=2 -hi Delimiter guifg=#ff9800 guibg=NONE gui=NONE ctermfg=208 - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" NERDTree highlight -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi Directory guifg=#66A0C4 ctermfg=65 -hi treeCWD guifg=#BBE7FB ctermfg=67 - -hi treeDirSlash guifg=#4D4D4D ctermfg=237 -hi treePart guifg=#919191 ctermfg=247 - -hi treeUp guifg=#4D4D4D ctermfg=237 - -hi treeHelp guifg=#4D4D4D ctermfg=237 - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" SQL -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link sqlOperator Special - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Java -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -" nth special - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" Ruby -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link rubyFunction Action -hi link rubyStringEscape SpecialChar - -hi rubyLocalVariableOrMethod guifg=#F5F0C7 - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" HTML -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi def link javaScript Normal - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" HAML -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link hamlTag htmlTagName - -hi link hamlClass Action -hi link hamlClassChar hamlClass - -hi hamlId guifg=#9FDC42 -hi link hamlIdChar hamlId - - -hi hamlRubyChar guifg=#C86161 -hi link hamlInterpolationDelimiter hamlRubyChar - - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" CSS -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link cssTagName htmlTagName -hi link cssClassName hamlClass -hi link cssInentifier hamlId -hi cssBoxProp guifg=#9BA789 -hi link cssColorProp cssBoxProp -hi link cssRenderProp cssBoxProp -hi link cssFontProp cssBoxProp -hi link cssTextProp cssBoxProp - -hi cssImportant guifg=#E8D1D1 - -hi cssUIAttr guifg=#F5F0C7 -hi link cssValueLength cssUIAttr -hi link cssColor cssUIAttr -hi link cssColorAttr cssUIAttr -hi link cssCommonAttr cssUIAttr -hi link cssTextAttr cssUIAttr -hi link cssFontAttr cssUIAttr -hi link cssRenderAttr cssUIAttr - -"hi cssBoxProp guibg=#3E2A2A -"hi cssColorProp guibg=#403E31 - -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" -" SASS -"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————" - -hi link sassClassChar cssClass -hi link sassProperty cssDefinition diff --git a/config/colorschemes/vim/vice.vim b/config/colorschemes/vim/vice.vim deleted file mode 100644 index 69ed6ea..0000000 --- a/config/colorschemes/vim/vice.vim +++ /dev/null @@ -1,164 +0,0 @@ -" /$$ /$$ /$$$$$$ /$$$$$$ /$$$$$$$$ -" | $$ | $$|_ $$_/ /$$__ $$| $$_____/ -" | $$ | $$ | $$ | $$ \__/| $$ -" | $$ / $$/ | $$ | $$ | $$$$$ -" \ $$ $$/ | $$ | $$ | $$__/ -" \ $$$/ | $$ | $$ $$| $$ -" \ $/ /$$$$$$| $$$$$$/| $$$$$$$$ -" \_/ |______/ \______/ |________/ - -" URL: https://github.com/bcicen/vim-vice -" Author: Bradley Cicenas -" License: MIT - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -set t_Co=256 -let g:colors_name = "vice" - -" Color definitions -let s:white = [231, "#ffffff"] -let s:grey0 = [102, "#878787"] "lightest grey -let s:grey1 = [238, "#444444"] "mid grey -let s:grey2 = [236, "#303030"] "darkest grey -let s:pink = [212, "#ff87d7"] -let s:light_pink = [218, "#ffafd7"] -let s:hot_pink = [201, "#ff00ff" ] -let s:red = [197, "#ff005f" ] -let s:teal = [123, "#87ffff"] -let s:light_blue = [159, "#afffff"] -let s:light_yellow = [229, "#ffffaf"] -let s:mint = [158, "#afffd7"] -let s:dark_mint = [49, "#00ffaf"] -let s:lavender = [183, "#d7afff"] -let s:gray_purple = [146, "#afafd7"] -let s:dark_lavender = [97, "#875faf"] -let s:none = ["NONE", ""] - -" func -function! s:Color(name, fg, bg, style) - execute "hi " . a:name . " ctermfg=" . a:fg[0] . " ctermbg=" . a:bg[0] " cterm=" . a:style - if a:fg[1] != "" - execute "hi " . a:name . " guifg=" . a:fg[1] - endif - if a:bg[1] != "" - execute "hi " . a:name . " guibg=" . a:bg[1] - endif - execute "hi " . a:name . " gui=" . a:style -endfun - -call s:Color("Normal", s:white, s:grey2, "NONE") -call s:Color("Cursor", s:grey2, s:white, "NONE") -call s:Color("Visual", s:none, s:grey0, "NONE") -call s:Color("CursorLine", s:none, s:grey2, "NONE") -call s:Color("CursorColumn", s:none, s:grey2, "NONE") -call s:Color("CursorLineNr", s:hot_pink, s:none, "NONE") -call s:Color("ColorColumn", s:none, s:grey2, "NONE") -call s:Color("LineNr", s:grey0, s:grey2, "NONE") -call s:Color("VertSplit", s:grey0, s:grey0, "NONE") -call s:Color("MatchParen", s:grey0, s:light_blue, "NONE") -call s:Color("StatusLine", s:white, s:grey1, "NONE") -call s:Color("StatusLineNC", s:white, s:grey0, "NONE") -call s:Color("Pmenu", s:white, s:grey0, "NONE") -call s:Color("PmenuSel", s:grey0, s:light_blue, "NONE") -call s:Color("IncSearch", s:grey0, s:light_blue, "NONE") -call s:Color("Search", s:grey0, s:light_blue, "NONE") -call s:Color("Directory", s:light_blue, s:none, "NONE") -call s:Color("Folded", s:mint, s:grey1, "NONE") -call s:Color("Define", s:gray_purple, s:none, "NONE") - -" Diff -call s:Color("DiffAdd", s:white, s:dark_mint, "NONE") -call s:Color("DiffDelete", s:red, s:none, "NONE") -call s:Color("DiffChange", s:white, s:grey2, "NONE") -call s:Color("DiffText", s:grey0, s:light_blue, "NONE") - -" Command line -call s:Color("ErrorMsg", s:white, s:hot_pink, "NONE") -call s:Color("Overlength", s:grey0, s:light_yellow, "NONE") -call s:Color("WarningMsg", s:white, s:hot_pink, "NONE") - -" Elements -call s:Color("Boolean", s:lavender, s:none, "NONE") -call s:Color("Character", s:lavender, s:none, "NONE") -call s:Color("Comment", s:gray_purple, s:none, "NONE") -call s:Color("Conditional", s:light_pink, s:none, "NONE") -call s:Color("Constant", s:mint, s:none, "NONE") -call s:Color("Float", s:lavender, s:none, "NONE") -call s:Color("Function", s:pink, s:none, "NONE") -call s:Color("Identifier", s:pink, s:none, "NONE") -call s:Color("Keyword", s:pink, s:none, "NONE") -call s:Color("Label", s:teal, s:none, "NONE") -call s:Color("NonText", s:white, s:grey2, "NONE") -call s:Color("Number", s:mint, s:none, "NONE") -call s:Color("Operator", s:light_pink, s:none, "NONE") -call s:Color("PreProc", s:teal, s:none, "NONE") -call s:Color("Special", s:pink, s:none, "NONE") -call s:Color("SpecialKey", s:white, s:grey2, "NONE") -call s:Color("Statement", s:teal, s:none, "NONE") -call s:Color("StorageClass", s:mint, s:none, "NONE") -call s:Color("String", s:mint, s:none, "NONE") -call s:Color("Tag", s:light_pink, s:none, "NONE") -call s:Color("Title", s:white, s:none, "NONE") -call s:Color("Todo", s:hot_pink, s:white, "inverse,NONE") -call s:Color("Type", s:mint, s:none, "NONE") -call s:Color("Underlined", s:none, s:none, "underline") - -" Tab line -call s:Color("TabLine", s:mint, s:grey1, "NONE") -call s:Color("TabLineSel", s:grey1, s:mint, "NONE") -call s:Color("TabLineFill", s:white, s:grey2, "NONE") - -" Language and filetype specific -call s:Color("pythonStatement", s:teal, s:none, "NONE") - -call s:Color("htmlTag", s:none, s:none, "NONE") -call s:Color("htmlEndTag", s:none, s:none, "NONE") -call s:Color("htmlTagName", s:none, s:none, "NONE") -call s:Color("htmlArg", s:none, s:none, "NONE") -call s:Color("htmlSpecialChar", s:lavender, s:none, "NONE") -call s:Color("htmlItalic", s:mint, s:none, "NONE") -call s:Color("htmlBold", s:dark_mint, s:none, "NONE") - -call s:Color("javaScriptFunction", s:mint, s:none, "NONE") -call s:Color("javaScriptRailsFunction", s:mint, s:none, "NONE") -call s:Color("javaScriptBraces", s:none, s:none, "NONE") - -call s:Color("yamlKey", s:light_pink, s:none, "NONE") -call s:Color("yamlAnchor", s:none, s:none, "NONE") -call s:Color("yamlAlias", s:none, s:none, "NONE") -call s:Color("yamlDocumentHeader", s:light_yellow, s:none, "NONE") -call s:Color("yamlPlainScalar", s:light_blue, s:none, "NONE") -call s:Color("yamlBlockCollectionItemStart", s:light_pink, s:none, "NONE") - -call s:Color("cssURL", s:hot_pink, s:none, "NONE") -call s:Color("cssFunctionName", s:mint, s:none, "NONE") -call s:Color("cssColor", s:lavender, s:none, "NONE") -call s:Color("cssPseudoClassId", s:light_pink, s:none, "NONE") -call s:Color("cssClassName", s:light_pink, s:none, "NONE") -call s:Color("cssValueLength", s:lavender, s:none, "NONE") -call s:Color("cssCommonAttr", s:mint, s:none, "NONE") -call s:Color("cssBraces", s:none, s:none, "NONE") - -call s:Color("jsThis", s:light_pink, s:none, "NONE") -call s:Color("jsBraces", s:pink, s:none, "NONE") -call s:Color("jsGlobalObjects", s:mint, s:none, "NONE") - -call s:Color("coffeeCurly", s:lavender, s:none, "NONE") -call s:Color("coffeeObjAssign", s:pink, s:none, "NONE") - -call s:Color("cjsxAttribProperty", s:lavender, s:none, "NONE") - -call s:Color("markdownH1", s:light_blue, s:none, "NONE") -call s:Color("markdownH2", s:light_blue, s:none, "NONE") -call s:Color("markdownH3", s:light_blue, s:none, "NONE") -call s:Color("markdownH4", s:light_blue, s:none, "NONE") -call s:Color("markdownH5", s:light_blue, s:none, "NONE") -call s:Color("markdownH6", s:light_blue, s:none, "NONE") -call s:Color("markdownHeadingDelimiter", s:light_blue, s:none, "NONE") -call s:Color("markdownRule", s:light_blue, s:none, "NONE") diff --git a/config/compton/compton.conf b/config/compton.conf similarity index 100% rename from config/compton/compton.conf rename to config/compton.conf diff --git a/config/git/gitconfig b/config/gitconfig similarity index 100% rename from config/git/gitconfig rename to config/gitconfig diff --git a/config/i3/config b/config/i3.conf similarity index 63% rename from config/i3/config rename to config/i3.conf index b2c14c7..c228edc 100644 --- a/config/i3/config +++ b/config/i3.conf @@ -3,43 +3,22 @@ # Please see https://i3wm.org/docs/userguide.html for a complete reference! set $mod Mod4 - font pango:monospace 20 -set $UTILS /home/w0ryn/.config/wryn/i3utils - -set $AUDIO_CLIENT_CLASS ^Audio$ -set $AMIRROR_CLIENT_CLASS ^scrcpy$ -set $DISCORD_CLIENT_CLASS ^discord$ -set $EMAIL_CLIENT_CLASS ^Thunderbird$ -set $MEDIA_CLIENT_CLASS ^youtubemusic-nativefier -set $MESSAGE_CLIENT_CLASS ^android-messages-desktop$ -set $PHONE_CLIENT_CLASS ^google-voice-desktop -set $SLACK_CLIENT_CLASS ^Slack$ - -set $GAMES_CLIENT_CLASSES ^(Steam)|(dolphin-emu)|(Visualboyadvance-m)$ -set $TERMINAL_EMULATOR_CLASSES ^(kitty)$ - - -# for use after any command which should refresh the statusbar -set $refresh_statusbar killall -SIGUSR1 i3status - -bar { - status_command i3status -} - ################################################################################ -## Media Keys ################################################################## +## Custom Utility ############################################################## ################################################################################ +set $UTILS /home/w0ryn/.config/i3/utils + # Audio bindsym XF86AudioRewind exec --no-startup-id $UTILS prev bindsym XF86AudioPrev exec --no-startup-id $UTILS prev bindsym XF86AudioForward exec --no-startup-id $UTILS next bindsym XF86AudioNext exec --no-startup-id $UTILS next -bindsym XF86AudioPlay exec --no-startup-id $UTILS playpause -bindsym XF86AudioRaiseVolume exec --no-startup-id $UTILS volumeraise -bindsym XF86AudioLowerVolume exec --no-startup-id $UTILS volumelower +bindsym XF86AudioPlay exec --no-startup-id $UTILS play +bindsym XF86AudioRaiseVolume exec --no-startup-id $UTILS volumeup +bindsym XF86AudioLowerVolume exec --no-startup-id $UTILS volumedown bindsym XF86AudioMute exec --no-startup-id $UTILS mute bindsym XF86AudioMicMute exec --no-startup-id $UTILS micmute bindsym $mod+backslash exec --no-startup-id $UTILS micmute @@ -48,6 +27,26 @@ bindsym $mod+backslash exec --no-startup-id $UTILS micmute bindsym XF86MonBrightnessUp exec --no-startup-id $UTILS backlightup bindsym XF86MonBrightnessDown exec --no-startup-id $UTILS backlightdown +# Quick applications +bindsym $mod+Shift+m exec --no-startup-id $UTILS launch android-messages-desktop +bindsym $mod+Shift+d exec --no-startup-id $UTILS launch discord +bindsym $mod+c exec --no-startup-id $UTILS launch google-voice-desktop +bindsym $mod+m exec --no-startup-id $UTILS launch youtubemusic-nativefier +bindsym $mod+a exec --no-startup-id $UTILS launch pavucontrol ^Pavucontrol +bindsym $mod+Shift+p exec --no-startup-id $UTILS launch scrcpy +bindsym $mod+Shift+s exec --no-startup-id $UTILS launch slack ^Slack + +# Terminal +bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+shift+Return exec --no-startup-id $UTILS alternateterm + +# Other +bindsym $mod+p exec --no-startup-id $UTILS bgrandomize + +bindsym $mod+Shift+minus exec --no-startup-id $UTILS lock + +bindsym $mod+space exec --no-startup-id dmenu_run -c -l 5 -fn 'DejaVu Sans Mono-25' + ################################################################################ ## Window Management and Navigation ############################################ @@ -68,11 +67,36 @@ bindsym $mod+Shift+l move right bindsym $mod+b split h bindsym $mod+v split v +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + bindsym $mod+f fullscreen toggle bindsym $mod+Shift+f focus parent; fullscreen; focus child bindsym $mod+BackSpace open +bindsym $mod+1 workspace number "1" +bindsym $mod+2 workspace number "2" +bindsym $mod+3 workspace number "3" +bindsym $mod+4 workspace number "4" +bindsym $mod+5 workspace number "5" +bindsym $mod+6 workspace number "6" +bindsym $mod+7 workspace number "7" +bindsym $mod+8 workspace number "8" +bindsym $mod+9 workspace number "9" +bindsym $mod+0 workspace number "0" + +bindsym $mod+Shift+1 move container to workspace number "1" +bindsym $mod+Shift+2 move container to workspace number "2" +bindsym $mod+Shift+3 move container to workspace number "3" +bindsym $mod+Shift+4 move container to workspace number "4" +bindsym $mod+Shift+5 move container to workspace number "5" +bindsym $mod+Shift+6 move container to workspace number "6" +bindsym $mod+Shift+7 move container to workspace number "7" +bindsym $mod+Shift+8 move container to workspace number "8" +bindsym $mod+Shift+9 move container to workspace number "9" +bindsym $mod+Shift+0 move container to workspace number "0" mode "resize" { bindsym h resize grow width 10 px or 10 ppt @@ -87,15 +111,7 @@ mode "resize" { bindsym $mod+r mode "resize" -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - - -################################################################################ -## Floating / Scratchpad Management and Navigation ############################# -################################################################################ - +# floating window / scratchpad bindsym $mod+Shift+space floating toggle bindsym $mod+d focus mode_toggle floating_modifier $mod @@ -103,59 +119,12 @@ floating_modifier $mod bindsym $mod+Shift+Tab move scratchpad bindsym $mod+Tab scratchpad show -bindsym $mod+Shift+a exec --no-startup-id $UTILS launchallhidden; - -bindsym $mod+a exec --no-startup-id $UTILS audio $AUDIO_CLIENT_CLASS; -bindsym $mod+Shift+p exec --no-startup-id $UTILS amirror $AMIRROR_CLIENT_CLASS; -bindsym $mod+Shift+d exec --no-startup-id $UTILS discord $DISCORD_CLIENT_CLASS; -bindsym $mod+Shift+t exec --no-startup-id $UTILS email $EMAIL_CLIENT_CLASS; -bindsym $mod+m exec --no-startup-id $UTILS media $MEDIA_CLIENT_CLASS; -bindsym $mod+Shift+m exec --no-startup-id $UTILS message $MESSAGE_CLIENT_CLASS; -bindsym $mod+c exec --no-startup-id $UTILS phone $PHONE_CLIENT_CLASS; -bindsym $mod+Shift+s exec --no-startup-id $UTILS slack $SLACK_CLIENT_CLASS; - +set $GAMES_CLIENT_CLASSES ^(Steam)|(dolphin-emu)|(Visualboyadvance-m)$ bindsym $mod+Shift+x [class=$GAMES_CLIENT_CLASSES] scratchpad show + +set $TERMINAL_EMULATOR_CLASSES ^(kitty)$ bindsym $mod+x [class=$TERMINAL_EMULATOR_CLASSES] scratchpad show - -################################################################################ -## Workspace Management and Navigation ######################################### -################################################################################ - -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" -set $ws5 "5" -set $ws6 "6" -set $ws7 "7" -set $ws8 "8" -set $ws9 "9" -set $ws10 "10" - -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 - -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - - ################################################################################ ## i3 Settings ################################################################# ################################################################################ @@ -164,6 +133,12 @@ bindsym $mod+Shift+e exec $UTILS logout bindsym $mod+Shift+r restart bindsym $mod+Shift+c reload +# for use after any command which should refresh the statusbar +set $refresh_statusbar killall -SIGUSR1 i3status +bar { + status_command i3status +} + # i3-gaps settings for_window [class="^.*"] border pixel 4 gaps inner 10 @@ -172,6 +147,12 @@ gaps outer 10 bindsym $mod+z gaps outer current plus 2; gaps inner current plus 2; bindsym $mod+shift+z gaps outer current minus 2; gaps inner current minus 2; +################################################################################ +## Miscellaneous ############################################################### +################################################################################ + +exec --no-startup-id compton + # color settings set $FOCUSED_BORDER #288B52 set $FOCUSED_BACKGROUND #288B52 @@ -208,19 +189,3 @@ client.focused_inactive $INACTIVE_BORDER $INACTIVE_BACKGROUND $INACTIVE_TEXT $IN client.unfocused $UNFOCUSED_BORDER $UNFOCUSED_BACKGROUND $UNFOCUSED_TEXT $UNFOCUSED_INDICATOR $UNFOCUSED_CHILD_BORDER client.urgent $URGENT_BORDER $URGENT_BACKGROUND $URGENT_TEXT $URGENT_INDICATOR $URGENT_CHILD_BORDER client.placeholder $PLACEHOLDER_BORDER $PLACEHOLDER_BACKGROUND $PLACEHOLDER_TEXT $PLACEHOLDER_INDICATOR $PLACEHOLDER_CHILD_BORDER - -# Terminal / Application Launcher -bindsym $mod+Return exec i3-sensible-terminal -bindsym $mod+shift+Return exec --no-startup-id $UTILS alternateterm -bindsym $mod+space exec --no-startup-id dmenu_run -c -l 5 -fn 'DejaVu Sans Mono-25' - - -################################################################################ -## Miscellaneous ############################################################### -################################################################################ - -# exec --no-startup-id nm-applet # network-manager-applet -exec --no-startup-id compton # composite - -bindsym $mod+p exec --no-startup-id $UTILS bgrandomize -bindsym $mod+Shift+minus exec --no-startup-id $UTILS lock diff --git a/config/i3/utils b/config/i3/utils deleted file mode 100755 index 20945ec..0000000 --- a/config/i3/utils +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -source "$HOME/.config/wryn/env/env.zsh" - -UTIL_BIN="$DOTWRYN/bin/desktop" -APP_BIN="$HOME/.config/wryn/default-applications" - -MEDIA__NEXT="$UTIL_BIN/youtube-music/next.sh" -MEDIA__PREV="$UTIL_BIN/youtube-music/previous.sh" -MEDIA__PLAYPAUSE="$UTIL_BIN/youtube-music/playpause.sh" - -VOLUME__UP="$UTIL_BIN/pulseaudio/sink-volume/default-up.sh"; -VOLUME__DOWN="$UTIL_BIN/pulseaudio/sink-volume/default-down.sh"; -VOLUME__MUTE="$UTIL_BIN/pulseaudio/sink-volume/default-mute.sh"; -VOLUME__MICMUTE="$UTIL_BIN/pulseaudio/source-volume/default-mute.sh"; - -BACKLIGHT__UP="$UTIL_BIN/xbacklight/up.sh"; -BACKLIGHT__DOWN="$UTIL_BIN/xbacklight/down.sh"; - -LOCK_SCREEN="$UTIL_BIN/i3lock/lock.sh"; -LOG_OUT="$UTIL_BIN/i3/logout.sh"; -LAUNCH_OR_SHOW="$UTIL_BIN/i3/launch-or-show-application.sh"; -LAUNCH_ALL_SCRATCHPAD="$UTIL_BIN/i3/launch-all-scratchpad-applications.sh"; - -BG_RANDOMIZE="$UTIL_BIN/feh/randomize-background.sh" - -ALTERNATE_TERMINAL="$UTIL_BIN/kitty/alternate-terminal.sh" - -AUDIO="$APP_BIN/audio" -ANDROID_MIRROR="scrcpy" -DISCORD="$APP_BIN/discord" -EMAIL="$APP_BIN/email" -MEDIA="$APP_BIN/media" -MESSAGES="$APP_BIN/messages" -PHONE="$APP_BIN/phone" -SLACK="$APP_BIN/slack" - -case $1 in - next ) "$MEDIA__NEXT" ;; - prev ) "$MEDIA__PREV" ;; - playpause ) "$MEDIA__PLAYPAUSE" ;; - - volumeraise ) "$VOLUME__UP" ;; - volumelower ) "$VOLUME__DOWN" ;; - mute ) "$VOLUME__MUTE" ;; - micmute ) "$VOLUME__MICMUTE" ;; - - backlightup ) "$BACKLIGHT__UP" ;; - backlightdown ) "$BACKLIGHT__DOWN" ;; - - lock ) "$LOCK_SCREEN" ;; - logout ) "$LOG_OUT" ;; - - bgrandomize ) "$BG_RANDOMIZE" ;; - - alternateterm ) "$ALTERNATE_TERMINAL" ;; - - launchallhidden ) "$LAUNCH_ALL_SCRATCHPAD" ;; - - audio ) "$LAUNCH_OR_SHOW" "$2" "$AUDIO" ;; - amirror ) "$LAUNCH_OR_SHOW" "$2" "$ANDROID_MIRROR" ;; - discord ) "$LAUNCH_OR_SHOW" "$2" "$DISCORD" ;; - email ) "$LAUNCH_OR_SHOW" "$2" "$EMAIL" ;; - media ) "$LAUNCH_OR_SHOW" "$2" "$MEDIA" ;; - message ) "$LAUNCH_OR_SHOW" "$2" "$MESSAGES" ;; - phone ) "$LAUNCH_OR_SHOW" "$2" "$PHONE" ;; - slack ) "$LAUNCH_OR_SHOW" "$2" "$SLACK" ;; -esac diff --git a/config/i3status/config b/config/i3status.conf similarity index 100% rename from config/i3status/config rename to config/i3status.conf diff --git a/config/kitty/kitty.conf b/config/kitty.conf similarity index 100% rename from config/kitty/kitty.conf rename to config/kitty.conf diff --git a/config/kitty/alternate.conf b/config/kitty/alternate.conf deleted file mode 120000 index 9bdc3d9..0000000 --- a/config/kitty/alternate.conf +++ /dev/null @@ -1 +0,0 @@ -/home/w0ryn/.wryn/config/colorschemes/kitty/valentines.conf \ No newline at end of file diff --git a/config/kitty/theme.conf b/config/kitty/theme.conf deleted file mode 120000 index f423e7b..0000000 --- a/config/kitty/theme.conf +++ /dev/null @@ -1 +0,0 @@ -/home/w0ryn/.wryn/config/colorschemes/kitty/main.conf \ No newline at end of file diff --git a/config/mssqlcli/config b/config/mssqlcli.conf similarity index 100% rename from config/mssqlcli/config rename to config/mssqlcli.conf diff --git a/config/pgcli/config b/config/pgcli.conf similarity index 100% rename from config/pgcli/config rename to config/pgcli.conf diff --git a/config/pylint/pylintrc b/config/pylintrc similarity index 100% rename from config/pylint/pylintrc rename to config/pylintrc diff --git a/config/ripgrep/config b/config/ripgrep.conf similarity index 100% rename from config/ripgrep/config rename to config/ripgrep.conf diff --git a/config/tmux/n-bindings.tmux b/config/tmux.conf similarity index 58% rename from config/tmux/n-bindings.tmux rename to config/tmux.conf index 369011c..6e7240d 100644 --- a/config/tmux/n-bindings.tmux +++ b/config/tmux.conf @@ -1,3 +1,30 @@ +# don't use escape key +set -sg escape-time 0 + +# quick reload +bind-key r source-file ~/.tmux.conf\; display "TMUX CONFIG RELOADED" + +# force color +set -g default-terminal "tmux-256color" + +# force utf-8 +setw -gq utf8 on + +# force vi +set-window-option -g mode-keys vi +set-window-option -g status-keys vi + +# disable mouse-mode +set -g mouse off + +# window options / color config +set -g status-style fg=brightmagenta,bg=black +set -g window-status-current-style fg=black,bg=brightmagenta + +set -g status-right "#(cat /sys/class/power_supply/BAT0/capacity)% | #[fg=magneta]%d %b %R" + +##################################################################### + # pane switch with vim-like controls bind -n M-h select-pane -L bind -n M-j select-pane -D @@ -43,3 +70,9 @@ bind-key -n M-w command-prompt -I "#W" "rename-window '%%'" # toggle readonly session bind-key -n M-r switch-client -r; + +##################################################################### + +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip' + +##################################################################### diff --git a/config/tmux/t-bindings.tmux b/config/tmux/t-bindings.tmux deleted file mode 100644 index 539b243..0000000 --- a/config/tmux/t-bindings.tmux +++ /dev/null @@ -1 +0,0 @@ -bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip' diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf deleted file mode 100644 index 45769cf..0000000 --- a/config/tmux/tmux.conf +++ /dev/null @@ -1,27 +0,0 @@ -source-file ~/.wryn/config/tmux/n-bindings.tmux -source-file ~/.wryn/config/tmux/t-bindings.tmux - -# don't use escape key -set -sg escape-time 0 - -# quick reload -bind-key r source-file ~/.tmux.conf\; display "TMUX CONFIG RELOADED" - -# force color -set -g default-terminal "tmux-256color" - -# force utf-8 -setw -gq utf8 on - -# force vi -set-window-option -g mode-keys vi -set-window-option -g status-keys vi - -# disable mouse-mode -set -g mouse off - -# window options / color config -set -g status-style fg=brightmagenta,bg=black -set -g window-status-current-style fg=black,bg=brightmagenta - -set -g status-right "#(cat /sys/class/power_supply/BAT0/capacity)% | #[fg=magneta]%d %b %R" diff --git a/config/xinitrc b/config/xinitrc new file mode 100644 index 0000000..a20bb83 --- /dev/null +++ b/config/xinitrc @@ -0,0 +1,31 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" + +##################################################################### + +X11_SCRIPTS='/etc/X11/xinit/xinitrc.d'; +if [ -d $X11_SCRIPTS ] +then + for script in $(find "$X11_SCRIPTS" -name \*.sh); do + source "$script"; + done +fi + +##################################################################### + +CUSTOM_DMENU_COMMANDS="$HOME/.local/dmenu" +[ ! -d $CUSTOM_DMENU_COMMANDS ] && mkdir $CUSTOM_DMENU_COMMANDS + +export PATH="$CUSTOM_DMENU_COMMANDS:$PATH" + +##################################################################### + +LAYOUT_DIR="$DOTWRYN/bin/xorg/$(hostnamectl --static)" +[ -d $LAYOUT_DIR ] && export PATH="$LAYOUT_DIR:$PATH" + +$DOTWRYN/bin/xorg/activate-default & + +##################################################################### + +cd +exec i3 diff --git a/config/xorg/screenlayout/2020-sep-macbook/hdmidock.sh b/config/xorg/screenlayout/2020-sep-macbook/hdmidock.sh deleted file mode 100755 index a55e9c5..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/hdmidock.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -xrandr --output DP-0 --off\ - --output DP-1 --off\ - --output DP-3 --off\ - --output DP-4 --off\ - --output DP-2 --primary --mode 2880x1800 --scale 0.8x0.8 --pos 0x0 --rotate normal\ - --output HDMI-0 --pos 2880x0 --rotate normal - - -#xrandr | grep -q "3840" >/dev/null 2>&1; -#if [[ $? -ne 0 ]]; then -# if xrandr | grep -q "1920"; then -# xrandr --output HDMI-0 --mode 1920x1080 --pos 2880x0 --rotate normal --scale 1.5x1.5; -# fi -#fi - -ROLL=$(($RANDOM%4)); - -if [ $ROLL -eq 0 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/midoriya.jpg\ - $HOME/Pictures/bg/vegeta.jpg\ - >/dev/null 2>&1 -elif [ $ROLL -eq 1 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/ike_vs_bk.jpg\ - $HOME/Pictures/bg/seiros_vs_nemesis.jpg\ - >/dev/null 2>&1 -elif [ $ROLL -eq 2 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/captainfalcon.jpg\ - $HOME/Pictures/bg/link.jpg\ - >/dev/null 2>&1 -elif [ $ROLL -eq 3 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/fe8.jpg\ - $HOME/Pictures/bg/micaiah.jpg\ - >/dev/null 2>&1 -fi diff --git a/config/xorg/screenlayout/2020-sep-macbook/hdmidock_game_resolution.sh b/config/xorg/screenlayout/2020-sep-macbook/hdmidock_game_resolution.sh deleted file mode 100755 index 59455a9..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/hdmidock_game_resolution.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off\ - --output DP-1 --off\ - --output DP-2 --off\ - --output DP-3 --off\ - --output DP-4 --off\ - --output HDMI-0 --primary --mode 1920x1080 --pos 2880x0 --rotate normal - - -ROLL=$(($RANDOM%3)); - -if [ $ROLL -eq 0 ]; then - feh --bg-fill $HOME/Pictures/bg/detective.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 1 ]; then - feh --bg-fill $HOME/Pictures/bg/link.png >/dev/null 2>&1 -elif [ $ROLL -eq 2 ]; then - feh --bg-fill $HOME/Pictures/bg/snow2.jpg >/dev/null 2>&1 -fi diff --git a/config/xorg/screenlayout/2020-sep-macbook/homedock_hdmionly.sh b/config/xorg/screenlayout/2020-sep-macbook/homedock_hdmionly.sh deleted file mode 100755 index 7890fed..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/homedock_hdmionly.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off\ - --output DP-1 --off\ - --output DP-2 --off\ - --output DP-3 --off\ - --output DP-4 --off\ - --output HDMI-0 --primary --mode 3840x2160 --pos 2880x0 --rotate normal - - -ROLL=$(($RANDOM%3)); - -if [ $ROLL -eq 0 ]; then - feh --bg-fill $HOME/Pictures/bg/detective.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 1 ]; then - feh --bg-fill $HOME/Pictures/bg/link.png >/dev/null 2>&1 -elif [ $ROLL -eq 2 ]; then - feh --bg-fill $HOME/Pictures/bg/snow2.jpg >/dev/null 2>&1 -fi diff --git a/config/xorg/screenlayout/2020-sep-macbook/undock.sh b/config/xorg/screenlayout/2020-sep-macbook/undock.sh deleted file mode 100755 index 3c1cefd..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/undock.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off\ - --output DP-1 --off\ - --output HDMI-0 --off\ - --output DP-3 --off\ - --output DP-4 --off\ - --output DP-2 --primary --mode 2880x1800 --scale 0.8x0.8 --pos 0x0 --rotate normal - -ROLL=$(($RANDOM%10)); - -if [ $ROLL -eq 0 ]; then - feh --bg-fill $HOME/Pictures/bg/vegeta.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 1 ]; then - feh --bg-fill $HOME/Pictures/bg/claude.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 2 ]; then - feh --bg-fill $HOME/Pictures/bg/ike_vs_bk.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 3 ]; then - feh --bg-fill $HOME/Pictures/bg/snow1.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 4 ]; then - feh --bg-fill $HOME/Pictures/bg/midoriya.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 5 ]; then - feh --bg-fill $HOME/Pictures/bg/pikachu.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 6 ]; then - feh --bg-fill $HOME/Pictures/bg/captainfalcon.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 7 ]; then - feh --bg-fill $HOME/Pictures/bg/seiros_vs_nemesis.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 8 ]; then - feh --bg-fill $HOME/Pictures/bg/kirito.jpg >/dev/null 2>&1 -elif [ $ROLL -eq 9 ]; then - feh --bg-fill $HOME/Pictures/bg/altaria.jpg >/dev/null 2>&1 -fi diff --git a/config/xorg/screenlayout/2020-sep-macbook/workdock.sh b/config/xorg/screenlayout/2020-sep-macbook/workdock.sh deleted file mode 100755 index 0b51683..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/workdock.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -if xrandr | grep -q "DP-0 connected"; then - xrandr \ - --output DP-0 --primary --mode 1920x1080 --pos 0x586 --rotate normal --scale 1.5x1.5\ - --output DP-1 --off \ - --output HDMI-0 --off \ - --output DP-2 --mode 2880x1800 --pos 4500x586 --rotate normal --scale 0.8x0.8\ - --output DP-3 --off \ - --output DP-4 --mode 1920x1080 --pos 2880x0 --rotate right --scale 1.5x1.5\ - ; -else - xrandr \ - --output DP-0 --off \ - --output DP-1 --primary --mode 1920x1080 --pos 0x586 --rotate normal --scale 1.5x1.5\ - --output HDMI-0 --off \ - --output DP-2 --mode 2880x1800 --pos 4500x586 --rotate normal --scale 0.8x0.8\ - --output DP-3 --mode 1920x1080 --pos 2880x0 --rotate right --scale 1.5x1.5\ - --output DP-4 --off \ - ; -fi - - -ROLL=$(($RANDOM%5)); - -if [ $ROLL -eq 0 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/midoriya.jpg\ - $HOME/Pictures/bg/altaria.jpg\ - $HOME/Pictures/bg/captainfalcon.jpg\ - >/dev/null 2>&1; -elif [ $ROLL -eq 1 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/dimitri.jpg\ - $HOME/Pictures/bg/claude.jpg\ - $HOME/Pictures/bg/edelgard.jpg\ - >/dev/null 2>&1; -elif [ $ROLL -eq 2 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/fe8.jpg\ - $HOME/Pictures/bg/micaiah.jpg\ - $HOME/Pictures/bg/roy.jpg\ - >/dev/null 2>&1; -elif [ $ROLL -eq 3 ]; then - feh --bg-fill\ - $HOME/Pictures/bg/chrom.png\ - $HOME/Pictures/bg/byleth.jpg\ - $HOME/Pictures/bg/link.jpg\ - >/dev/null 2>&1; -elif [ $ROLL -eq 4 ]; then - random_image="$(find $HOME/Pictures/bg -type f | shuf -n 1)"; - feh --bg-fill\ - $random_image\ - >/dev/null 2>&1; -fi diff --git a/config/xorg/screenlayout/2020-sep-macbook/workplus.sh b/config/xorg/screenlayout/2020-sep-macbook/workplus.sh deleted file mode 100755 index 208f206..0000000 --- a/config/xorg/screenlayout/2020-sep-macbook/workplus.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - - -# Positions -# MONITOR | ORIENTATION | POSITION -# ------------|-------------|---------- -# DP-1 / DP-0 | ANY | 0x0 -# DP-2 | DP-1/0:NORM | 5760x0 -# DP-2 | DP-1/0:LEFT | 3240x0 -# DP-3 / DP-4 | NORMAL | 2880x0 -# DP-3 / DP-4 | RIGHT | 1620x0 -# HDMI-0 | DP-1/0:NORM | 8640x0 -# HDMI-0 | DP-1/0:LEFT | 5533x0 - -if xrandr | grep -q "DP-0 connected"; then - xrandr \ - --output DP-0 --mode 1920x1080 --scale 1.5x1.5 --primary\ - --pos 0x0 --rotate left\ - --output DP-1 --off\ - --output DP-2 --mode 2880x1800--rotate normal --scale 0.8x0.8\ - --pos 3240x0\ - --output DP-3 --off\ - --output DP-4 --mode 1920x1080 --scale 1.5x1.5\ - --pos 1620x0 --rotate right\ - --output HDMI-0 --mode 1920x1080 --rotate left\ - --pos 5544x0\ - --setmonitor BigBoi auto DP-0,DP-4\ - ; -else - xrandr \ - --output DP-0 --off\ - --output DP-1 --mode 1920x1080 --scale 1.5x1.5 --primary\ - --pos 0x0 --rotate left\ - --output DP-2 --mode 2880x1800 --scale 0.8x0.8\ - --pos 3240x0 --rotate normal\ - --output DP-3 --mode 1920x1080 --scale 1.5x1.5\ - --pos 1620x0 --rotate right\ - --output DP-4 --off\ - --output HDMI-0 --mode 1920x1080\ - --pos 5544x0 --rotate left\ - --setmonitor BigBoi auto DP-1,DP-3\ - ; -fi - -feh --bg-fill --randomize $HOME/Pictures/bg >/dev/null 2>&1; diff --git a/config/xorg/screenlayout/gamedock.sh b/config/xorg/screenlayout/gamedock.sh deleted file mode 100755 index 4e42aad..0000000 --- a/config/xorg/screenlayout/gamedock.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" - -RESOLUTION='1920x1080'; - -[ $1 ] && RESOLUTION="$1"; - -CURRENT_MONITOR=$(xrandr | grep 'primary' | awk '{print $1;}' | tail -n 1); - -xrandr\ - --output "$CURRENT_MONITOR" --primary\ - --rotate normal\ - --pos 0x0\ - --mode $RESOLUTION\ - ; - -for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$CURRENT_MONITOR"); do - xrandr --output $display --off; -done; - -"$DOTWRYN/bin/desktop/feh/randomize-background.sh" -[ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx gamedock diff --git a/config/xorg/screenlayout/hdmidock.sh b/config/xorg/screenlayout/hdmidock.sh deleted file mode 100755 index 33103a0..0000000 --- a/config/xorg/screenlayout/hdmidock.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" - -NATIVE_MONITOR='eDP1'; -CONNECTED_MONITOR=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); - -MONITOR_DIRECTION='--above'; # left-of, below, above, right-of - -[ -z $CONNECTED_MONITOR ] && return; # no external monitor connected; do nothing -[ $1 ] && MONITOR_DIRECTION="$1"; - -xrandr\ - --output "$NATIVE_MONITOR" --primary\ - --rotate normal\ - --pos 0x0\ - --mode $(xrandr | grep -A 2 "$NATIVE_MONITOR" | sed -n '2 p' | awk '{print $1;}')\ - ; - -sleep 0.5 - -xrandr\ - --output "$CONNECTED_MONITOR"\ - --rotate normal\ - $MONITOR_DIRECTION $NATIVE_MONITOR\ - --mode $(xrandr | grep -A 2 "^$CONNECTED_MONITOR" | sed -n '2 p' | awk '{print $1;}')\ - ; - - -for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | grep -v "$CONNECTED_MONITOR"); do - xrandr --output $display --off; -done; - -"$DOTWRYN/bin/desktop/feh/randomize-background.sh" -[ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx login diff --git a/config/xorg/screenlayout/homedock.sh b/config/xorg/screenlayout/homedock.sh deleted file mode 100755 index 657f224..0000000 --- a/config/xorg/screenlayout/homedock.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" - -NATIVE_MONITOR='eDP1'; -HOMEDOCK_MONITOR=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); - -[ -z $HOMEDOCK_MONITOR ] && return; # no external monitor connected; do nothing - -xrandr\ - --output "$HOMEDOCK_MONITOR" --primary\ - --rotate normal\ - --pos 0x0\ - --mode $(xrandr | grep -A 2 "$HOMEDOCK_MONITOR" | sed -n '2 p' | awk '{print $1;}')\ - ; - -for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$HOMEDOCK_MONITOR"); do - xrandr --output $display --off; -done; - -"$DOTWRYN/bin/desktop/feh/randomize-background.sh" -[ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx homedock diff --git a/config/xorg/screenlayout/tvdock.sh b/config/xorg/screenlayout/tvdock.sh deleted file mode 100755 index ba4fd5d..0000000 --- a/config/xorg/screenlayout/tvdock.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" - -NATIVE_MONITOR='eDP1'; -TV_DISPLAY=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); - -[ -z $TV_DISPLAY ] && return; # no external monitor connected; do nothing - -xrandr\ - --output "$TV_DISPLAY" --primary\ - --rotate normal\ - --pos 0x0\ - --mode 1920x1080\ - ; - -for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$TV_DISPLAY"); do - xrandr --output $display --off; -done; - -"$DOTWRYN/bin/desktop/feh/randomize-background.sh" -[ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx gamedock diff --git a/config/xorg/screenlayout/undock.sh b/config/xorg/screenlayout/undock.sh deleted file mode 100755 index e5c29b6..0000000 --- a/config/xorg/screenlayout/undock.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -source "$HOME/.config/wryn/env/env.zsh" - -NATIVE_MONITOR='eDP1'; -NATIVE_MODE="$(xrandr | grep -A 2 "$NATIVE_MONITOR" | sed -n '2 p' | awk '{print $1;}')"; - -[[ $(xrandr -q | grep ' connected' | wc -l) -eq 1 ]] \ - && xrandr -q | grep "$NATIVE_MONITOR connected" | grep -q '3840' \ - && NATIVE_MODE='2880x1620'; - -xrandr\ - --output "$NATIVE_MONITOR" --primary\ - --rotate normal\ - --pos 0x0\ - --mode "$NATIVE_MODE"\ - ; - -for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$NATIVE_MONITOR"); do - xrandr --output $display --off; -done; - -"$DOTWRYN/bin/desktop/feh/randomize-background.sh" -[ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx undock diff --git a/config/xorg/set_randr_layout b/config/xorg/set_randr_layout deleted file mode 100755 index 93a4872..0000000 --- a/config/xorg/set_randr_layout +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/zsh -source "$HOME/.config/wryn/env/env.zsh" -XSERVER_DIR="$DOTWRYN/config/xorg" - -AT_HOME(){ - xrandr -q | grep -q 'DP2-1 connected' && xrandr -q | grep -q '3840'; -} - -CONNECTED_TO_MONITOR() { - xrandr -q | grep ' connected' | grep -v 'eDP1' -q; -} - -if AT_HOME; then - "$XSERVER_DIR/screenlayout/homedock.sh"; -elif CONNECTED_TO_MONITOR; then - "$XSERVER_DIR/screenlayout/hdmidock.sh" '--right-of'; -else; - "$XSERVER_DIR/screenlayout/undock.sh"; -fi diff --git a/config/xorg/xinitrc b/config/xorg/xinitrc deleted file mode 100644 index 650ac16..0000000 --- a/config/xorg/xinitrc +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -source "$HOME/.config/wryn/env/env.zsh" - -X11_SCRIPTS='/etc/X11/xinit/xinitrc.d'; -if [ -d $X11_SCRIPTS ] ; then - for script in $(find "$X11_SCRIPTS" -name \*.sh); do - source "$script"; - done -fi - - -CUSTOM_DMENU_COMMANDS="$HOME/.local/dmenu" -[ ! -d $CUSTOM_DMENU_COMMANDS ] && mkdir $CUSTOM_DMENU_COMMANDS - -export PATH="$CUSTOM_DMENU_COMMANDS:$PATH" - - -"$DOTWRYN/config/xorg/set_randr_layout" & - -exec i3; diff --git a/setup/apps/setup.zsh b/setup/apps.setup.zsh similarity index 100% rename from setup/apps/setup.zsh rename to setup/apps.setup.zsh diff --git a/setup/aws/setup.zsh b/setup/aws.setup.zsh similarity index 100% rename from setup/aws/setup.zsh rename to setup/aws.setup.zsh diff --git a/setup/config.setup.zsh b/setup/config.setup.zsh new file mode 100644 index 0000000..47d77ce --- /dev/null +++ b/setup/config.setup.zsh @@ -0,0 +1,84 @@ +function SETUP__CONFIG() { + ############################################################################################ + # ~/.config/THE_REST .wryn/config/THE_REST + CONFIG__SYMLINK '../.gitconfig' 'gitconfig' + CONFIG__SYMLINK '../.tmux.conf' 'tmux.conf' + CONFIG__SYMLINK '../.xinitrc' 'xinitrc' + CONFIG__SYMLINK 'code-activator-zsh/settings.zsh' 'code-activator.conf' + CONFIG__SYMLINK 'compton/compton.conf' 'compton.conf' + CONFIG__SYMLINK 'i3/config' 'i3.conf' + CONFIG__SYMLINK 'i3/utils' '../bin/i3/utils' + CONFIG__SYMLINK 'i3status/config' 'i3status.conf' + CONFIG__SYMLINK 'kitty/kitty.conf' 'kitty.conf' + CONFIG__SYMLINK 'kitty/theme.conf' '../colorschemes/kitty.main' + CONFIG__SYMLINK 'mssqlcli/config' 'mssqlcli.conf' + CONFIG__SYMLINK 'pgcli/config' 'pgcli.conf' + CONFIG__SYMLINK 'pylintrc' 'pylintrc' + CONFIG__SYMLINK 'ripgrep/config' 'ripgrep.conf' + CONFIG__SYMLINK 'wryn/sfx' '../bin/sfx/play.sh' + ############################################################################################ + + CONFIG__TERMINFO + + CONFIG__RC 'zsh' + CONFIG__RC 'vim' +} + +function CONFIG__SYMLINK() { + local LOCAL_CONFIG="$HOME/.config/$1" + local DOTWRYN_CONFIG="$DOTWRYN_PATH/config/$2" + local FRIENDLY_NAME=$(echo $2 | sed 's/\.conf$//') + + CHECK "linking $FRIENDLY_NAME" + { + mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" + ln -s "$DOTWRYN_CONFIG" "$LOCAL_CONFIG" + } >>$LOG 2>&1 && OK || WARN +} + +function CONFIG__TERMINFO() { + for file in $(find "$DOTWRYN_PATH/setup/terminfo" -type f); do + CHECK "adding $(basename $file)" + tic -x $file >>$LOG 2>&1 \ + && OK || WARN + done +} + +function CONFIG__RC() { + local DEFAULT_CONFIG="$DOTWRYN_PATH/setup/env/env.$1" + local LOCAL_CONFIG="$HOME/.config/wryn/env.$1" + + [ -f $LOCAL_CONFIG ] && { + WARNING "local $1 configuration exists ($LOCAL_CONFIG)" + USER_PROMPT 'overwrite? [y/N]' + READ_K yn + [[ $yn =~ ^[yY] ]] && { + CHECK "backing up local copy ($LOCAL_CONFIG.bak)" + mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" && OK || WARN + } || { + STATUS 'skipping' + return + } + } + + CHECK "setting up $1 configuration ($LOCAL_CONFIG)" + + case $1 in + vim ) COMMENT='"' ;; + zsh ) COMMENT='#' ;; + esac + + { + echo "source $DEFAULT_CONFIG" + echo -e "\\n$COMMENT\n$COMMENT .wryn configuration overrides\n$COMMENT\n" + sed "s/^[^$COMMENT].*/$COMMENT&/" $DEFAULT_CONFIG + } > $LOCAL_CONFIG && OK || WARN + + USER_PROMPT 'change local configuration options? [y/N]' + READ_K yn + + [[ $yn =~ ^[yY] ]] && { + [ ! $EDITOR ] && EDITOR=vi + $EDITOR "$HOME/.config/wryn/env.$1" + } +} diff --git a/setup/config/setup.zsh b/setup/config/setup.zsh deleted file mode 100644 index baaa0aa..0000000 --- a/setup/config/setup.zsh +++ /dev/null @@ -1,90 +0,0 @@ -function SETUP__CONFIG() { - ############################################################################################ - # Friendly Name ~/.config/THE_REST .wryn/config/THE_REST (if different) - CONFIG__SYMLINK 'compton' 'compton/compton.conf' - CONFIG__SYMLINK 'codeactivator' 'code-activator-zsh/settings.zsh' - CONFIG__SYMLINK 'i3 config' 'i3/config' - CONFIG__SYMLINK 'i3 status' 'i3status/config' - CONFIG__SYMLINK 'kitty config' 'kitty/kitty.conf' - CONFIG__SYMLINK 'kitty theme' 'kitty/theme.conf' - CONFIG__SYMLINK 'mssqlcli' 'mssqlcli/config' - CONFIG__SYMLINK 'pgcli' 'pgcli/config' - CONFIG__SYMLINK 'ripgrep' 'ripgrep/config' - - CONFIG__SYMLINK 'git config' '../.gitconfig' 'git/gitconfig' - CONFIG__SYMLINK 'i3 utils' 'wryn/i3utils' 'i3/utils' - CONFIG__SYMLINK 'pylint global' 'pylintrc' 'pylint/pylintrc' - CONFIG__SYMLINK 'sfx app' "wryn/sfx" '../bin/desktop/sfx/play.sh' - CONFIG__SYMLINK 'tmux' '../.tmux.conf' 'tmux/tmux.conf' - CONFIG__SYMLINK 'xinitrc' '../.xinitrc' 'xorg/xinitrc' - ############################################################################################ - - CONFIG__TERMINFO - - CONFIG__RC 'zsh' - CONFIG__RC 'vim' -} - -function CONFIG__SYMLINK() { - local CONFIG_NAME="$1" - - local TARGET="$2" - local LOCAL_CONFIG="$HOME/.config/$TARGET" - - # don't use third argument if config layout is identical - [ $3 ] && TARGET="$3" - local DOTWRYN_CONFIG="$DOTWRYN_PATH/config/$TARGET" - - CHECK "linking $1" - { - mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" - ln -s "$DOTWRYN_CONFIG" "$LOCAL_CONFIG" - } >>$LOG 2>&1 && OK || WARN -} - -function CONFIG__TERMINFO() { - for file in $(find "$DOTWRYN_PATH/config/terminfo" -type f); do - CHECK "adding $(basename $file)" - tic -x $file >>$LOG 2>&1 \ - && OK || WARN - done -} - -function CONFIG__RC() { - local DEFAULT_CONFIG="$DOTWRYN_PATH/env/env.$1" - local LOCAL_CONFIG="$HOME/.config/wryn/env/env.$1" - - [ -f $LOCAL_CONFIG ] && { - WARNING "local $1 configuration exists ($LOCAL_CONFIG)" - USER_PROMPT 'overwrite? [y/N]' - READ_K yn - [[ $yn =~ ^[yY] ]] && { - CHECK "backing up local copy ($LOCAL_CONFIG.bak)" - mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" && OK || WARN - } || { - STATUS 'skipping' - return - } - } - - CHECK "setting up $1 configuration ($LOCAL_CONFIG)" - - case $1 in - vim ) COMMENT='"' ;; - zsh ) COMMENT='#' ;; - esac - - { - echo "source $DEFAULT_CONFIG" - echo -e "\\n$COMMENT\n$COMMENT .wryn configuration overrides\n$COMMENT\n" - sed "s/^[^$COMMENT].*/$COMMENT&/" $DEFAULT_CONFIG - } > $LOCAL_CONFIG && OK || WARN - - USER_PROMPT 'change local configuration options? [y/N]' - READ_K yn - - [[ $yn =~ ^[yY] ]] && { - [ ! $EDITOR ] && EDITOR=vi - $EDITOR "$HOME/.config/wryn/env/env.$1" - } -} diff --git a/env/env.vim b/setup/env/env.vim similarity index 100% rename from env/env.vim rename to setup/env/env.vim diff --git a/env/env.zsh b/setup/env/env.zsh similarity index 97% rename from env/env.zsh rename to setup/env/env.zsh index 737b840..5448a39 100644 --- a/env/env.zsh +++ b/setup/env/env.zsh @@ -14,6 +14,9 @@ PREFERRED_EDITOR=(vim vi) # should play an audio file argument MEDIA_ENGINE='canberra-gtk-play -f' +PLAY_SFX () { + $HOME/.config/wryn/sfx $@ >/dev/null 2>&1 +} RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/config" TMUX_DEFAULT_SESSION_NAME='wryn' diff --git a/freeze/2019-oct-macbook-osx/brew_packages b/setup/freeze/2019-oct-macbook-osx/brew_packages similarity index 100% rename from freeze/2019-oct-macbook-osx/brew_packages rename to setup/freeze/2019-oct-macbook-osx/brew_packages diff --git a/freeze/2019-oct-macbook-osx/pip_packages b/setup/freeze/2019-oct-macbook-osx/pip_packages similarity index 100% rename from freeze/2019-oct-macbook-osx/pip_packages rename to setup/freeze/2019-oct-macbook-osx/pip_packages diff --git a/freeze/2019-oct-macbook-osx/rcpathvars b/setup/freeze/2019-oct-macbook-osx/rcpathvars similarity index 100% rename from freeze/2019-oct-macbook-osx/rcpathvars rename to setup/freeze/2019-oct-macbook-osx/rcpathvars diff --git a/freeze/2019-oct-macbook-osx/setup b/setup/freeze/2019-oct-macbook-osx/setup similarity index 100% rename from freeze/2019-oct-macbook-osx/setup rename to setup/freeze/2019-oct-macbook-osx/setup diff --git a/freeze/2020-jan-macbook-arch/aurlist.txt b/setup/freeze/2020-jan-macbook-arch/aurlist.txt similarity index 100% rename from freeze/2020-jan-macbook-arch/aurlist.txt rename to setup/freeze/2020-jan-macbook-arch/aurlist.txt diff --git a/freeze/2020-jan-macbook-arch/piplist.txt b/setup/freeze/2020-jan-macbook-arch/piplist.txt similarity index 100% rename from freeze/2020-jan-macbook-arch/piplist.txt rename to setup/freeze/2020-jan-macbook-arch/piplist.txt diff --git a/freeze/2020-jan-macbook-arch/pkglist.txt b/setup/freeze/2020-jan-macbook-arch/pkglist.txt similarity index 100% rename from freeze/2020-jan-macbook-arch/pkglist.txt rename to setup/freeze/2020-jan-macbook-arch/pkglist.txt diff --git a/freeze/2020-sep-macbook-arch/aurlist.txt b/setup/freeze/2020-sep-macbook-arch/aurlist.txt similarity index 100% rename from freeze/2020-sep-macbook-arch/aurlist.txt rename to setup/freeze/2020-sep-macbook-arch/aurlist.txt diff --git a/freeze/2020-sep-macbook-arch/piplist.txt b/setup/freeze/2020-sep-macbook-arch/piplist.txt similarity index 100% rename from freeze/2020-sep-macbook-arch/piplist.txt rename to setup/freeze/2020-sep-macbook-arch/piplist.txt diff --git a/freeze/2020-sep-macbook-arch/pkglist.txt b/setup/freeze/2020-sep-macbook-arch/pkglist.txt similarity index 100% rename from freeze/2020-sep-macbook-arch/pkglist.txt rename to setup/freeze/2020-sep-macbook-arch/pkglist.txt diff --git a/freeze/systemd-utils/dell-xps13-7390/powertop.service b/setup/freeze/systemd-utils/dell-xps13-7390/powertop.service similarity index 100% rename from freeze/systemd-utils/dell-xps13-7390/powertop.service rename to setup/freeze/systemd-utils/dell-xps13-7390/powertop.service diff --git a/freeze/systemd-utils/macbook_pro13/backlight-control.service b/setup/freeze/systemd-utils/macbook_pro13/backlight-control.service similarity index 100% rename from freeze/systemd-utils/macbook_pro13/backlight-control.service rename to setup/freeze/systemd-utils/macbook_pro13/backlight-control.service diff --git a/freeze/systemd-utils/macbook_pro13/suppress-gpe.service b/setup/freeze/systemd-utils/macbook_pro13/suppress-gpe.service similarity index 100% rename from freeze/systemd-utils/macbook_pro13/suppress-gpe.service rename to setup/freeze/systemd-utils/macbook_pro13/suppress-gpe.service diff --git a/freeze/systemd-utils/macbook_pro13/suspend-fix.service b/setup/freeze/systemd-utils/macbook_pro13/suspend-fix.service similarity index 100% rename from freeze/systemd-utils/macbook_pro13/suspend-fix.service rename to setup/freeze/systemd-utils/macbook_pro13/suspend-fix.service diff --git a/setup/linux b/setup/linux index f416a2e..5a85052 100755 --- a/setup/linux +++ b/setup/linux @@ -23,12 +23,16 @@ SOURCE_ZSH_SUBMODULE() { } INIT() { + printf 'initializing required submodules...' git submodule update --init --remote --recursive >/dev/null 2>&1 || { + echo 'failed!' echo 'unable to initialize required submodules' exit 1 } SOURCE_ZSH_SUBMODULE 'color-zsh' - source "$DOTWRYN_PATH/zsh/utils/user-input.zsh" + echo 'done!' + source "$DOTWRYN_PATH/zsh/utils" + clear STATUS 'starting .wryn install' export LOG="$HOME/dotwryn-install.log" @@ -73,12 +77,12 @@ CLEAN_BACKUP() { for file in $(find "$HOME/.config/" -name \*.bak 2>/dev/null) do CHECK "removing '$file'" - rm $file >>$LOG 2>&1 && OK || WARN + rm -- "$file" >>$LOG 2>&1 && OK || WARN done for file in $(find "$HOME" -maxdepth 1 -name .\*.bak 2>/dev/null) do CHECK "removing '$file'" - rm $file >>$LOG 2>&1 && OK || WARN + rm -- "$file" >>$LOG 2>&1 && OK || WARN done ;; esac @@ -115,12 +119,12 @@ MAKE_REQUIRED_DIRECTORY_STRUCTURE() { ################################################################################ -source "$DOTWRYN_PATH/setup/os-dependencies/setup.zsh" -source "$DOTWRYN_PATH/setup/config/setup.zsh" -source "$DOTWRYN_PATH/setup/zsh/setup.zsh" -source "$DOTWRYN_PATH/setup/vim/setup.zsh" -source "$DOTWRYN_PATH/setup/apps/setup.zsh" -source "$DOTWRYN_PATH/setup/aws/setup.zsh" +source "$DOTWRYN_PATH/setup/os.setup.zsh" +source "$DOTWRYN_PATH/setup/config.setup.zsh" +source "$DOTWRYN_PATH/setup/zsh.setup.zsh" +source "$DOTWRYN_PATH/setup/vim.setup.zsh" +source "$DOTWRYN_PATH/setup/apps.setup.zsh" +source "$DOTWRYN_PATH/setup/aws.setup.zsh" ################################################################################ diff --git a/setup/os-dependencies/setup.zsh b/setup/os.setup.zsh similarity index 96% rename from setup/os-dependencies/setup.zsh rename to setup/os.setup.zsh index ccea4d8..797a772 100644 --- a/setup/os-dependencies/setup.zsh +++ b/setup/os.setup.zsh @@ -1,4 +1,4 @@ -source "$DOTWRYN_PATH/setup/os-dependencies/arch.zsh" +source "$DOTWRYN_PATH/setup/yay.setup.zsh" ################################################################################ ### Automated System Dependency Install ######################################## @@ -6,7 +6,7 @@ source "$DOTWRYN_PATH/setup/os-dependencies/arch.zsh" [ $DOTWRYN_PATH ]\ && DEPENDENCY_DIR="$DOTWRYN_PATH/setup/os-dependencies" \ - || DEPENDENCY_DIR="${0:a:h}" + || DEPENDENCY_DIR="${0:a:h}/os-dependencies" function SETUP__OS_DEPENDENCY() { local ERROR=0 diff --git a/config/terminfo/screen-256color-italic.terminfo b/setup/terminfo/screen-256color-italic.terminfo similarity index 100% rename from config/terminfo/screen-256color-italic.terminfo rename to setup/terminfo/screen-256color-italic.terminfo diff --git a/config/terminfo/tmux.terminfo b/setup/terminfo/tmux.terminfo similarity index 100% rename from config/terminfo/tmux.terminfo rename to setup/terminfo/tmux.terminfo diff --git a/config/terminfo/xterm-kitty.terminfo b/setup/terminfo/xterm-kitty.terminfo similarity index 100% rename from config/terminfo/xterm-kitty.terminfo rename to setup/terminfo/xterm-kitty.terminfo diff --git a/setup/vim/compile-from-source.zsh b/setup/vim.compile.zsh similarity index 100% rename from setup/vim/compile-from-source.zsh rename to setup/vim.compile.zsh diff --git a/setup/vim/setup.zsh b/setup/vim.setup.zsh similarity index 86% rename from setup/vim/setup.zsh rename to setup/vim.setup.zsh index dc4500b..9434532 100644 --- a/setup/vim/setup.zsh +++ b/setup/vim.setup.zsh @@ -1,4 +1,4 @@ -source "$DOTWRYN_PATH/setup/vim/compile-from-source.zsh" +source "$DOTWRYN_PATH/setup/vim.compile.zsh" ##################################################################### @@ -6,7 +6,6 @@ function SETUP__VIM() { STATUS 'starting vim setup' VIM__COMPILE_FROM_SOURCE VIM__SOURCE_RC - VIM__UPDATE_COLORSCHEMES VIM__INSTALL_VUNDLE_PLUGINS VIM__CREATE_PANE_DEFAULT_APP STATUS 'finished vim setup' @@ -30,12 +29,6 @@ function VIM__SOURCE_RC() { } } -function VIM__UPDATE_COLORSCHEMES() { - CHECK 'updating colorschemes' - $DOTWRYN_PATH/bin/vim/update_colorschemes >>$LOG 2>&1\ - && OK || WARN -} - function VIM__INSTALL_VUNDLE_PLUGINS() { [ ! -d "$HOME/.vim/bundle/Vundle.vim" ] && { CHECK 'installing Vundle.vim' @@ -58,7 +51,7 @@ function VIM__INSTALL_VUNDLE_PLUGINS() { ; CHECK 'building plugins (this may take a minute)' - $DOTWRYN_PATH/bin/vim/rebuild_plugins >>$LOG 2>&1\ + $DOTWRYN_PATH/bin/vim/rebuild-plugins >>$LOG 2>&1\ && OK || WARN 'retry plugin build manually' } diff --git a/setup/os-dependencies/arch.zsh b/setup/yay.setup.zsh similarity index 100% rename from setup/os-dependencies/arch.zsh rename to setup/yay.setup.zsh diff --git a/setup/zsh/setup.zsh b/setup/zsh.setup.zsh similarity index 72% rename from setup/zsh/setup.zsh rename to setup/zsh.setup.zsh index 65f918e..76be571 100644 --- a/setup/zsh/setup.zsh +++ b/setup/zsh.setup.zsh @@ -1,16 +1,16 @@ ##################################################################### function SETUP__ZSH() { - ZSH__SET_DEFAULT_SHELL + ZSH__SET_DEFAULT_SHELL ZSH__SOURCE_RC } ##################################################################### function ZSH__SET_DEFAULT_SHELL() { - local DEFAULT_SHELL=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd) - CHECK 'setting zsh as default shell' - sudo chsh -s $(which zsh) $(whoami)>>$LOG 2>&1 \ + local DEFAULT_SHELL=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd) + CHECK 'setting zsh as default shell' + sudo chsh -s $(which zsh) $(whoami)>>$LOG 2>&1 \ && OK || WARN 'failed to set zsh as default shell' } diff --git a/vim/rc.vim b/vim/rc.vim index 7b19b8e..c2ccca7 100644 --- a/vim/rc.vim +++ b/vim/rc.vim @@ -1,4 +1,4 @@ -source $HOME/.config/wryn/env/env.vim +source $HOME/.config/wryn/env.vim if isdirectory(expand("$HOME/.vim/bundle/Vundle.vim")) source $WRYNVIMPATH/vundle.vim diff --git a/zsh/colors b/zsh/colors index a860103..13f1287 100644 --- a/zsh/colors +++ b/zsh/colors @@ -5,126 +5,79 @@ alias ls='ls --color=auto --group-directories-first' ##################################################################### -PS1__GET_DIRECTORY() { - local _DIRECTORY="%B%F{yellow}%6~" - local GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) - [ $GIT_ROOT ] && { - local PROJECT_NAME=$(basename $GIT_ROOT) - [[ $PROJECT_NAME =~ ^code$ ]] && PROJECT_NAME=$(basename $(dirname $GIT_ROOT)) +_TTY_LOAD_COLORSCHEME() { + [[ "$TERM" =~ ^linux$ ]] || return 0 - local RELATIVE_DIRECTORY=${${PWD#$GIT_ROOT}:1} - [[ ${#${RELATIVE_DIRECTORY//[^\/]}} -gt 3 ]] && RELATIVE_DIRECTORY='*/%4~' - - _DIRECTORY="%B%F{green}$PROJECT_NAME%B%F{yellow}:$RELATIVE_DIRECTORY" + local TARGET="$HOME/.config/wryn/tty-colorscheme" + [ ! -f $TARGET ] && TARGET="$DOTWRYN/colorschemes/kitty.main" + + local PARSE() { + grep "$1" $TARGET | awk '{print $2}' | sed 's/ //g; s/#//g' | tr '[:lower:]' '[:upper:]' } - - echo $_DIRECTORY + + /bin/echo -e "\ + \e]P0$(PARSE '^background ') + \e]P1$(PARSE '^color1 ') + \e]P2$(PARSE '^color2 ') + \e]P3$(PARSE '^color3 ') + \e]P4$(PARSE '^color4 ') + \e]P5$(PARSE '^color5 ') + \e]P6$(PARSE '^color6 ') + \e]P7$(PARSE '^foreground ') + \e]P8$(PARSE '^color9 ') + \e]P9$(PARSE '^color10 ') + \e]PA$(PARSE '^color11 ') + \e]PB$(PARSE '^color12 ') + \e]PC$(PARSE '^color13 ') + \e]PD$(PARSE '^color14 ') + \e]PE$(PARSE '^color7 ') + \e]PF$(PARSE '^color15 ') + " + clear } - -PS1__GET_GIT_BRANCH() { - local _GIT_BRANCH=$(\ - git branch --no-color 2>/dev/null \ - | sed "/^[^*]/d; s/* \(.*\)/ %B%F{cyan}$PS1_BRANCH_SYMBOL \1/" \ - ) - - echo $_GIT_BRANCH -} - -GENERATE_PS1() { - - local _INDICATOR="%B%(?.%F{green}.%F{red}) $PS1_INDICATOR_SYMBOL" - local _USER="%B%F{magenta}$PS1_USER" - local _SEPARATOR="%b%F{red}$PS1_SEPARATOR" - local _DIRECTORY='$(PS1__GET_DIRECTORY)' - local _GIT_BRANCH='$(PS1__GET_GIT_BRANCH)' - - local _PROMPT=$'\n'' %B%F{blue}%# %b%f' - - echo "$_INDICATOR $_USER $_SEPARATOR $_DIRECTORY $_GIT_BRANCH $_PROMPT" -} - -setopt PROMPT_SUBST -export PS1="$(GENERATE_PS1)" - -source "$DOTWRYN/config/colorschemes/linux-console" +_TTY_LOAD_COLORSCHEME ##################################################################### -FZF_THEME_PICK() { - echo "$(\ - sed 's/\.conf//g; s/^./\U&/; s/-\(.\)/\U\1/g; s/^Default/& (use kitty theme)/' \ +alias kitty-change-colorscheme='CHANGE_COLORSCHEME kitty main' +alias kitty-change-colorscheme-alternate='CHANGE_COLORSCHEME kitty alternate' +alias tty-change-theme='CHANGE_COLORSCHEME tty' + +CHANGE_COLORSCHEME () { + local TYPE="$1" + local TARGET_LINK EXTRA_OPTIONS + case $TYPE in + tty ) + TARGET_LINK="$HOME/.config/wryn/tty-colorscheme" + EXTRA_OPTIONS=(default) + ;; + kitty ) + TARGET_LINK="$DOTWRYN/colorschemes/kitty.$2" + EXTRA_OPTIONS=() + ;; + esac + local COLORSCHEMES=($(cd $DOTWRYN/colorschemes; ls *.conf) $EXTRA_OPTIONS) + local COLORSCHEME=$(\ + echo $COLORSCHEMES | sed 's/\s\+/\n/g' | sort -u \ + | sed 's/\.conf//g; s/^./\U&/; s/-\(.\)/\U\1/g; s/^Default/& (use kitty theme)/' \ | fzf -i --height=50% --reverse --prompt 'select a theme : ' \ | sed 's/^./\L&/; s/[A-Z]/-\L&/g' - ).conf" -} + ) -GET_KITTY_THEMES() { ls "$DOTWRYN/config/colorschemes/kitty"; } - -alias kitty-change-theme='KITTY_CHANGE_THEME default' -alias kitty-change-theme-alternate='KITTY_CHANGE_THEME alternate' -KITTY_CHANGE_THEME () { - local USAGE="usage : $0 target [theme]" - - local TARGET="$1" - local TARGET_LINK - case $TARGET in - default ) TARGET_LINK="$DOTWRYN/config/kitty/theme.conf" ;; - alternate ) TARGET_LINK="$DOTWRYN/config/kitty/alternate.conf" ;; + case $COLORSCHEME in + '' ) return 1 ;; + default* ) ;; * ) - echo "error : target must be 'default' or 'alternate'\n$USAGE" >&2 - return 1 + COLORSCHEME="$DOTWRYN/colorschemes/$COLORSCHEME.conf" + [ ! -f $COLORSCHEME ] && { echo "no such theme">&2; return 2; } ;; esac - local THEME="$2" - [ ! $THEME ] && { - THEME=$(GET_KITTY_THEMES | FZF_THEME_PICK) - [ ! $THEME ] && return 2 - } + rm -- $TARGET_LINK >/dev/null 2>&1 + ln -s $COLORSCHEME $TARGET_LINK - local COLORSCHEME="$DOTWRYN/config/colorschemes/kitty/$THEME" - [ ! -f $COLORSCHEME ] && { echo "no such theme ($THEME)"; return 2; } - - rm -- $TARGET_LINK - ln -s $COLORSCHEME $TARGET_LINK && { - echo 'kitty-term theme changed successfully! (effective on new session)' - source "$DOTWRYN/config/colorschemes/linux-console" - } + echo "'$TYPE' theme changed successfully! (effective on new session)" + _TTY_LOAD_COLORSCHEME } -_KITTY_CHANGE_THEME () { compadd $(GET_KITTY_THEMES); } -compdef _KITTY_CHANGE_THEME KITTY_CHANGE_THEME ##################################################################### - -GET_TTY_THEMES() { - echo default - ls "$DOTWRYN/config/colorschemes/kitty" -} - -alias tty-change-theme='TTY_CHANGE_THEME' -TTY_CHANGE_THEME() { - local LOCAL_THEME_LINK="$HOME/.config/wryn/tty-colorscheme" - local THEME_DIR="$DOTWRYN/config/colorschemes/kitty" - - local THEME="$1" - [ ! $THEME ] && { - THEME=$(GET_TTY_THEMES | FZF_THEME_PICK) - [ ! $THEME ] && return 1 - } - - [[ "$THEME" =~ ^default ]] && { - rm $LOCAL_THEME_LINK >/dev/null 2>&1 - true - } || { - local COLORSCHEME="$THEME_DIR/$THEME" - [ ! -f $COLORSCHEME ] && { echo "no such theme ($THEME)"; return 2; } - - rm -- $LOCAL_THEME_LINK >/dev/null 2>&1 - ln -s $SOURCE_THEME $TARGET_THEME_LINK - } - - echo 'TTY theme updated; re-source zshrc in TTY for changes to take effect' - source "$DOTWRYN/config/colorschemes/linux-console" >/dev/null 2>&1 -} -_TTY_CHANGE_THEME() { compadd $(GET_TTY_THEMES); } -compdef _TTY_CHANGE_THEME TTY_CHANGE_THEME diff --git a/zsh/plugins/fzf-tab b/zsh/plugins/fzf-tab index e85f76a..c5c6e1d 160000 --- a/zsh/plugins/fzf-tab +++ b/zsh/plugins/fzf-tab @@ -1 +1 @@ -Subproject commit e85f76a3af3b6b6b799ad3d64899047962b9ce52 +Subproject commit c5c6e1d82910fb24072a10855c03e31ea2c51563 diff --git a/zsh/ps1 b/zsh/ps1 new file mode 100644 index 0000000..d98f5e3 --- /dev/null +++ b/zsh/ps1 @@ -0,0 +1,41 @@ +#!/bin/zsh + +PS1__GET_DIRECTORY() { + local _DIRECTORY="%B%F{yellow}%6~" + local GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) + [ $GIT_ROOT ] && { + local PROJECT_NAME=$(basename $GIT_ROOT) + [[ $PROJECT_NAME =~ ^code$ ]] && PROJECT_NAME=$(basename $(dirname $GIT_ROOT)) + + local RELATIVE_DIRECTORY=${${PWD#$GIT_ROOT}:1} + [[ ${#${RELATIVE_DIRECTORY//[^\/]}} -gt 3 ]] && RELATIVE_DIRECTORY='*/%4~' + + _DIRECTORY="%B%F{green}$PROJECT_NAME%B%F{yellow}:$RELATIVE_DIRECTORY" + } + + echo $_DIRECTORY +} + +PS1__GET_GIT_BRANCH() { + local _GIT_BRANCH=$(\ + git branch --no-color 2>/dev/null \ + | sed "/^[^*]/d; s/* \(.*\)/ %B%F{cyan}$PS1_BRANCH_SYMBOL \1/" \ + ) + + echo $_GIT_BRANCH +} + +GENERATE_PS1() { + local _INDICATOR="%B%(?.%F{green}.%F{red}) $PS1_INDICATOR_SYMBOL" + local _USER="%B%F{magenta}$PS1_USER" + local _SEPARATOR="%b%F{red}$PS1_SEPARATOR" + local _DIRECTORY='$(PS1__GET_DIRECTORY)' + local _GIT_BRANCH='$(PS1__GET_GIT_BRANCH)' + + local _PROMPT=$'\n'' %B%F{blue}%# %b%f' + + echo "$_INDICATOR $_USER $_SEPARATOR $_DIRECTORY $_GIT_BRANCH $_PROMPT" +} + +setopt PROMPT_SUBST +export PS1="$(GENERATE_PS1)" diff --git a/zsh/rc b/zsh/rc index 3f171fa..093674d 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,5 +1,5 @@ #!/bin/zsh -source "$HOME/.config/wryn/env/env.zsh" +source "$HOME/.config/wryn/env.zsh" # --------------------------------------------------------------------- INTERNAL_PLUGINS=( "$DOTWRYN/zsh/config" # must load first diff --git a/zsh/utils/user-input.zsh b/zsh/utils similarity index 79% rename from zsh/utils/user-input.zsh rename to zsh/utils index 1846c29..321534f 100644 --- a/zsh/utils/user-input.zsh +++ b/zsh/utils @@ -1,3 +1,4 @@ +#!/bin/zsh function READ_K() { read -k $1 echo