Merge branch 'base16'

diff --cc config/dot-config/fish/config.fish
Simple merge

diff --cc config/dot-config/hypr/colors.conf
index e578961ce2fea7b0386c6aa5c4a24e785ff3436a,1e2c81feee635b2847de2e347ac5aa55a836ff0e..8f59ede63af9bcfc8bf340d3daa08422a05fb1c6
--- 1/config/dot-config/hypr/colors.conf
--- 2/config/dot-config/hypr/colors.conf
+++ b/config/dot-config/hypr/colors.conf
@@@ -1,20 -1,19 +1,19 @@@
- ## Base16 Rosé Pine
- # Author: Emilia Dunfelt <sayhi@dunfelt.se>
- 
- $base00 = 0xff191724
- $base01 = 0xff1f1d2e
- $base02 = 0xff26233a
- $base03 = 0xff555169
- $base04 = 0xff6e6a86
- $base05 = 0xffe0def4
- $base06 = 0xfff0f0f3
- $base07 = 0xffc5c3ce
- $base08 = 0xffe2e1e7
- $base09 = 0xffeb6f92
- $base0A = 0xfff6c177
- $base0B = 0xffebbcba
- $base0C = 0xff31748f
- $base0D = 0xff9ccfd8
- $base0E = 0xffc4a7e7
- $base0F = 0xffe5e5e5
+ # Base16 Ocean
+ # Author: Chris Kempson (http://chriskempson.com)
  
 -$base0F = 0xffab7967
+ $base00 = 0xff2b303b
+ $base01 = 0xff343d46
+ $base02 = 0xff4f5b66
+ $base03 = 0xff65737e
+ $base04 = 0xffa7adba
+ $base05 = 0xffc0c5ce
+ $base06 = 0xffdfe1e8
+ $base07 = 0xffeff1f5
+ $base08 = 0xffbf616a
+ $base09 = 0xffd08770
+ $base0A = 0xffebcb8b
+ $base0B = 0xffa3be8c
+ $base0C = 0xff96b5b4
+ $base0D = 0xff8fa1b3
+ $base0E = 0xffb48ead
++$base0F = 0xffab7967