From 2e470a4a3f924f3e4fa2e13246fa288bccf57713 Mon Sep 17 00:00:00 2001
From: Tasia Iso <tasiaiso@proton.me>
Date: Thu, 30 May 2024 09:57:46 +0200
Subject: [PATCH] build changes

---
 Makefile       | 28 +++++++++++++++-------------
 haml/main.haml |  2 +-
 shell.nix      |  3 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 076e7d3..b3e231c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ site/index.html: docs/** \
 				theme/main.html \
 				theme/style.min.css \
 				theme/gruvbox-dark.min.css \
-				mkdocs.yml
+				mkdocs.yml \
+				favicon_all
 	mkdocs build
 
 build: site/index.html
@@ -30,12 +31,13 @@ theme/favicon-ex.png: theme/favicon.svg
 	inkscape theme/favicon.svg --export-filename=theme/favicon-ex.png
 
 theme/favicon.png: theme/favicon-ex.png
-	magick theme/favicon-ex.png -compress Zip -quality 1 -resize 144x144 theme/favicon.png
+	magick theme/favicon-ex.png -quality 95 -resize 144x144 theme/favicon.png
 
-theme/favicon.ico: theme/favicon-ex.png
-	magick theme/favicon-ex.png -compress Zip -quality 1 -resize 144x144 theme/favicon.ico
+# theme/favicon.ico: theme/favicon-ex.png
+# 	magick theme/favicon-ex.png -compress Zip -quality 95 -resize 144x144 -background transparent theme/favicon.ico
 
-favicon_all: theme/favicon.png theme/favicon.ico
+favicon_all: theme/favicon.png
+# theme/favicon.ico
 
 # Scripts
 
@@ -59,12 +61,12 @@ purge: clean format build
 
 .PHONY: clean
 clean:
-	rm -r site/
-	rm theme/main.html
-	rm theme/style.min.css
-	rm theme/gruvbox-dark.min.css
-	rm theme/favicon-ex.png
-	rm theme/favicon.min.svg
-	rm theme/favicon.png
-	rm theme/favicon.ico
+	rm -r site/ || true
+	rm theme/main.html || true
+	rm theme/style.min.css || true
+	rm theme/gruvbox-dark.min.css || true
+	rm theme/favicon-ex.png || true
+	rm theme/favicon.min.svg || true
+	rm theme/favicon.png || true
+	rm theme/favicon.ico || true
 	
\ No newline at end of file
diff --git a/haml/main.haml b/haml/main.haml
index a6d92cb..9b86e33 100644
--- a/haml/main.haml
+++ b/haml/main.haml
@@ -4,7 +4,7 @@
     %meta(charset="UTF-8")
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
     %link(rel="icon" type="image/png" href="/~tasiaiso/favicon.png")
-    %link(rel="icon" type="image/x-icon" href="/~tasiaiso/favicon.ico")
+    -# %link(rel="icon" type="image/x-icon" href="/~tasiaiso/favicon.ico")
     %link(rel="icon" type="image/svg+xml" href="/~tasiaiso/favicon.svg" sizes="any")
 
     %link(rel="stylesheet" href="/~tasiaiso/gruvbox-dark.min.css")
diff --git a/shell.nix b/shell.nix
index f77a1e9..c2c5b0e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,6 +6,9 @@ pkgs.mkShell{
     python310Packages.mkdocs
     python310Packages.mkdocs-minify
     python310Packages.csscompressor
+    python310Packages.htmlmin # htmlmin --keep-optional-attribute-quotes theme/favicon.svg theme/favicon.min.svg
     rubyPackages.haml
+    inkscape
+    imagemagick
   ];
 }