update fabric

bar/main.py

@@ -33,15 +33,12 @@ def main():
         output_ids = sorted(outputs.keys())
 
         for i, output_id in enumerate(output_ids):
-            print("i", i)
-            print("output_id", output_id)
             bar = StatusBar(display=output_id, tray=tray if i == 0 else None, monitor=i)
             bar_windows.append(bar)
 
         return False
 
     if river.ready:
-        print("river ready", river._ready)
         spawn_bars()
     else:
         river.connect("notify::ready", lambda sender, pspec: spawn_bars())

bar/styles/main.css

@@ -1,14 +1,8 @@
-/* Fabric bar.css
- * https://github.com/Fabric-Development/fabric/blob/rewrite/examples/bar/bar.css
- * Modified with Camellia Theme: https://github.com/camellia-theme/camellia
- */
-/* we can use webcss variables, fabric compiles that to gtk css.
-   global variables can be stored in :vars */
-@import "./bar/styles/colors.css";
-@import "./bar/styles/workspaces.css";
-@import "./bar/styles/menu.css";
-@import "./bar/styles/vinyl.css";
-@import "./bar/styles/bar.css";
+@import url("./colors.css");
+@import url("./workspaces.css");
+@import url("./menu.css");
+@import url("./vinyl.css");
+@import url("./bar.css");
 
 
 /* unset so we can style everything from the ground up. */

flake.lock

@@ -6,16 +6,16 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1725442219,
-        "narHash": "sha256-xgTjqwlAgfY0Kv6G6CogOV2pN6U0wllRYteVAAZs7BU=",
-        "owner": "wholikeel",
-        "repo": "fabric-nix",
-        "rev": "3bc86cfb8c988ff5488526a47e1914f03a34a87c",
+        "lastModified": 1745289078,
+        "narHash": "sha256-1dZTqsWPaHyWjZkX4MaJdwUAQoMXwr8hhHymxQIwFrY=",
+        "owner": "Fabric-Development",
+        "repo": "fabric",
+        "rev": "1831ced4d9bb9f4be3893be55a8d502b47bff29e",
         "type": "github"
       },
       "original": {
-        "owner": "wholikeel",
-        "repo": "fabric-nix",
+        "owner": "Fabric-Development",
+        "repo": "fabric",
         "type": "github"
       }
     },
@@ -41,32 +41,32 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717179513,
-        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "lastModified": 1746810718,
+        "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1717179513,
-        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "lastModified": 1731603435,
+        "narHash": "sha256-CqCX4JG7UiHvkrBTpYC3wcEurvbtTADLbo3Ns2CEoL8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "rev": "8b27c1239e5c421a2bbc2c65d52e4a6fbf2ff296",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "24.05",
+        "ref": "24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,10 +2,10 @@
   description = "Fabric Bar Example";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/24.11";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
-    fabric.url = "github:wholikeel/fabric-nix";
+    fabric.url = "github:Fabric-Development/fabric";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };

nix/derivation.nix

@@ -7,8 +7,8 @@
   gobject-introspection,
   libdbusmenu-gtk3,
   gdk-pixbuf,
-  gnome,
-  cinnamon,
+  gnome-bluetooth,
+  cinnamon-desktop,
   wrapGAppsHook3,
   playerctl,
   webp-pixbuf-loader,
@@ -33,8 +33,8 @@ python3Packages.buildPythonApplication {
   buildInputs = [
     libdbusmenu-gtk3
     gtk-layer-shell
-    gnome.gnome-bluetooth
-    cinnamon.cinnamon-desktop
+    gnome-bluetooth
+    cinnamon-desktop
     gdk-pixbuf
     playerctl
     webp-pixbuf-loader

nix/shell.nix

@@ -22,8 +22,8 @@ pkgs.mkShell {
     gobject-introspection
     libdbusmenu-gtk3
     gdk-pixbuf
-    gnome.gnome-bluetooth
-    cinnamon.cinnamon-desktop
+    gnome-bluetooth
+    cinnamon-desktop
     wayland-scanner
     wayland
     wayland-protocols