From 1590a1cf31116ffe04ec4e47c4be463f6ff5ad04 Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Fri, 5 Jun 2026 01:57:27 +0200
Subject: [PATCH] fix ui

---
 modules/home/gui/base/default.nix           |  8 ++++----
 modules/home/gui/theme/default.nix          |  5 +++--
 modules/home/gui/theme/wallpaper-gen.nix    | 13 +++++++++----
 modules/home/wayland/apps/dunst/default.nix |  2 +-
 modules/home/wayland/base/default.nix       |  2 +-
 modules/nixos/gui/xserver/default.nix       |  2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/home/gui/base/default.nix b/modules/home/gui/base/default.nix
index 0a4ef74..db51071 100644
--- a/modules/home/gui/base/default.nix
+++ b/modules/home/gui/base/default.nix
@@ -4,10 +4,10 @@
     services.nextcloud-client.enable = true;
 
     home.packages = with pkgs; [
-      xfce.thunar
-      xfce.thunar-volman
-      xfce.thunar-archive-plugin
-      xfce.tumbler
+      thunar
+      thunar-volman
+      thunar-archive-plugin
+      tumbler
 
       telegram-desktop
       discord-canary
diff --git a/modules/home/gui/theme/default.nix b/modules/home/gui/theme/default.nix
index 8741511..2e82845 100755
--- a/modules/home/gui/theme/default.nix
+++ b/modules/home/gui/theme/default.nix
@@ -19,6 +19,7 @@ in {
         name = "${config.colorscheme.slug}-Dark";
         package = gtkThemeFromScheme;
       };
+      gtk4.theme = config.gtk.theme; 
       iconTheme = {
         name = "tela-circle-icon-theme";
         package = pkgs.tela-circle-icon-theme;
@@ -30,7 +31,7 @@ in {
       platformTheme.name = "gtk";
     };
 
-    home.packages = [ wallpaperGen pkgs.swww ];
+    home.packages = [ wallpaperGen pkgs.awww ];
 
     xdg.configFile."script/wallpaper.sh".text = ''
       #!/bin/sh
@@ -49,7 +50,7 @@ in {
 
       IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
       IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
-      swww img $IMG
+      awww img $IMG
     '';
   };
 }
diff --git a/modules/home/gui/theme/wallpaper-gen.nix b/modules/home/gui/theme/wallpaper-gen.nix
index a7d0516..e113dfb 100644
--- a/modules/home/gui/theme/wallpaper-gen.nix
+++ b/modules/home/gui/theme/wallpaper-gen.nix
@@ -4,6 +4,12 @@ let
   colors = config.colorScheme.palette;
   mediaImages = config.syscfg.media.main;
   mediaNames = map (image: builtins.baseNameOf (toString image)) mediaImages;
+  mediaSourceDir = pkgs.linkFarm "wallpaper-media" (
+    map (image: {
+      name = builtins.baseNameOf (toString image);
+      path = image;
+    }) mediaImages
+  );
 
   dither = "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
   paletteSize = 0;
@@ -99,10 +105,9 @@ let
   );
 
   buildCommands =
-    lib.concatMapStringsSep "\n" (image:
+    lib.concatMapStringsSep "\n" (name:
       let
-        source = toString image;
-        name = builtins.baseNameOf source;
+        source = "${mediaSourceDir}/${name}";
         target = "build/${name}";
       in
       if lib.hasSuffix ".gif" (lib.toLower name) then ''
@@ -110,7 +115,7 @@ let
       '' else ''
         repalette ${lib.escapeShellArg source} ${lib.escapeShellArg target} -p ${lib.escapeShellArg paletteHex} --dither ${lib.escapeShellArg dither}
       ''
-    ) mediaImages;
+    ) mediaNames;
 in
 assert lib.assertMsg
   (builtins.length mediaNames == builtins.length (lib.unique mediaNames))
diff --git a/modules/home/wayland/apps/dunst/default.nix b/modules/home/wayland/apps/dunst/default.nix
index 5547256..191e4ce 100755
--- a/modules/home/wayland/apps/dunst/default.nix
+++ b/modules/home/wayland/apps/dunst/default.nix
@@ -46,7 +46,7 @@
           min_icon_size = 32;
           max_icon_size = 64;
 
-          icon_path =
+          icon_path = lib.mkForce 
             "${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/status:${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/device ";
           icon_theme = "Tela-circle-dark";
           enable_recursive_icon_lookup = "true";
diff --git a/modules/home/wayland/base/default.nix b/modules/home/wayland/base/default.nix
index d77e5f4..c288d99 100644
--- a/modules/home/wayland/base/default.nix
+++ b/modules/home/wayland/base/default.nix
@@ -34,7 +34,7 @@ in {
       glib
 
       brightnessctl
-      swww
+      awww
     ];
 
     xdg.mimeApps = {
diff --git a/modules/nixos/gui/xserver/default.nix b/modules/nixos/gui/xserver/default.nix
index c191f87..bd8c316 100644
--- a/modules/nixos/gui/xserver/default.nix
+++ b/modules/nixos/gui/xserver/default.nix
@@ -3,7 +3,7 @@
     programs.xwayland.enable = true;
     services.xserver = {
       enable = true;
-      videoDrivers = [ "amd" ];
+      videoDrivers = [ "amdgpu" ];
       xkb = {
         layout = "us";
         variant = "intl";