Makussu/fabric-makussu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update fabric

Browse Source
This commit is contained in:
Makesesama 2025-05-12 12:01:43 +02:00
parent f28dd0b6a2
commit 743e1ed0c5
6 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bar/main.py
View File

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

16
bar/styles/main.css
View File

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

30
flake.lock generated
View File

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

4
flake.nix
View File

@ -2,10 +2,10 @@
description = "Fabric Bar Example"; description = "Fabric Bar Example";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/24.05"; nixpkgs.url = "github:NixOS/nixpkgs/24.11";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
utils.url = "github:numtide/flake-utils"; 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.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };

8
nix/derivation.nix
View File

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

4
nix/shell.nix
View File

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