ahrc-laptop/eww/eww.yuck

@@ -135,7 +135,7 @@
   )
 )
 
-(defwindow dock_ahrc-laptop
+(defwindow dock
   :monitor 0
   :geometry (geometry
     :x "0"
@@ -177,46 +177,3 @@
     )
   )
 )
-
-(defwindow dock_ahrc-pc
-  :monitor 0
-  :geometry (geometry
-    :x "0"
-    :y "0"
-    :width "100%"
-    :height "30px"
-    :anchor "bottom center"
-  )
-  :stacking "fg"
-  :exclusive true
-
-  (centerbox
-    :class "main"
-
-    (box
-      :class "left"
-      :halign "start"
-      :space-evenly false
-
-      (workspaces)
-      (window-title)
-    )
-
-    (box
-      :class "middle"
-      :space-evenly false
-
-      (tray)
-      (time)
-      (notifications)
-    )
-
-    (box
-      :class "right"
-      :halign "end"
-      :space-evenly false
-
-      ""
-    )
-  )
-)

ahrc-laptop/home.nix

@@ -37,8 +37,7 @@
       "Mod+Shift+quotedbl".action = move-column-to-workspace 3;
       "Mod+Shift+apostrophe".action = move-column-to-workspace 4;
     };
-    spawn-at-startup = [
+    spawn-at-startup = [{
-      {
       command = [
         "swaybg"
         "-i"
@@ -46,13 +45,16 @@
         "-m"
         "fill"
       ];
-      }
+    }];
-      { command = [ "eww" "open" "dock_ahrc-laptop" ]; }
+  };
-    ];
+
+  programs.eww = {
+    enable = true;
+    configDir = ./eww;
   };
 
   home.file.".local/share/backgrounds/default.png" = {
     enable = true;
-    source = ./wallpaper.png;
+    source = ./background.png;
   };
 }

ahrc-pc/home.nix

@@ -29,11 +29,5 @@
       "Mod+Shift+3".action = move-column-to-workspace 3;
       "Mod+Shift+4".action = move-column-to-workspace 4;
     };
-    spawn-at-startup = [{ command = [ "eww" "open" "dock_ahrc-pc" ]; }];
-  };
-
-  home.file.".local/share/backgrounds/default.png" = {
-    enable = true;
-    source = ./wallpaper.png;
   };
 }

common/home.nix

@@ -428,15 +428,7 @@
       };
       spawn-at-startup = [
         { command = [ "eww" "daemon" ]; }
-        {
+        { command = [ "eww" "open" "dock" ]; }
-          command = [
-            "swaybg"
-            "-i"
-            "/home/ahurac/.local/share/backgrounds/default.png"
-            "-m"
-            "fill"
-          ];
-        }
       ];
     };
   };
@@ -444,9 +436,4 @@
   programs.mpv.enable = true;
   programs.jq.enable = true;
   programs.fastfetch.enable = true;
-
-  programs.eww = {
-    enable = true;
-    configDir = ./eww;
-  };
 }