From cb8e1c43c7d114418108aeb6ee89f172804d5260 Mon Sep 17 00:00:00 2001 From: reidlab Date: Wed, 29 Jan 2025 13:24:54 -0800 Subject: [PATCH] use waybar from pkgs --- flake.nix | 5 ++++- modules/desktop/waybar.nix | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 543cb92..a0f35da 100644 --- a/flake.nix +++ b/flake.nix @@ -10,11 +10,14 @@ hardware.url = "github:nixos/nixos-hardware"; nix-colors.url = "github:misterio77/nix-colors"; - waybar.url = "github:Alexays/Waybar"; + # waybar.url = "github:Alexays/Waybar"; + # waybar.inputs.nixpkgs.follows = "nixpkgs"; # hypr suite hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprlock.url = "github:hyprwm/hyprlock"; + hyprlock.inputs.nixpkgs.follows = "nixpkgs"; hypridle.url = "github:hyprwm/hypridle"; waybar-catppuccin.url = "github:catppuccin/waybar"; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 88f0c3d..b9a6e98 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -8,7 +8,8 @@ in { enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; package = mkOption { type = types.package; - default = inputs.waybar.packages.${system}.default; + # default = inputs.waybar.packages.${system}.default; + default = pkgs.waybar; example = "pkgs.waybar"; }; };