Fixed xfce configuration

1 files changed, 32 insertions, 20 deletions

diff --git a/home/rices/cassette-futurism/xfce.nix b/home/rices/cassette-futurism/xfce.nix
index 3f920d8..9a1970c 100644
--- a/home/rices/cassette-futurism/xfce.nix
+++ b/home/rices/cassette-futurism/xfce.nix
@@ -1,9 +1,12 @@
 {
   config,
   pkgs,
+  osConfig,
   ...
 }: let
   vars = import ./variables.nix;
+  # Access system-level Stylix wallpaper
+  wallpaperPath = osConfig.stylix.image;
 in {
   # XFCE configuration via xfconf
   # Cassette futurism aesthetic with hidden menubars and retro settings
@@ -48,8 +51,10 @@ in {
         screen0 = {
           monitor0 = {
             workspace0 = {
-              # Wallpaper is handled by Stylix
+              # Apply cassette futurism wallpaper
+              color-style = 0;
               image-style = 3;  # Scaled
+              last-image = "${wallpaperPath}";
             };
           };
         };
@@ -99,17 +104,16 @@ in {
       misc-cursor-shape = "TERMINAL_CURSOR_SHAPE_BLOCK";
     };
 
-    # GTK settings
+    # GTK settings (theme is handled by Stylix)
     xsettings = {
-      # Dark theme preference
-      "Net/ThemeName" = "Adwaita-dark";
+      # Prefer dark theme
       "Gtk/ApplicationPreferDarkTheme" = 1;
 
       # Toolbar icons only (no text)
       "Gtk/ToolbarStyle" = 3;  # Icons only
       "Gtk/ToolbarIconSize" = 3;  # Large icons
 
-      # Font rendering
+      # Font rendering (Stylix handles fonts, but these are good defaults)
       "Xft/Antialias" = 1;
       "Xft/Hinting" = 1;
       "Xft/HintStyle" = "hintslight";
@@ -118,20 +122,28 @@ in {
     };
   };
 
-  # Additional GTK settings for menubar hiding
-  gtk.gtk3.extraCss = ''
-    /* Hide menubars globally in GTK3 applications */
-    .menubar {
-      opacity: 0;
-      min-height: 0;
-      padding: 0;
-      margin: 0;
-    }
-  '';
-
-  # Session variables
-  home.sessionVariables = {
-    # Ensure GTK uses dark theme
-    GTK_THEME = "Adwaita-dark";
+  # GTK theming - let Stylix handle colors, we just hide menubars
+  gtk = {
+    enable = true;
+
+    gtk3.extraCss = ''
+      /* Hide menubars globally in GTK3 applications */
+      .menubar {
+        opacity: 0;
+        min-height: 0;
+        padding: 0;
+        margin: 0;
+      }
+    '';
+
+    gtk4.extraCss = ''
+      /* Hide menubars in GTK4 applications */
+      .menubar {
+        opacity: 0;
+        min-height: 0;
+        padding: 0;
+        margin: 0;
+      }
+    '';
   };
 }