mucking around

This commit is contained in:
Daniel Lundin 2019-12-04 17:28:14 +01:00
parent bae60a7737
commit a10d9e5947
3 changed files with 6 additions and 5 deletions

View file

@ -94,7 +94,7 @@ font:
style: Italic style: Italic
# Point size # Point size
size: 27 size: 28
# Offset is the extra space around each character. `offset.y` can be thought of # Offset is the extra space around each character. `offset.y` can be thought of
# as modifying the line spacing, and `offset.x` as modifying the letter spacing. # as modifying the line spacing, and `offset.x` as modifying the letter spacing.

View file

@ -116,8 +116,6 @@ draw_bold_text_with_bright_colors: true
colors: colors:
# Default colors # Default colors
primary: primary:
#background: '0xe0e0dd'
#foreground: '0x000000'
background: '0x304455' background: '0x304455'
foreground: '0xf0f7ff' foreground: '0xf0f7ff'
@ -209,7 +207,7 @@ visual_bell:
# #
# Window opacity as a floating point number from `0.0` to `1.0`. # Window opacity as a floating point number from `0.0` to `1.0`.
# The value `0.0` is completely transparent and `1.0` is opaque. # The value `0.0` is completely transparent and `1.0` is opaque.
background_opacity: 0.5 background_opacity: 1.0
# Mouse bindings # Mouse bindings
# #

5
.zshrc
View file

@ -156,7 +156,11 @@ function prompt_command {
if [[ "${TMUX}" != "" ]]; then if [[ "${TMUX}" != "" ]]; then
if [[ "${HOST}" = "lilbub" ]]; then if [[ "${HOST}" = "lilbub" ]]; then
tmux set -g status-fg "#ffebee" tmux set -g status-fg "#ffebee"
<<<<<<< HEAD
tmux set -g status-bg "#212121" tmux set -g status-bg "#212121"
=======
tmux set -g status-bg "#b71c1c"
>>>>>>> mucking around
tmux set -g status-left '#[bg=#E53935,fg=#ffebee] #I #[default] ' tmux set -g status-left '#[bg=#E53935,fg=#ffebee] #I #[default] '
fi fi
fi fi
@ -293,7 +297,6 @@ export BAZEL_PYTHON=python2
## JavaScript ## JavaScript
export PATH="./node_modules/.bin:$PATH" export PATH="./node_modules/.bin:$PATH"
>>>>>>> work
## Golang ## Golang
export GOPATH=$HOME export GOPATH=$HOME