diff --git a/configurations/host/materusPC/containers/default.nix b/configurations/host/materusPC/containers/default.nix new file mode 100644 index 0000000..8509562 --- /dev/null +++ b/configurations/host/materusPC/containers/default.nix @@ -0,0 +1,13 @@ +{...}: +{ + virtualisation.lxc.enable = true; + virtualisation.lxc.lxcfs.enable = true; + virtualisation.lxd.enable = false; + + virtualisation.waydroid.enable = false; + virtualisation.podman = { + enable = true; + dockerCompat = true; + dockerSocket.enable = true; + }; +} \ No newline at end of file diff --git a/configurations/host/materusPC/default.nix b/configurations/host/materusPC/default.nix index ceabc41..13390da 100644 --- a/configurations/host/materusPC/default.nix +++ b/configurations/host/materusPC/default.nix @@ -6,6 +6,7 @@ ./hardware ./vm ./secrets + ./containers ./scripts.nix ./tmp.nix diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index 86d316f..fd47905 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -62,6 +62,7 @@ libGL.dev libGLU.dev vulkan-loader.dev + vulkan-headers xorg.xorgproto xorg.libX11.dev xorg.libXrandr.dev @@ -86,7 +87,7 @@ home.packages = [ pkgs.papirus-icon-theme materusArg.pkgs.ffmpeg_7-amf-full - (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) + (materusArg.pkgs.polymc-qt5.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) pkgs.git-crypt pkgs.obsidian ]; diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 74dbcb7..61abe1c 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -1,9 +1,7 @@ { config, pkgs, materusArg, ... }: { - virtualisation.lxc.enable = true; - virtualisation.lxc.lxcfs.enable = true; - virtualisation.lxd.enable = true; + programs.gamemode.enable = true; programs.corectrl.enable = true; @@ -57,12 +55,7 @@ services.libinput.enable = true; - virtualisation.waydroid.enable = false; - virtualisation.podman = { - enable = true; - dockerCompat = true; - dockerSocket.enable = true; - }; + diff --git a/extraFiles/scripts/convert_images.sh b/extraFiles/scripts/convert_images.sh new file mode 100755 index 0000000..12c97e9 --- /dev/null +++ b/extraFiles/scripts/convert_images.sh @@ -0,0 +1,38 @@ +#/usr/bin/env bash +IFS=$'\n' + + +change_to_webp() { + f="$1" + file="${f%.*}" + file_webp="${file}.webp" + echo "Trying to convert to $file_webp" + if convert "$f" "$file_webp"; then + if touch -r "$f" "$file_webp"; then + rm "$f" + echo "Finished converting $f" + else + echo "Failed to set old date to new file" + exit 1 + fi + else + echo "Failed to convert $f" + exit 1; + fi +} + +pushd $XDG_PICTURES_DIR +for f in `find "." \( -name "*.png" -type f -o -name "*.jpg" -type f -o -name "*.jpeg" -type f -o -name "*.avif" -type f \) \ + -a -not \( -path "./Inne/Special/*" -o -path "./Inne/Emojis/*" -o -path "./Inne/MCSkins/*" -o -path "./Avatar/*" -o -path "./Inne/GIF/*" \)`; +do + change_to_webp "$f" & +done + + +for job in `jobs -p` +do +echo "Waiting for: $job" + wait $job || let "FAIL+=1" +done + +popd \ No newline at end of file