Switch fonts, revert colors, etc.

This commit is contained in:
Daniel Flanagan 2018-09-25 14:19:35 -05:00
parent 67572b1c4c
commit f644606469
11 changed files with 54 additions and 38 deletions

View File

@ -14,32 +14,34 @@ export LANG=C
# Info
# See this wiki page for more info:
# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
printinfo() {
info "OS" distro
info "Kernel" kernel
info "Shell" shell
info "Resolution" resolution
print_info() {
info line_break
prin "Shell" "bash"
prin "WM" "bspwm"
info "Theme" theme
info "Icons" icons
info "Term" term
prin "Font" "lemon"
info "Font" font
info "CPU" cpu
info "GPU" gpu
info line_break
info cols
info line_break
# info "OS" distro
# info "Kernel" kernel
# info "Theme" theme
# info "Icons" icons
# info "Resolution" resolution
# info "CPU Usage" cpu_usage
# info "Disk" disk
# info "Battery" battery
# info "Font" font
# info "Song" song
# info "Local IP" localip
# info "Public IP" publicip
# info "Users" users
# info "Birthday" birthday
info linebreak
info cols
wait
}
@ -48,6 +50,7 @@ printinfo() {
# Show more kernel info
# --kernel_shorthand on, off
kernel="off"
kernel_shorthand="on"
@ -221,7 +224,9 @@ underline_char="-"
# Color block range
# --block_range start end
start=0
end=7
end=15
# block_range="0,15"
# Toggle color blocks
# --color_blocks on, off
@ -229,11 +234,11 @@ color_blocks="on"
# Color block width in spaces
# --block_width num
block_width=3
block_width=5
# Color block height in lines
# --block_height num
block_height=1
block_height=2
# }}}
@ -280,10 +285,12 @@ disk_display="off"
# Image Options {{{
backend="w3m"
image_backend="w3m"
# Image Source
# --image wall, ascii, /path/to/img, /path/to/dir/, off
image="w3m"
image="wall"
# Thumbnail directory
thumbnail_dir="$HOME/.cache/thumbnails/neofetch"
@ -306,11 +313,11 @@ crop_offset="center"
# Image size
# The image is half the terminal width by default.
# --size auto, 00px, 00%, none
image_size="auto"
image_size="360px"
# Right gap between image and text
# --gap num
gap=2
gap=4
# Image offsets
# Only works with the w3m backend.

View File

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

View File

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

View File

@ -2,11 +2,19 @@
echo "xloadresources" >> "$HOME/.xstartup_log"
ENV_TYPE="${1}"
if [[ -z "$ENV_TYPE" ]]; then
ENV_TYPE=""
else
ENV_TYPE=".${ENV_TYPE}"
fi
sysresources="/etc/X11/xinit/.Xresources"
sysmodmap="/etc/X11/xinit/.Xmodmap"
userresources="$HOME/.Xresources"
usercolors="$HOME/.Xresources.colors"
userenv="$HOME/.Xresources.env"
userenv="$HOME/.Xresources${ENV_TYPE}.env"
usermodmap="$HOME/.Xmodmap"
if [ -f "$sysresources" ]; then

View File

@ -24,4 +24,5 @@ pacaur -S \
cloc `# For counting lines of code` \
ttf-noto-fonts-simple ttf-noto-fonts-ib noto-fonts-emoji `# Emoji` \
siji-git gohufont artwiz-fonts phallus-fonts-git `# Bitmap Fonts` \
autorandr `# Monitor Helper` \
--noconfirm --noedit

View File

@ -17,4 +17,4 @@ done
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 -width 600 -location 3 $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 $params

View File

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

View File

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

View File

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

View File

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

View File

@ -54,10 +54,10 @@ setw -g window-status-current-bg colour2
setw -g window-status-current-format ''
set -g status-interval 5
# set -g status-left-length 80
# set -g status-left "#[fg=colour18]#[bg=colour4] #(date +"%Y-%M-%d %H:%M:%S") #[fg=default]#[bg=default]"
set -g status-left-length 80
set -g status-left "#[fg=colour4]#W#[fg=default]#[bg=default]"
set -g status-right-length 200
set -g status-right "#[fg=colour4]#W #[fg=colour18]#[bg=default]|#[fg=colour7] #(~/.config/dotfiles/scripts/bin/tmux-session-list #S)"
set -g status-right "#[fg=colour7] #(~/.config/dotfiles/scripts/bin/tmux-session-list #S)"
# vim copying
setw -g mode-keys vi