summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Xresources75
-rw-r--r--.config/alacritty/alacritty.yml3
-rw-r--r--.config/neofetch/config.conf4
-rw-r--r--.config/nvim/init.vim9
4 files changed, 64 insertions, 27 deletions
diff --git a/.Xresources b/.Xresources
index b62c855..4fc49f1 100644
--- a/.Xresources
+++ b/.Xresources
@@ -2,28 +2,57 @@
!! ~/.Xresources
!!
-#include ".config/xcolors/solarized_dark"
+! Common
+#define S_yellow #b58900
+#define S_orange #cb4b16
+#define S_red #dc322f
+#define S_magenta #d33682
+#define S_violet #6c71c4
+#define S_blue #268bd2
+#define S_cyan #2aa198
+#define S_green #859900
-*background: COLOR0
-*foreground: COLOR7
-*fadeColor: COLOR0
-*cursorColor: COLOR7
-*pointerColorBackground: COLOR10
-*pointerColorForeground: COLOR14
+! Dark
+#define S_base03 #002b36
+#define S_base02 #073642
+#define S_base01 #586e75
+#define S_base00 #657b83
+#define S_base0 #839496
+#define S_base1 #93a1a1
+#define S_base2 #eee8d5
+#define S_base3 #fdf6e3
-*color0: COLOR0
-*color8: COLOR8
-*color1: COLOR1
-*color9: COLOR9
-*color2: COLOR2
-*color10: COLOR10
-*color3: COLOR3
-*color11: COLOR11
-*color4: COLOR4
-*color12: COLOR12
-*color5: COLOR5
-*color13: COLOR13
-*color6: COLOR6
-*color14: COLOR14
-*color7: COLOR7
-*color15: COLOR15
+! Light
+! #define S_base03 #fdf6e3
+! #define S_base02 #eee8d5
+! #define S_base01 #93a1a1
+! #define S_base00 #839496
+! #define S_base0 #657b83
+! #define S_base1 #586e75
+! #define S_base2 #073642
+! #define S_base3 #002b36
+
+*background: S_base03
+*foreground: S_base0
+*fading: 40
+*fadeColor: S_base03
+*cursorColor: S_base1
+*pointerColorBackground: S_base01
+*pointerColorForeground: S_base1
+
+*color0: S_base02
+*color1: S_red
+*color2: S_green
+*color3: S_yellow
+*color4: S_blue
+*color5: S_magenta
+*color6: S_cyan
+*color7: S_base2
+*color9: S_orange
+*color8: S_base03
+*color10: S_base01
+*color11: S_base00
+*color12: S_base0
+*color13: S_violet
+*color14: S_base1
+*color15: S_base3
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 747268b..9492ada 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -60,9 +60,11 @@ colors:
primary:
background: '0x002b36' # base03
foreground: '0x839496' # base0
+
cursor:
text: '0x002b36' # base03
cursor: '0x839496' # base0
+
normal:
black: '0x073642' # base02
red: '0xdc322f' # red
@@ -72,6 +74,7 @@ colors:
magenta: '0xd33682' # magenta
cyan: '0x2aa198' # cyan
white: '0xeee8d5' # base2
+
bright:
black: '0x002b36' # base03
red: '0xcb4b16' # orange
diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
index 3290777..5e3dc9f 100644
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -101,7 +101,7 @@ mpc_args=()
## Text Colors
# Each number represents a different part of the text in
# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info'
-colors=(distro)
+colors=(4 6 1 32 2 6)
## Text Options
bold="on"
@@ -135,7 +135,7 @@ image_backend="ascii"
# 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")'
image_source="auto"
ascii_distro="auto"
-ascii_colors=(distro)
+ascii_colors=(33 33 64 64 37 37)
ascii_bold="on"
## Image Options
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 12e6e68..615c550 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -14,6 +14,9 @@
""---Loads plugins---""
call plug#begin('~/.config/nvim/plugged')
+ " Colorscheme
+ Plug 'altercation/vim-colors-solarized'
+ " Other
Plug 'mboughaba/i3config.vim'
Plug 'junegunn/goyo.vim'
" Plug 'preservim/nerdtree'
@@ -48,9 +51,11 @@
set showcmd
" Basic
+ syntax enable
+ set background=dark
+ colorscheme solarized
+ hi Normal ctermbg=NONE " Just so alacritty can use transparency.
set encoding=utf-8
- " set bg=dark
- syntax on
set number relativenumber
set clipboard+=unnamedplus