Redo colors

1 files changed, 40 insertions, 69 deletions

diff --git a/.config/qtile/config.py b/.config/qtile/config.py
index edf68fb..2762b64 100644
--- a/.config/qtile/config.py
+++ b/.config/qtile/config.py
@@ -37,6 +37,7 @@ from libqtile.command import lazy
 from libqtile.widget import Spacer
 from keys import MyKeys
 from libqtile.dgroups import simple_key_binder
+from colors import gruvbox, nord_fox, my_colors
 #from widgets import *
 
 @hook.subscribe.startup_once
@@ -61,6 +62,7 @@ def window_to_next_group(qtile):
 my_keys = MyKeys(mod="mod4",
                  browser="qutebrowser",
                  term="alacritty")
+
 keys = my_keys.init_keys()
 dgroups_key_binder = simple_key_binder("mod4")
 
@@ -98,25 +100,6 @@ layouts = [
     # layout.RatioTile(**layout_theme),
     layout.Max(**layout_theme)
 ]
-def init_colors():
-    return [
-            ["#2F343F", "#2F343F"], # color 0
-            ["#000000", "#000000"], # black 1
-            ["#2F343F", "#2F343F"], # color 2
-            ["#c0c5ce", "#c0c5ce"], # color 3
-            ["#fba922", "#fba922"], # color 4
-            ["#3384d0", "#3384d0"], # Blue  5
-            ["#f3f4f5", "#f3f4f5"], # color 6
-            ["#cd1f3f", "#cd1f3f"], # color 7
-            ["#62FF00", "#62FF00"], # color 8
-            ["#6790eb", "#6790eb"], # color 9
-            ["#a9a9a9", "#a9a9a9"], # color 10
-            ['#ff0000', "#ff0000"], # red 11
-            ]
-
-
-colors = init_colors()
-
 
 # WIDGETS FOR THE BAR
 
@@ -134,8 +117,8 @@ def init_widgets_list():
             widget.Sep(
                 linewidth = 1,
                 padding = 6,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.Image(
                 filename = "~/.config/qtile/caduceus.jpg",
@@ -150,75 +133,63 @@ def init_widgets_list():
                 padding_x = 5,
                 borderwidth = 1,
                 disable_drag = True,
-                active = colors[5],
-                inactive = colors[10],
+                active = my_colors["blue"],
+                inactive = my_colors["grey"],
                 rounded = False,
-                highlight_color = colors[1],
+                highlight_color = my_colors["black"],
                 highlight_method = "line",
-                this_current_screen_border = colors[11],
-                other_current_screen_border = colors[10],
-                foreground = colors[2],
-                background = colors[1],
+                this_current_screen_border = my_colors["red"],
+                other_current_screen_border = my_colors["grey"],
+                foreground = my_colors["black"],
+                background = my_colors["black"],
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.CurrentLayout(
                 font = "Noto Sans Bold",
-                foreground = colors[4],
-                background = colors[1]
+                foreground = my_colors["orange"],
+                background = my_colors["black"]
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.WindowName(font="Noto Sans",
                 fontsize = 12,
-                foreground = colors[8],
-                background = colors[1],
+                foreground = my_colors["green"],
+                background = my_colors["black"],
             ),
-            # widget.Sep(
-            #     linewidth = 1,
-            #     padding = 10,
-            #     foreground = colors[2],
-            #     background = colors[1]
-            # ),
-            # widget.Net(
-            #     format='{interface}: U {up} D {down} T {total}'
-            # ),
+
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
                 foreground = colors[2],
                 background = colors[1]
             ),
-            # widget.Image(
-            #     filename='~/Pictures/arch/qwe_download.png',
-            #     scale = "True",
-            # ),
-            widget.TextBox(
+           widget.TextBox(
                 font="FontAwesome",
                 text= '|' + str(subprocess.check_output("uname -r", shell=True).strip()).replace('b','') + '|',
-                foreground=colors[5],
-                background=colors[1],
+                foreground=my_colors["blue"],
+                background=my_colors["black"],
                 padding = 0,
                 fontsize=14
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.Memory(
                 measure_mem="G",
                 fontsize=15,
-                graph_color = colors[11]
+                graph_color = my_colors["blue"]
             ),
             widget.MemoryGraph(
                 type='box'
@@ -226,8 +197,8 @@ def init_widgets_list():
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.ThermalSensor(
                 format='{tag}: {temp:.Of}{unit}',
@@ -236,45 +207,45 @@ def init_widgets_list():
             ),
             widget.CPUGraph(
                 type='box',
-                graph_color = colors[5]
+                graph_color = my_colors["blue"]
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 10,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
             widget.TextBox(
                 font="FontAwesome",
                 text="  ",
-                foreground=colors[5],
-                background=colors[1],
+                foreground=my_colors["blue"],
+                background=my_colors["black"],
                 padding = 0,
                 fontsize=18
             ),
             widget.Clock(
                 font='Mono',
-                foreground = colors[3],
-                background = colors[1],
+                foreground = my_colors["white"],
+                background = my_colors["black"],
                 fontsize = 18,
                 format="%d-%m-%Y | %H:%M"
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 3,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"],
             ),
             widget.Systray(
-                background=colors[1],
+                background= my_colors["black"],
                 icon_size=21,
                 padding = 10
             ),
             widget.Sep(
                 linewidth = 1,
                 padding = 20,
-                foreground = colors[2],
-                background = colors[1]
+                foreground = my_colors["black2"],
+                background = my_colors["black"]
             ),
         ]
     return widgets_list