mirror of
				https://github.com/materusPL/nixos-config
				synced 2025-11-04 06:20:27 +01:00 
			
		
		
		
	materusPC: move container config, add vulkan headers, add image convert script
This commit is contained in:
		
							parent
							
								
									026b04add6
								
							
						
					
					
						commit
						3ec62e702a
					
				
							
								
								
									
										13
									
								
								configurations/host/materusPC/containers/default.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								configurations/host/materusPC/containers/default.nix
									
									
									
									
									
										Normal file
									
								
							@ -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;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
@ -6,6 +6,7 @@
 | 
			
		||||
      ./hardware
 | 
			
		||||
      ./vm
 | 
			
		||||
      ./secrets
 | 
			
		||||
      ./containers
 | 
			
		||||
 | 
			
		||||
      ./scripts.nix
 | 
			
		||||
      ./tmp.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
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
@ -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;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										38
									
								
								extraFiles/scripts/convert_images.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										38
									
								
								extraFiles/scripts/convert_images.sh
									
									
									
									
									
										Executable file
									
								
							@ -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
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user