Fix some theme things, work on a black theme for crazy contrast, add

colors for TTYs, new aliases, etc.
This commit is contained in:
Daniel Flanagan 2018-08-25 01:39:47 -05:00
parent e275435598
commit 4ac46ca22d
14 changed files with 75 additions and 46 deletions

View file

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export BAR_MONITOR="$(polybar --list-monitors | tail -n 1 | sed -n 's/^\s*\(.*\):.*$/\1/p')" export BAR_MONITOR="$(polybar --list-monitors | tail -n 1 | sed -n 's/^\s*\(.*\):.*$/\1/p')"
export BAR_MONITOR="$(polybar --list-monitors | tail -n 2 | head -n 1 | sed -n 's/^\s*\(.*\):.*$/\1/p')"
export BAR_HEIGHT=40 export BAR_HEIGHT=40
export BAR_ON_TOP=0 export BAR_ON_TOP=0
export BAR_SIDE_MARGIN=200 export BAR_SIDE_MARGIN=200

View file

@ -251,7 +251,7 @@ format-prefix-foreground = ${colors.foreground-alt}
label = %date%%time% label = %date%%time%
[module/volume] [module/volume]
type = internal/volume type = internal/alsa
format-volume = <label-volume> <bar-volume> format-volume = <label-volume> <bar-volume>
label-volume =  label-volume = 
@ -326,13 +326,13 @@ label-foreground = ${xrdb:color2}
format-prefix = format-prefix =
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
label = %temperature% label = %temperature-c%
label-warn = %temperature% label-warn = %temperature-c%
label-warn-foreground = ${xrdb:color1} label-warn-foreground = ${xrdb:color1}
ramp-0 = " " ramp-0 = " "
ramp-1 = " " ramp-1 = " "
ramp-2 = " " ramp-2 = "t "
ramp-foreground = ${colors.foreground-alt} ramp-foreground = ${colors.foreground-alt}
[module/powermenu] [module/powermenu]

View file

@ -1,3 +1,3 @@
gtk-icon-theme-name = "elementary" gtk-icon-theme-name = "elementary"
gtk-theme-name = "Arc-Dark" gtk-theme-name = "Arc-Dark"
gtk-font-name = "Monaco 9" gtk-font-name = "Iosevka Nerd Font 9"

View file

@ -1,5 +1,5 @@
[Settings] [Settings]
gtk-icon-theme-name = elementary gtk-icon-theme-name = elementary
gtk-theme-name = Arc-Dark gtk-theme-name = Arc-Dark
gtk-font-name = Monaco 9 gtk-font-name = Iosevka Nerd Font 9
gtk-application-prefer-dark-theme = true gtk-application-prefer-dark-theme = true

View file

@ -15,28 +15,28 @@
# *letterSpace: 0 # *letterSpace: 0
# Set fonts in "$HOME/.Xresources.env" # Set fonts in "$HOME/.Xresources.env"
*font: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 URxvt*font: xft:Iosevka Nerd Font:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
*faceName: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 URxvt*faceName: xft:Iosevka Nerd Font:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
*boldFont: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 URxvt*boldFont: xft:Iosevka Nerd Font:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
*letterSpace: 0 URxvt*letterSpace: 0
# rxvt-unicode configuration # rxvt-unicode configuration
*termName: rxvt-unicode URxvt*termName: rxvt-unicode
*scrollBar: false URxvt*scrollBar: false
*cursorUnderline: true URxvt*cursorUnderline: true
*cursorBlink: true URxvt*cursorBlink: true
*intensityStyles: true URxvt*intensityStyles: true
*utf8: 1 URxvt*utf8: 1
*scaleHeight: 1 URxvt*scaleHeight: 1
*depth: 32 URxvt*depth: 32
URxvt.internalBorder: 24 URxvt*internalBorder: 24
URxvt.perl-ext-common: default,matcher,resize-font URxvt*perl-ext-common: default,matcher,resize-font
URxvt.keysym.M-Escape: perl:keyboard-select:activate URxvt*keysym.M-Escape: perl:keyboard-select:activate
URxvt.resize-font.smaller: C-Down URxvt*resize-font.smaller: C-Down
URxvt.resize-font.bigger: C-Up URxvt*resize-font.bigger: C-Up
URxvt.url-launcher: /usr/bin/xdg-open URxvt*url-launcher: /usr/bin/xdg-open
URxvt.matcher.button: 1 URxvt*matcher.button: 1
URxvt.depth: 0 URxvt*depth: 0
URxvt*iso14755: False URxvt*iso14755: False
# Other Xorg configuration # Other Xorg configuration

View file

@ -35,8 +35,9 @@ pacaur -S \
unclutter-xfixes-git `# Hides cursor after no use for a time` \ unclutter-xfixes-git `# Hides cursor after no use for a time` \
gtk-engine-murrine xorg-server-devel `# GTK Theme Base and Headers?` \ gtk-engine-murrine xorg-server-devel `# GTK Theme Base and Headers?` \
bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \ bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \
terminus-font ttf-monaco `# Primary Fonts` \ terminus-font ttf-iosevka-pack `# Primary Fonts` \
ttf-freefont `# Font` \ ttf-freefont `# Font` \
ttd-monaco `# Font` \
ttf-font-awesome-4 ttf-font-awesome `# Icon Font` \ ttf-font-awesome-4 ttf-font-awesome `# Icon Font` \
autocutsel `# Clipboard Helper` \ autocutsel `# Clipboard Helper` \
curl `# HTTP Utility` \ curl `# HTTP Utility` \

View file

@ -17,4 +17,4 @@ done
echo "$params" >> "$HOME/.sxhkd.log" echo "$params" >> "$HOME/.sxhkd.log"
rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 $params rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 -width 600 -location 3 $params

View file

@ -0,0 +1,18 @@
scheme: "Donokai-BLACK"
author: "Daniel Flanagan(https://lytedev.io)"
base00: "000000" # background, dark grey
base01: "383830" # lighter grey
base02: "49483e" # lighter grey
base03: "75715e" # greyish yellow (peuce)
base04: "a59f85" # lighter peuce
base05: "f8f8f2" # foreground white
base06: "f5f4f1" # foreground 2 white
base07: "f9f8f5" # foreground 3 white
base08: "f92672" # magenta
base09: "fd971f" # orange
base0A: "f4bf75" # yellow
base0B: "a6e22e" # green
base0C: "a1efe4" # cyan
base0D: "66d9ef" # blue
base0E: "ae81ff" # purple
base0F: "cc6633" # pale orange

View file

@ -1,5 +1,5 @@
scheme: "Donokai" scheme: "Donokai"
author: "Wimer Hazenberg (http://www.monokai.nl)" author: "Daniel Flanagan(https://lytedev.io)"
base00: "111111" # background, dark grey base00: "111111" # background, dark grey
base01: "383830" # lighter grey base01: "383830" # lighter grey
base02: "49483e" # lighter grey base02: "49483e" # lighter grey

View file

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# Base16 Donokai - Shell color setup script # Base16 Donokai-BLACK - Shell color setup script
# Wimer Hazenberg (http://www.monokai.nl) # Daniel Flanagan(https://lytedev.io)
if [ "${TERM%%-*}" = 'linux' ]; then if [ "${TERM%%-*}" = 'linux' ]; then
# This script doesn't support linux console (use 'vconsole' template instead) # This script doesn't support linux console (use 'vconsole' template instead)
return 2>/dev/null || exit 0 return 2>/dev/null || exit 0
fi fi
color00="11/11/11" # Base 00 - Black color00="00/00/00" # Base 00 - Black
color01="f9/26/72" # Base 08 - Red color01="f9/26/72" # Base 08 - Red
color02="a6/e2/2e" # Base 0B - Green color02="a6/e2/2e" # Base 0B - Green
color03="f4/bf/75" # Base 0A - Yellow color03="f4/bf/75" # Base 0A - Yellow
@ -30,7 +30,7 @@ color19="49/48/3e" # Base 02
color20="a5/9f/85" # Base 04 color20="a5/9f/85" # Base 04
color21="f5/f4/f1" # Base 06 color21="f5/f4/f1" # Base 06
color_foreground="f8/f8/f2" # Base 05 color_foreground="f8/f8/f2" # Base 05
color_background="11/11/11" # Base 00 color_background="00/00/00" # Base 00
color_cursor="f8/f8/f2" # Base 05 color_cursor="f8/f8/f2" # Base 05
if [ -n "$TMUX" ]; then if [ -n "$TMUX" ]; then
@ -83,12 +83,12 @@ printf $printf_template 21 $color21
if [ -n "$ITERM_SESSION_ID" ]; then if [ -n "$ITERM_SESSION_ID" ]; then
# iTerm2 proprietary escape codes # iTerm2 proprietary escape codes
printf $printf_template_custom Pg f8f8f2 # forground printf $printf_template_custom Pg f8f8f2 # forground
printf $printf_template_custom Ph 111111 # background printf $printf_template_custom Ph 000000 # background
printf $printf_template_custom Pi f8f8f2 # bold color printf $printf_template_custom Pi f8f8f2 # bold color
printf $printf_template_custom Pj 49483e # selection color printf $printf_template_custom Pj 49483e # selection color
printf $printf_template_custom Pk f8f8f2 # selected text color printf $printf_template_custom Pk f8f8f2 # selected text color
printf $printf_template_custom Pl f8f8f2 # cursor printf $printf_template_custom Pl f8f8f2 # cursor
printf $printf_template_custom Pm 111111 # cursor text printf $printf_template_custom Pm 000000 # cursor text
else else
printf $printf_template_var 10 $color_foreground printf $printf_template_var 10 $color_foreground
printf $printf_template_var 11 $color_background printf $printf_template_var 11 $color_background

6
scripts/colors/vconsole Normal file → Executable file
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Base16 Donokai - Virtual console color setup script # Base16 Donokai-BLACK - Virtual console color setup script
# Wimer Hazenberg (http://www.monokai.nl) # Daniel Flanagan(https://lytedev.io)
color00="111111" # Base 00 - Black color00="000000" # Base 00 - Black
color01="f92672" # Base 08 - Red color01="f92672" # Base 08 - Red
color02="a6e22e" # Base 0B - Green color02="a6e22e" # Base 0B - Green
color03="f4bf75" # Base 0A - Yellow color03="f4bf75" # Base 0A - Yellow

View file

@ -1,5 +1,5 @@
" Base16 Donokai (https://github.com/chriskempson/base16) " Base16 Donokai-BLACK (https://github.com/chriskempson/base16)
" Scheme: Wimer Hazenberg (http://www.monokai.nl) " Scheme: Daniel Flanagan(https://lytedev.io)
" This enables the coresponding base16-shell script to run so that " This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts " :colorscheme works in terminals supported by base16-shell scripts
@ -7,12 +7,12 @@
" let g:base16_shell_path=base16-builder/output/shell/ " let g:base16_shell_path=base16-builder/output/shell/
if !has('gui_running') if !has('gui_running')
if exists("g:base16_shell_path") if exists("g:base16_shell_path")
execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai-black.".&background.".sh"
endif endif
endif endif
" GUI color definitions " GUI color definitions
let s:gui00 = "111111" let s:gui00 = "000000"
let s:gui01 = "383830" let s:gui01 = "383830"
let s:gui02 = "49483e" let s:gui02 = "49483e"
let s:gui03 = "75715e" let s:gui03 = "75715e"
@ -59,7 +59,7 @@ endif
" Theme setup " Theme setup
hi clear hi clear
syntax reset syntax reset
let g:colors_name = "base16-donokai" let g:colors_name = "base16-donokai-black"
" Highlighting function " Highlighting function
fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)

View file

@ -1,7 +1,7 @@
! Base16 Donokai ! Base16 Donokai-BLACK
! Scheme: Wimer Hazenberg (http://www.monokai.nl) ! Scheme: Daniel Flanagan(https://lytedev.io)
#define base00 #111111 #define base00 #000000
#define base01 #383830 #define base01 #383830
#define base02 #49483e #define base02 #49483e
#define base03 #75715e #define base03 #75715e

View file

@ -100,6 +100,15 @@ alias btctl="sudo bluetoothctl"
alias pt="htop -t" # experimental htop tree-view-by-default alias pt="htop -t" # experimental htop tree-view-by-default
alias resrc="source \$HOME/.bashrc" alias resrc="source \$HOME/.bashrc"
alias redshift="redshift -l 39.0997:-94.5786" alias redshift="redshift -l 39.0997:-94.5786"
alias gpmdpe="electron --app=/usr/share/gpmdp/resources/app.asar"
export NOTES_DIR="$NICE_HOME"
n() {
SUBDIR="${2:-}"
mkdir -p "$NICE_HOME/doc/notes/$SUBDIR"
"$EDITOR" "$NICE_HOME/doc/notes/$SUBDIR/$(date +%Y-%m-%d)_$1.md"
}
# games aliases # games aliases
# this sometimes fixes steam dynamic library issues? # this sometimes fixes steam dynamic library issues?