fixes and improvements

user/modules/waybar.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  scriptDir = ./../../scripts/waybar;
+  scriptDir = ./../../resources/scripts/waybar;
 
   # Get all files in the scriptDir
   scriptFiles = builtins.filter (name: 
@@ -28,11 +28,11 @@ in {
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-    settings = [{
+    settings.main = lib.mkMerge [{
     	command = "waybar";
         layer = "top";
-        position = "top";
-        "modules-left" = [
+        position = lib.mkDefault "top";
+        "modules-left" = lib.mkDefault [
           "tray"
           #"custom/cpu_linux"
 	  "cpu"
@@ -41,8 +41,8 @@ in {
           "disk"
           "custom/nvidia"
         ];
-        "modules-center" = [ "sway/window" ];
-        "modules-right" = [
+        "modules-center" = lib.mkDefault [ "sway/window" ];
+        "modules-right" = lib.mkDefault [
           "group/blight"
           "custom/colorpicker"
           "idle_inhibitor"
@@ -219,7 +219,7 @@ in {
     }
     
     window#waybar {
-      background: transparent;
+      background: black;
     }
     
     .modules-right {