From 2995ae4d7aabbe439ba9144a39e668961508ca6d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 24 Jun 2023 14:58:28 -0400
Subject: [PATCH] meta: Replace feh with pqiv

pqiv is an image viewer that, unlike feh, has native support for
Wayland, which makes working with it quite nice. It also supports
showing a thumbnail mode that lets you preview and switch between
images with ease, as well as the ability to run custom commands
based on the current image.

pqiv has more features than imv *and* anti-aliasing *actually works*,
making it an ideal choice for image viewing on Wayland. After years of
using feh, I am quite happy that I found pqiv.
---
 home/default.nix     |  1 -
 home/feh.nix         | 77 --------------------------------------------
 home/hyprland.nix    |  1 -
 home/mime-apps.nix   |  4 +--
 modules/fish.nix     |  1 -
 modules/packages.nix |  1 +
 6 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 home/feh.nix

diff --git a/home/default.nix b/home/default.nix
index 836631e..ddb0153 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,7 +4,6 @@
   home-manager.sharedModules = [
     ./dunst.nix
     ./fcitx.nix
-    ./feh.nix
     ./fish.nix
     ./git.nix
     ./gpg.nix
diff --git a/home/feh.nix b/home/feh.nix
deleted file mode 100644
index 7ff0073..0000000
--- a/home/feh.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  programs.feh = {
-    enable = true;
-
-    keybindings = {
-      next_img = [ "k" "Right" ];
-      prev_img = [ "j" "Left" ];
-      quit = "q";
-      toggle_fullscreen = "f";
-
-      zoom_in = "h";
-      zoom_out = "l";
-
-      toggle_filenames = "d";
-      toggle_fixed_geometry = "g";
-      toggle_pause = "h";
-      toggle_pointer = "a";
-      size_to_image = "w";
-      jump_random = "z";
-      jump_first = "J";
-      jump_last = "K";
-      jump_fwd = "H";
-      jump_back = "L";
-      scroll_left = "b";
-      scroll_right = "n";
-      scroll_up = [ "u" "Up" ];
-      scroll_down = [ "d" "Down" ];
-      zoom_default = "o";
-      zoom_fill = "p";
-      toggle_auto_zoom = "m";
-
-      toggle_actions = null;
-      toggle_aliasing = null;
-      toggle_caption = null;
-      toggle_exif = null;
-      save_filelist = null;
-      toggle_info = null;
-      toggle_keep_vp = null;
-      toggle_menu = null;
-      reload_image = null;
-      save_image = null;
-      prev_dir = null;
-      next_dir = null;
-      orient_3 = null;
-      orient_1 = null;
-      flip = null;
-      mirror = null;
-      action_0 = null;
-      action_1 = null;
-      action_2 = null;
-      action_3 = null;
-      action_4 = null;
-      action_5 = null;
-      action_6 = null;
-      action_7 = null;
-      action_8 = null;
-      action_9 = null;
-      close = null;
-      reload_plus = null;
-      reload_minus = null;
-      remove = null;
-      delete = null;
-      scroll_left_page = null;
-      scroll_right_page = null;
-      scroll_up_page = null;
-      scroll_down_page = null;
-      render = null;
-      zoom_fit = null;
-      menu_close = null;
-      menu_up = null;
-      menu_down = null;
-      menu_parent = null;
-      menu_child = null;
-      menu_select = null;
-    };
-  };
-}
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 00cda0f..c0f9a76 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -160,7 +160,6 @@
     windowrulev2 = nomaxsize,class:^(osu\.exe)$
     windowrulev2 = opaque,class:^(kitty)$
     windowrulev2 = noblur,class:^(kitty)$
-    windowrulev2 = fullscreen,class:^(feh)$
     windowrulev2 = opacity 0.92 0.92,class:^(thunar)$
 
     # Scroll through existing workspaces with super + scroll
diff --git a/home/mime-apps.nix b/home/mime-apps.nix
index 6653193..1b8eb0a 100644
--- a/home/mime-apps.nix
+++ b/home/mime-apps.nix
@@ -3,8 +3,8 @@
     enable = true;
 
     defaultApplications = {
-      "image/png" = "feh.desktop";
-      "image/jpeg" = "feh.desktop";
+      "image/png" = "pqiv.desktop";
+      "image/jpeg" = "pqiv.desktop";
       "image/gif" = "org.qutebrowser.qutebrowser.desktop";
       "application/x-wine-extension-osz" = "osu-stable.desktop";
       "x-scheme-handler/http" = "librewolf.desktop";
diff --git a/modules/fish.nix b/modules/fish.nix
index 18a0cb9..45a60e3 100644
--- a/modules/fish.nix
+++ b/modules/fish.nix
@@ -29,7 +29,6 @@
       cp = "cp -ia";
       rg = "${pkgs.ripgrep}/bin/rg --max-columns=2000 --smart-case";
       yarn = "${pkgs.yarn}/bin/yarn --emoji true";
-      feh = "${pkgs.feh} --fullscreen";
     };
 
     shellAbbrs = {
diff --git a/modules/packages.nix b/modules/packages.nix
index fff12d8..2a182de 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -73,6 +73,7 @@
     wtype
     mtr
     cointop
+    pqiv
 
     poppler_utils
     wl-clipboard