From 00f1ffed3096c25b73f2c6e5e0d006154d697490 Mon Sep 17 00:00:00 2001
From: djairoh <djairoh@mykolab.com>
Date: Wed, 30 Sep 2026 17:53:42 +0200
Subject: [PATCH] ft: feh nix + catppuccin nix fix for home manager

---
 flake.nix                              |  1 -
 modules/{apps.nix => apps/default.nix} |  8 ++++-
 modules/apps/feh.nix                   | 46 ++++++++++++++++++++++++++
 modules/base.nix                       | 13 ++++----
 modules/default.nix                    |  2 +-
 5 files changed, 61 insertions(+), 9 deletions(-)
 rename modules/{apps.nix => apps/default.nix} (88%)
 create mode 100644 modules/apps/feh.nix

diff --git a/flake.nix b/flake.nix
index df7e5d4..10e0548 100755
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
             inputs.home-manager.nixosModules.home-manager
             inputs.nix-flatpak.nixosModules.nix-flatpak
             inputs.sops-nix.nixosModules.sops
-            inputs.catppuccin.nixosModules.catppuccin
             { home-manager.sharedModules = [inputs.catppuccin.homeModules.catppuccin];}
             ./hosts/${hostname}
           ];
diff --git a/modules/apps.nix b/modules/apps/default.nix
similarity index 88%
rename from modules/apps.nix
rename to modules/apps/default.nix
index 94ff47c..2adbf8b 100644
--- a/modules/apps.nix
+++ b/modules/apps/default.nix
@@ -1,7 +1,10 @@
 { pkgs, ... }:
 
 {
+  imports = [
+    ./feh.nix
 
+  ];
   services.flatpak = {
     enable = true;
     update.onActivation = false;
@@ -14,7 +17,10 @@
   };
 
   # TODO: switch to home manager
-  # home-manager.users.djai.home.packages = with pkgs; [ ];
+  home-manager.users.djai.home.packages = with pkgs; [
+    # terminal
+    fzf
+  ];
 
   users.users.djai.packages = with pkgs; [
     # chat
diff --git a/modules/apps/feh.nix b/modules/apps/feh.nix
new file mode 100644
index 0000000..0deb231
--- /dev/null
+++ b/modules/apps/feh.nix
@@ -0,0 +1,46 @@
+{ ... }:
+
+{
+  home-manager.users."djai".programs.feh = {
+    enable = true;
+    themes = {
+      feh = [
+        "-B" "#24273a"
+        "-d"
+        "-N"
+        "-e" "yudit/14"
+        "--title" "feh"
+        "--auto-zoom"
+        "--scale-down"
+        "--action3" ";[Copy]fish -c \"copy %F\""
+        "--action4" "[Move]/home/djai/Scripts/rename.sh %F"
+        "--action5" "[Delete]gio trash %F && echo deleted %F"
+        "--action9" ";[Gimp]gimp %F > /dev/null 2>&1 &"
+      ];
+
+      notitle = [
+        "-B " "#24273a"
+        "-N"
+        "-e" "yudit/14"
+        "--title" "feh"
+        "--auto-zoom"
+        "--scale-dow"
+      ];
+
+      nozoom = [
+        "-B" "#24273a"
+        "-d"
+        "-e" "yudit/14"
+        "--title" "feh"
+       ]; 
+
+      nobg = [
+        "-d"
+        "-e" "yudit/14"
+        "--title" "feh"
+        "--auto-zoom"
+        "--scale-down"
+      ];
+    };
+  };
+}
diff --git a/modules/base.nix b/modules/base.nix
index 18a267a..f7b533a 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -83,12 +83,13 @@
         };
       };
 
+      catppuccin = {
+        accent = "mauve";
+        autoEnable = true;
+        enable = true;
+        flavor = "macchiato";
+      };
     };
-  };
-  catppuccin = {
-    accent = "mauve";
-    autoEnable = true;
-    enable = true;
-    flavor = "macchiato";
+
   };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 1afca79..96af1d9 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../secrets 
-    ./apps.nix
+    ./apps
     ./audio
     ./base.nix
     ./certificates