flake.lock: update

Migrate broken overlays
khaneliman · May 28, 2024 · 18a9eb7 · 18a9eb7
1 parent 70b1c91
commit 18a9eb7
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 23 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -138,6 +138,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    waybar = {
+      url = "github:Alexays/Waybar";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Yubikey Guide
     yubikey-guide = {
       url = "github:drduh/YubiKey-Guide";

diff --git a/modules/home/programs/graphical/bars/waybar/default.nix b/modules/home/programs/graphical/bars/waybar/default.nix
@@ -15,7 +15,7 @@ let
     mkMerge
     ;
   inherit (lib.${namespace}) mkBoolOpt;
-  inherit (inputs) nixpkgs-wayland;
+  inherit (inputs) waybar;
 
   cfg = config.${namespace}.programs.graphical.bars.waybar;
 
@@ -95,7 +95,7 @@ in
 
     programs.waybar = {
       enable = true;
-      package = nixpkgs-wayland.packages.${system}.waybar;
+      package = waybar.packages.${system}.waybar;
       systemd.enable = true;
 
       # TODO: make dynamic / support different number of.graphical.bars etc

diff --git a/modules/home/suites/wlroots/default.nix b/modules/home/suites/wlroots/default.nix
@@ -1,9 +1,10 @@
 {
   config,
-  lib,
   inputs,
-  system,
+  lib,
   namespace,
+  pkgs,
+  system,
   ...
 }:
 let
@@ -21,9 +22,9 @@ in
   config = mkIf cfg.enable {
     home.packages = [
       nixpkgs-wayland.packages.${system}.wdisplays
-      nixpkgs-wayland.packages.${system}.wl-screenrec
       nixpkgs-wayland.packages.${system}.wl-clipboard
       nixpkgs-wayland.packages.${system}.wlr-randr
+      pkgs.wl-screenrec
     ];
 
     khanelinix = {