From 437ea5ce33db78d7554d7ade4724e64b70d0e18f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 16 Oct 2020 15:35:17 -0500
Subject: [PATCH] Fix mime type for clipshot and add some necessary packages

---
 bin/clipshot                 |  2 +-
 env/nix/personal-machine.nix | 42 +++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/bin/clipshot b/bin/clipshot
index 033999e..c4b4d4d 100755
--- a/bin/clipshot
+++ b/bin/clipshot
@@ -9,7 +9,7 @@ fn="$SCROTS_PATH/clipshot_$d.png"
 if is_wayland; then
 	dim="$(slurp -d)"
 	if [ $? -eq 0 ]; then
-		grim -g "$dim" - | wl-copy
+		grim -g "$dim" - | wl-copy -t image/png
 		wl-paste -n > "$fn"
 		echo "$fn"
 		# grim -g "$dim" - | tee "$fn" | wl-copy -f
diff --git a/env/nix/personal-machine.nix b/env/nix/personal-machine.nix
index 2dead06..ae4321f 100644
--- a/env/nix/personal-machine.nix
+++ b/env/nix/personal-machine.nix
@@ -34,30 +34,10 @@
 			networkmanager
 			wget curl w3m
 			git
-			kitty
 			pciutils usbutils binutils
-			sway waybar mako wl-clipboard
-			firefox-devedition-bin
 			ripgrep sd
 			nodejs python3
-			fzf
-			fortune
-			dmenu
-			ranger
 			rsync
-			pass
-			brightnessctl
-			vulkan-tools # TODO: vulkan?
-			htop
-			rustup
-			clang
-			pavucontrol
-			pamixer
-			strongswan
-			gnumake
-			elixir
-			docker docker-compose
-			postgresql
 		];
 		variables = {
 			EDITOR = "nvim";
@@ -120,6 +100,28 @@
 			pulsemixer
 			file
 			appimage-run
+			kitty
+			sway waybar mako wl-clipboard
+			firefox-devedition-bin
+			fzf
+			fortune
+			dmenu
+			ranger
+			pass
+			brightnessctl
+			vulkan-tools # TODO: vulkan?
+			rustup
+			clang
+			pavucontrol
+			pamixer
+			strongswan
+			gnumake
+			elixir
+			docker docker-compose
+			postgresql
+			htop
+			google-cloud-sdk
+			slurp grim
 		];
   };