up

3 files changed, 84 insertions, 50 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index a75258f..832c729 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -186,9 +186,14 @@ draw_bold_text_with_bright_colors: false
 # Colors (Tomorrow Night Bright)
 colors:
   # Default colors
+  #primary:
+  #  background: '#1d2021'
+  #  foreground: '#ebdbb2'
+
+  # ED style
   primary:
-    background: '#1d2021'
-    foreground: '#ebdbb2'
+    background: '#150C02'
+    foreground: '#fd9e22'
 
     # Bright and dim foreground colors
     #
@@ -202,9 +207,14 @@ colors:
   #
   # Colors which should be used to draw the terminal cursor. If these are unset,
   # the cursor color will be the inverse of the cell color.
+  # cursor:
+  #   text: '#000000'
+  #   cursor: '#d79921'
+
+  # ED style
   cursor:
     text: '#000000'
-    cursor: '#d79921'
+    cursor: '#fd9e22'
 
   # Selection colors
   #
@@ -216,26 +226,48 @@ colors:
   #  background: '#404040'
 
   # Normal colors
+  # normal:
+  #   black:   '#32302f'
+  #   red:     '#cc241d'
+  #   green:   '#98971a'
+  #   yellow:  '#d79921'
+  #   blue:    '#458588'
+  #   magenta: '#b16286'
+  #   cyan:    '#689d6a'
+  #   white:   '#a89984'
+
+  # # Bright colors
+  # bright:
+  #   black:   '#928374'
+  #   red:     '#fb4934'
+  #   green:   '#b8bb26'
+  #   yellow:  '#fabd2f'
+  #   blue:    '#83a598'
+  #   magenta: '#d3869b'
+  #   cyan:    '#8ec07c'
+  #   white:   '#ebdbb2'
+
+  # ED style
   normal:
-    black:   '#32302f'
-    red:     '#cc241d'
-    green:   '#98971a'
-    yellow:  '#d79921'
-    blue:    '#458588'
-    magenta: '#b16286'
-    cyan:    '#689d6a'
-    white:   '#a89984'
+    black:   '#391b05'
+    red:     '#FF5712'
+    green:   '#CBA41E'
+    yellow:  '#FDD024'
+    blue:    '#B07521'
+    magenta: '#FC5521'
+    cyan:    '#CEA425'
+    white:   '#FDAE26'
 
   # Bright colors
   bright:
-    black:   '#928374'
-    red:     '#fb4934'
-    green:   '#b8bb26'
-    yellow:  '#fabd2f'
-    blue:    '#83a598'
-    magenta: '#d3869b'
-    cyan:    '#8ec07c'
-    white:   '#ebdbb2'
+    black:   '#BD6616'
+    red:     '#FF7918'
+    green:   '#FFD928'
+    yellow:  '#FAEA21'
+    blue:    '#FDBE2D'
+    magenta: '#FC8E2A'
+    cyan:    '#FAD82C'
+    white:   '#FFE231'
 
   # Dim colors
   #
@@ -310,7 +342,7 @@ cursor:
   unfocused_hollow: true
 
 # Live config reload (changes require restart)
-live_config_reload: false
+live_config_reload: true
 
 # Shell
 #
diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc
index aa43dde..e8c9db4 100644
--- a/.config/conky/conkyrc
+++ b/.config/conky/conkyrc
@@ -45,17 +45,19 @@ conky.config = {
     out_to_stderr = false,
     extra_newline = false,
     default_color = 'red',
+	color0 = '#fd9e22',
+	color1 = '#c87911'
 }
 
 conky.text = [[
-${color #ebdbb2}${alignc}${time %A %e %B %Y - %Hh%M}
+${color0}${alignc}${time %A %e %B %Y - %Hh%M}
 ${font1}SYS ${hr 2}${font}
-${color #928374}Terminal: ${font2}${color #ebdbb2}${nodename_short}${font}
-${color #928374}OS:       ${font2}${color #ebdbb2}${sysname}${font}
-${color #928374}Kernel:   ${font2}${color #ebdbb2}${kernel}${font}
-${color #928374}Uptime:   ${font2}${color #ebdbb2}${uptime}${font}
+${color1}Terminal: ${font2}${color0}${nodename_short}${font}
+${color1}OS:       ${font2}${color0}${sysname}${font}
+${color1}Kernel:   ${font2}${color0}${kernel}${font}
+${color1}Uptime:   ${font2}${color0}${uptime}${font}
 ${if_match "${nodename_short}" == "mother"}${if_mpd_playing}${font1}MPD ${hr 2}${font}
-${font2}${color #ebdbb2}${goto 130}${mpd_artist}
+${font2}${color0}${goto 130}${mpd_artist}
 ${goto 130}${scroll wait 30 3 1 ${mpd_title}}
 ${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar}
 ${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 5,145 -n}${font}
@@ -63,32 +65,32 @@ ${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.pn
 
 ${endif}${endif}${execpi 300 ~/.local/bin/conky/weather.sh}
 ${font1}CPU ${hr 2}${font}
-${color #928374}Freq: ${font2}${color #ebdbb2}${freq_g} GHz ${color #ebdbb2}${font}${alignr}${if_match "${nodename_short}" == "mother"}${color #928374}Temp: ${font2}${color #ebdbb2}${hwmon 2 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color #928374}Temp: ${font2}${color #ebdbb2}${hwmon 4 temp 1}°C${endif}${font}
-${cpugraph 50,380 ebdbb2 928374 -t}
+${color1}Freq: ${font2}${color0}${freq_g} GHz ${color0}${font}${alignr}${if_match "${nodename_short}" == "mother"}${color1}Temp: ${font2}${color0}${hwmon 2 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color1}Temp: ${font2}${color0}${hwmon 4 temp 1}°C${endif}${font}
+${cpugraph 50,380 fd9e22 c87911 -t}
 ${voffset -24}${hr}
-${color #928374}1: ${color #ebdbb2}${cpubar cpu0 8,150}${color #ebdbb2}${color #928374}${alignr}2: ${color #ebdbb2}${cpubar cpu1 8,150}${color #ebdbb2}
-${color #928374}3: ${color #ebdbb2}${cpubar cpu2 8,150}${color #ebdbb2}${color #928374}${alignr}4: ${color #ebdbb2}${cpubar cpu3 8,150}${color #ebdbb2}
-${color #928374}5: ${color #ebdbb2}${cpubar cpu4 8,150}${color #ebdbb2}${color #928374}${alignr}6: ${color #ebdbb2}${cpubar cpu5 8,150}${color #ebdbb2}${if_match "${nodename_short}" == "mother"}
-${color #928374}7: ${color #ebdbb2}${cpubar cpu6 8,150}${color #ebdbb2}${color #928374}${alignr}8: ${color #ebdbb2}${cpubar cpu7 8,150}${color #ebdbb2}${endif}${font}
+${color1}1: ${color0}${cpubar cpu0 8,150}${color0}${color1}${alignr}2: ${color0}${cpubar cpu1 8,150}${color0}
+${color1}3: ${color0}${cpubar cpu2 8,150}${color0}${color1}${alignr}4: ${color0}${cpubar cpu3 8,150}${color0}
+${color1}5: ${color0}${cpubar cpu4 8,150}${color0}${color1}${alignr}6: ${color0}${cpubar cpu5 8,150}${color0}${if_match "${nodename_short}" == "mother"}
+${color1}7: ${color0}${cpubar cpu6 8,150}${color0}${color1}${alignr}8: ${color0}${cpubar cpu7 8,150}${color0}${endif}${font}
 ${font1}MEM ${hr 2}${font}
-${color #928374}RAM:  ${font2}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${membar 8}${font}
-${memgraph 50,380 ebdbb2 928374 -t}
+${color1}RAM:  ${font2}${color0}${mem} / ${memmax} ${color0}${membar 8}${font}
+${memgraph 50,380 fd9e22 c87911 -t}
 ${voffset -24}${hr}
-${color #928374}SWAP: ${font2}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapbar 8}${font}
+${color1}SWAP: ${font2}${color0}${swap} / ${swapmax} ${color0}${swapbar 8}${font}
 ${font1}DISK ${hr 2}${font}
-${alignr}${if_match "${nodename_short}" == "mother"}${color #928374}NVMe temp: ${font2}${color #ebdbb2}${hwmon 1 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color #928374}NVMe temp: ${font2}${color #ebdbb2}${hwmon 2 temp 1}°C${endif}${font}
-${diskiograph nvme0n1 50,380 ebdbb2 928374 -t}
+${alignr}${if_match "${nodename_short}" == "mother"}${color1}NVMe temp: ${font2}${color0}${hwmon 1 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color1}NVMe temp: ${font2}${color0}${hwmon 2 temp 1}°C${endif}${font}
+${diskiograph nvme0n1 50,380 fd9e22 c87911 -t}
 ${voffset -24}${hr}
-${color #928374}NVMe: ${font2}${color #ebdbb2}${fs_bar 8 /}${font}${if_match "${nodename_short}" == "mother"}
-${color #928374}HDD:  ${font2}${color #ebdbb2}${fs_bar 8 /var/hdd}${font}${endif}
+${color1}NVMe: ${font2}${color0}${fs_bar 8 /}${font}${if_match "${nodename_short}" == "mother"}
+${color1}HDD:  ${font2}${color0}${fs_bar 8 /var/hdd}${font}${endif}
 ${font1}PROC ${hr 2}${font}
-${color #928374}Process:${color #928374}${alignr}PID     CPU   MEM
-${font2}${color #ebdbb2}${top_mem name 1} ${alignr}${top_mem pid 1}  ${top_mem cpu 1}  ${top_mem mem_res 1}
-${font2}${color #928374}${top_mem name 2} ${alignr}${top_mem pid 2}  ${top_mem cpu 2}  ${top_mem mem_res 2}
-${font2}${color #ebdbb2}${top_mem name 3} ${alignr}${top_mem pid 3}  ${top_mem cpu 3}  ${top_mem mem_res 3}
-${font2}${color #928374}${top_mem name 4} ${alignr}${top_mem pid 4}  ${top_mem cpu 4}  ${top_mem mem_res 4}${font}
-${color #928374}---------
-${color #928374}Processes: ${font2}${color #ebdbb2}${processes}${font}
+${color1}Process:${color1}${alignr}PID     CPU   MEM
+${font2}${color0}${top_mem name 1} ${alignr}${top_mem pid 1}  ${top_mem cpu 1}  ${top_mem mem_res 1}
+${font2}${color1}${top_mem name 2} ${alignr}${top_mem pid 2}  ${top_mem cpu 2}  ${top_mem mem_res 2}
+${font2}${color0}${top_mem name 3} ${alignr}${top_mem pid 3}  ${top_mem cpu 3}  ${top_mem mem_res 3}
+${font2}${color1}${top_mem name 4} ${alignr}${top_mem pid 4}  ${top_mem cpu 4}  ${top_mem mem_res 4}${font}
+${color1}---------
+${color1}Processes: ${font2}${color0}${processes}${font}
 ${execpi 15 ~/.local/bin/conky/net.sh}
-${if_match "${nodename_short}" == "mother"}${color #ebdbb2}${downspeedgraph eth1 50,185 ebdbb2 928374 256000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph eth1 50,180 ebdbb2 928374 256000000 -t}${endif}${if_match "${nodename_short}" == "po-rbo"}${color #ebdbb2}${downspeedgraph enx4ce1734c425a 50,180 ebdbb2 928374 128000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph enx4ce1734c425a 50,180 ebdbb2 928374 128000000 -t}${endif}
+${if_match "${nodename_short}" == "mother"}${color0}${downspeedgraph eth1 50,185 fd9e22 c87911 256000000 -t}${goto 195}${color0}${upspeedgraph eth1 50,180 fd9e22 c87911 256000000 -t}${endif}${if_match "${nodename_short}" == "po-rbo"}${color0}${downspeedgraph enx4ce1734c425a 50,180 fd9e22 c87911 128000000 -t}${goto 195}${color0}${upspeedgraph enx4ce1734c425a 50,180 fd9e22 c87911 128000000 -t}${endif}
 ]]
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index 6e966ed..f8e05ef 100755
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -23,19 +23,19 @@ case $(hostname -s) in
 		icon=" "
 		mpd="mpd"
 		xscr="xscreensaver --no-splash"
-		sleep="sleep 0.5"
+		sleep="sleep 1"
 		;;
 	po-rbo)
 		icon=" "
 		mpd="mpd"
 		xscr="xscreensaver"
-		sleep="sleep 0.5"
+		sleep="sleep 1"
 		;;
 	fbsd-tp)
 		icon=" "
 		mpd="musicpd"
 		xscr="xscreensaver --no-splash"
-		sleep="gsleep 0.5"
+		sleep="gsleep 1"
 		;;
 esac