thumbnailers and video programs. sxiv replaced with nsxiv. more image mimetypes added. sent added. get rid of old hostnames for tjkeller.xyzHEADmaster

9 files changed, 56 insertions, 10 deletions

diff --git a/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix
index bbca8df..418eb71 100644
--- a/archetypes/collections/desktop/default.nix
+++ b/archetypes/collections/desktop/default.nix
@@ -7,7 +7,9 @@
 		./firefox.nix
 		./graphics.nix
 		./office.nix
+		./thumbnailers.nix
 		./utilities.nix
+		./video.nix
 		./xserver.nix
 	];
 }
diff --git a/archetypes/collections/desktop/extra.nix b/archetypes/collections/desktop/extra.nix
index c3af43b..1d08bd4 100644
--- a/archetypes/collections/desktop/extra.nix
+++ b/archetypes/collections/desktop/extra.nix
@@ -12,6 +12,7 @@ in {
 			qdirstat
 			qdiskinfo
 			remmina
+			sent
 		];
 	};
 }
diff --git a/archetypes/collections/desktop/thumbnailers.nix b/archetypes/collections/desktop/thumbnailers.nix
new file mode 100644
index 0000000..50e4aa7
--- /dev/null
+++ b/archetypes/collections/desktop/thumbnailers.nix
@@ -0,0 +1,23 @@
+{ pkgs, lib, config, ... }: let
+	cfg = config._archetypes.collections.desktop.thumbnailers;
+in {
+	options._archetypes.collections.desktop.thumbnailers = {
+		enable = lib.mkEnableOption "install thumbnailers for graphical file managers";
+	};
+
+	config = lib.mkIf cfg.enable {
+		# https://wiki.nixos.org/wiki/Thumbnails
+		# Thumbnailers created in /run/current-system/sw/share/thumbnailers
+		environment.systemPackages = with pkgs; [
+			# Video
+			ffmpegthumbnailer
+			# Images
+			gdk-pixbuf
+			# HEIF images
+			libheif
+			libheif.out
+			# RAW images
+			nufraw-thumbnailer
+		];
+	};
+}
diff --git a/archetypes/collections/desktop/utilities.nix b/archetypes/collections/desktop/utilities.nix
index 51fed51..e2a61af 100644
--- a/archetypes/collections/desktop/utilities.nix
+++ b/archetypes/collections/desktop/utilities.nix
@@ -13,13 +13,13 @@ in {
 			libnotify
 			lowbat
 			mpv
+			nsxiv
 			pavolctld
 			pavucontrol
 			pcmanfm
 			redshift
 			scrot
 			st
-			sxiv
 			wpa_supplicant_gui
 			zathura
 		];
diff --git a/archetypes/collections/desktop/video.nix b/archetypes/collections/desktop/video.nix
new file mode 100644
index 0000000..cce6516
--- /dev/null
+++ b/archetypes/collections/desktop/video.nix
@@ -0,0 +1,17 @@
+{ pkgs, lib, config, ... }: let
+	cfg = config._archetypes.collections.desktop.video;
+in {
+	options._archetypes.collections.desktop.video = {
+		enable = lib.mkEnableOption "install video capture and editing software";
+	};
+
+	config = lib.mkIf cfg.enable {
+		environment.systemPackages = with pkgs; [
+			dvgrab
+			ffmpeg
+			mpv
+			obs-studio
+			vlc
+		];
+	};
+}
diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix
index a0ed9a8..6d53f84 100644
--- a/archetypes/profiles/desktop/default.nix
+++ b/archetypes/profiles/desktop/default.nix
@@ -5,6 +5,7 @@
 		_archetypes.collections = {
 			desktop = {
 				utilities.enable = mkDesktop true;
+				thumbnailers.enable = mkDesktop true;
 				firefox.enable = mkDesktop true;
 				xserver = {
 					enable = mkDesktop true;
@@ -106,7 +107,7 @@
 				audio     = [ "mpv" ];
 				directory = [ "pcmanfm" ];
 				email     = [ "thunderbird" ];
-				image     = [ "sxiv" ];
+				image     = [ "nsxiv" ];
 				pdf       = [ "org.pwmt.zathura-pdf-mupdf" ];
 				text      = [ "nvim" ];
 				video     = [ "mpv" ];
diff --git a/home-manager/resources/xdg-mime/image b/home-manager/resources/xdg-mime/image
index 4401ebb..1e2623b 100644
--- a/home-manager/resources/xdg-mime/image
+++ b/home-manager/resources/xdg-mime/image
@@ -1,14 +1,21 @@
+application/postscript
+image/avif
 image/bmp
 image/gif
+image/heic
+image/heif
+image/jp2
 image/jpeg
 image/jpg
+image/jxl
 image/png
+image/svg+xml
+image/svg+xml-compressed
 image/tiff
+image/webp
 image/x-bmp
 image/x-portable-anymap
 image/x-portable-bitmap
 image/x-portable-graymap
 image/x-tga
 image/x-xpixmap
-image/svg+xml
-image/svg+xml-compressed
diff --git a/hosts/optiplex/configuration.nix b/hosts/optiplex/configuration.nix
index c6483d1..f3b0f2a 100644
--- a/hosts/optiplex/configuration.nix
+++ b/hosts/optiplex/configuration.nix
@@ -18,6 +18,7 @@
 				crypto.enable = true;
 				graphics.enable = true;
 				office.enable = true;
+				video.enable = true;
 			};
 			development = {
 				android.enable = true;
diff --git a/users/timmy/hosts.nix b/users/timmy/hosts.nix
index 66c6ccc..16d9619 100644
--- a/users/timmy/hosts.nix
+++ b/users/timmy/hosts.nix
@@ -6,11 +6,5 @@
 		"192.168.77.11" = [ "truenas-office" ];
 		"192.168.77.8"  = [ "publicgit" "tjkeller" ];
 		"192.168.77.3"  = [ "devel" ];
-		"173.9.253.3"   = [
-			"git.tjkeller.xyz"
-			"piped.tjkeller.xyz"
-			"search.tjkeller.xyz"
-			"tjkeller.xyz"
-		];
 	};
 }