Add polybar and fish color support, fix util md5 hash error

eylles · May 14, 2024 · e9e9f0a · e9e9f0a
1 parent 0d752fd
commit e9e9f0a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/pywal/export.py b/pywal/export.py
@@ -97,11 +97,13 @@ def get_export_type(export_type):
         "rofi": "colors-rofi.Xresources",
         "scss": "colors.scss",
         "shell": "colors.sh",
+        "fishshell": "colors.fish",
         "speedcrunch": "colors-speedcrunch.json",
         "sway": "colors-sway",
         "tty": "colors-tty.sh",
         "vscode": "colors-vscode.json",
         "waybar": "colors-waybar.css",
+        "polybar": "colors-polybar",
         "xresources": "colors.Xresources",
         "haskell": "Colors.hs",
         "xmonad": "colors.hs",

diff --git a/pywal/templates/colors-polybar b/pywal/templates/colors-polybar
@@ -0,0 +1,8 @@
+background = d9{color0.strip}
+background-alt = {color8.strip}
+foreground = {color7.strip}
+foreground-alt = {color7.strip}
+primary = {color1.strip}
+secondary = {color2.strip}
+alert = {color3.strip}
+disabled = {color15.strip}
diff --git a/pywal/templates/colors.fish b/pywal/templates/colors.fish
@@ -0,0 +1,25 @@
+set fish_color_normal normal
+set fish_color_command {color3.strip}
+set fish_color_param {color11.strip}
+set fish_color_redirection $fish_color_param
+set fish_color_comment {color2.strip}
+set fish_color_error ff0000
+set fish_color_escape {color1.strip}
+set fish_color_operator $fish_color_escape
+set fish_color_end {color1.strip}
+set fish_color_quote {color2.strip}
+set fish_color_autosuggestion {color8.strip}
+set fish_color_user {color12.strip}
+set fish_color_host {color4.strip}
+set fish_color_valid_path --underline
+set fish_color_cwd {color4.strip}
+set fish_color_cwd_root red
+set fish_color_match --background=brblue
+set fish_color_search_match bryellow --background=brblack
+set fish_color_selection white --bold --background=brblack
+set fish_color_cancel -r
+set fish_pager_color_prefix white --bold --underline
+set fish_pager_color_completion {color15.strip} --background={color0.strip}
+set fish_pager_color_description $fish_color_quote yellow
+set fish_pager_color_progress {color6.strip} --background={color0.strip}
+set fish_color_history_current --bold
diff --git a/pywal/util.py b/pywal/util.py
@@ -12,7 +12,7 @@
 import shutil
 import subprocess
 import sys
-from hashlib import md5
+import hashlib 
 
 
 class Color:
@@ -199,7 +199,7 @@ def save_file_json(data, export_file):
 
 
 def get_img_checksum(img):
-    checksum = md5(usedforsecurity=False)
+    checksum = hashlib.new('md5', usedforsecurity=False)
     with open(img, "rb") as f:
         for chunk in iter(lambda: f.read(4096), b""):
             checksum.update(chunk)