mucking around

.config/alacritty/alacritty-dark.yml

@@ -94,7 +94,7 @@ font:
     style: Italic
 
   # Point size
-  size: 27
+  size: 28
 
   # 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.

.config/alacritty/alacritty-tiny.yaml

@@ -116,8 +116,6 @@ draw_bold_text_with_bright_colors: true
 colors:
   # Default colors
   primary:
-    #background: '0xe0e0dd'
-    #foreground: '0x000000'
     background: '0x304455'
     foreground: '0xf0f7ff'
 
@@ -209,7 +207,7 @@ visual_bell:
 #
 # 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.
-background_opacity: 0.5
+background_opacity: 1.0
 
 # Mouse bindings
 #

.zshrc

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