From a2d914dc861abc0126cea7aa5c778493709db34b Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Fri, 7 Jun 2024 14:06:20 +0200
Subject: [PATCH] disable picom, replace dolphin with thunar add tumbler

---
 .config/i3/config              |  4 ++--
 modules/graphical/hyprland.nix |  1 -
 modules/graphical/shared.nix   |  9 ++++++++-
 modules/graphical/stylix.nix   | 11 +++++------
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index 952786c..25bb3ff 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -30,7 +30,7 @@ tiling_drag modifier titlebar
 
 # start a terminal
 bindsym $mod+q exec kitty
-bindsym $mod+e exec dolphin
+bindsym $mod+e exec thunar
 bindsym Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
 # kill focused window
 bindsym $mod+c kill
@@ -247,7 +247,7 @@ exec --no-startup-id "xrandr --output HDMI-0 --left-of DP-0 && xrandr --output D
 exec --no-startup-id dex --autostart --environment i3
 
 # start picom compositor
-exec --no-startup-id picom --config  ~/.config/picom/picom.conf
+#exec --no-startup-id picom --config  ~/.config/picom/picom.conf
 
 #status bar
 exec --no-startup-id ~/.config/i3/scripts/launch-polybar.sh
diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix
index 8b0fd9d..d3b6c22 100644
--- a/modules/graphical/hyprland.nix
+++ b/modules/graphical/hyprland.nix
@@ -69,7 +69,6 @@ in {
         networkmanagerapplet
         wayland
         wl-clipboard
-        xfce.tumbler # for thumbnails
         #qt5.qtwayland
         #qt6.qmake
         #qt6.qtwayland
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index 73d924e..2aa300a 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -52,11 +52,18 @@ in {
 
     #services.xserver.wacom.enable = true;
 
+    services.tumbler.enable = true; # for thumbnails
+    services.gvfs = {
+      enable = true; # for file manager, trash support, etc.
+      package = pkgs.gvfs;
+    };
+
     # List packages installed in system profile. To search, run:
     # $ nix search wget
     environment.systemPackages = with pkgs; [
       keepassxc
-      xfce.thunar
+      xfce.thunar # file manager
+      gvfs
       remmina
       thunderbird
       localsend
diff --git a/modules/graphical/stylix.nix b/modules/graphical/stylix.nix
index 01e232e..c2f9310 100644
--- a/modules/graphical/stylix.nix
+++ b/modules/graphical/stylix.nix
@@ -1,8 +1,7 @@
 { lib, config, pkgs, ... }:
-with lib;
 let cfg = config.custom.graphical.stylix;
 in {
-  options.custom.graphical.stylix = {
+  options.custom.graphical.stylix = with lib; {
     enable = mkEnableOption "Enables stylix";
     image = mkOption {
       type = types.path;
@@ -32,16 +31,16 @@ in {
   # https://danth.github.io/stylix/options/nixos.html
   config =
     let nerdfonts = pkgs.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
-    in mkIf cfg.enable {
+    in lib.mkIf cfg.enable {
 
-      home-manager = lib.mkIf config.custom.graphical.i3.enable {
+      home-manager = {
         users.${config.mainUser.name}.stylix = {
-          targets.kde.enable = false;
+          #targets.kde.enable = lib.mkIf config.custom.graphical.i3.enable false;
           base16Scheme = config.stylix.base16Scheme // cfg.override;
         };
       };
       stylix = {
-        autoEnable = mkForce true;
+        autoEnable = lib.mkForce true;
         polarity = "dark";
         image = cfg.image;
         override = cfg.override;