From beece1f38957ed66ea90eb5346183a45641ac418 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 17 Jul 2024 16:00:02 -0500 Subject: [PATCH] flake.lock: update --- flake.lock | 207 ++++++++++-------- .../graphical/bars/waybar/default.nix | 23 +- 2 files changed, 120 insertions(+), 110 deletions(-) diff --git a/flake.lock b/flake.lock index 9e3ef7d61..f67ceb86c 100644 --- a/flake.lock +++ b/flake.lock @@ -483,7 +483,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -501,7 +501,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -519,7 +519,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1710146030, @@ -537,7 +537,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1701680307, @@ -570,7 +570,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1694529238, @@ -588,7 +588,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1710146030, @@ -872,11 +872,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721160190, - "narHash": "sha256-dnC7b/C8QRPoGs2H2cAYWmrTRVhN5m1xDpyrNTqV8r8=", + "lastModified": 1721248202, + "narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=", "ref": "refs/heads/main", - "rev": "293e687389a19b369f312c5c335c9afe7c886be1", - "revCount": 4929, + "rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9", + "revCount": 4930, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1051,15 +1051,25 @@ }, "hyprlang_4": { "inputs": { - "nixpkgs": "nixpkgs_8", - "systems": "systems_7" + "hyprutils": [ + "hyprpaper", + "hyprutils" + ], + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "type": "github" }, "original": { @@ -1078,11 +1088,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1721162148, - "narHash": "sha256-VRT1NZvDyXXWaCyCONbSqmg/MRCfj/Rd2myCZ6FQIjc=", + "lastModified": 1721222562, + "narHash": "sha256-pkWRiX+9fDuS94yMR11txMufLaTgt3p38yG+LOeoOTc=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "a3d8a2c128f7f610b4c62e78c801a100a731cd95", + "rev": "9514925a7c4c11028b6e3aae548b9c6859849462", "type": "github" }, "original": { @@ -1094,15 +1104,17 @@ "hyprpaper": { "inputs": { "hyprlang": "hyprlang_4", - "nixpkgs": "nixpkgs_9", - "systems": "systems_8" + "hyprutils": "hyprutils_4", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_8", + "systems": "systems_7" }, "locked": { - "lastModified": 1719939251, - "narHash": "sha256-N58i+BSqmz9n7WKFY0Q8c27NWetyzbJf/1NtJuNEQLg=", + "lastModified": 1721226775, + "narHash": "sha256-dO+jd4i9vitOnSNgJSR6zjS2Gi/mDscLwfo5OY9geN0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "13fcdd79efe439a81d807572cc4b4737abbad918", + "rev": "cbc16f939fc0ac742ac681c86e9009b9d48e1bfc", "type": "github" }, "original": { @@ -1186,6 +1198,31 @@ "type": "github" } }, + "hyprutils_4": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1721071737, + "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -1211,6 +1248,31 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -1327,11 +1389,11 @@ ] }, "locked": { - "lastModified": 1721037029, - "narHash": "sha256-wuHiinPG5CzCUBr9I51g+IRhP/69Y9gRVh+QnEtFnyI=", + "lastModified": 1721226275, + "narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "f6db2d325bdf57d39a3ae43376bdf2a020a6aad2", + "rev": "8ebede998342477736e0d0acdcc13ddb166a335f", "type": "github" }, "original": { @@ -1376,11 +1438,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1721127872, - "narHash": "sha256-UFo339Af8LUIklUmNe2igix3aOx1lAeLnl06D3k5Sjk=", + "lastModified": 1721215108, + "narHash": "sha256-aOiSBcftoGye0spDdIylZE6TVTo7C/B4atYH25tSemQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4fd4b5eacfbd27866c57193af68c1c1eb8ecc2c", + "rev": "7edc243443b44444eba596557de03ee52beca2eb", "type": "github" }, "original": { @@ -1439,22 +1501,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1720768451, "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", @@ -1470,7 +1516,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1486,7 +1532,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1720781449, "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", @@ -1597,11 +1643,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -1613,15 +1659,15 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1635,15 +1681,15 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721042250, - "narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", + "lastModified": 1721224205, + "narHash": "sha256-W0+l7HNzZfEmIx/1Yp3Tow/GZILVjrMjWfTt1Mos7mI=", "owner": "nix-community", "repo": "nixvim", - "rev": "b9ed90003273f0a75151b32948e16b44891f403c", + "rev": "55bda0cc3b230255d271e5eef82f3279dae9f859", "type": "github" }, "original": { @@ -1654,11 +1700,11 @@ }, "nur": { "locked": { - "lastModified": 1721182162, - "narHash": "sha256-uaY8EFjVm0mxL5PtmwmezvChmUTXKv9NhzzOEx+1iKw=", + "lastModified": 1721241063, + "narHash": "sha256-jBAuwmtJmSNT6xwjtGINslFK0m3R3+Ydw+xrd+a3tSE=", "owner": "nix-community", "repo": "NUR", - "rev": "5bcc9c44e4cc596cc9a1825faab0aba694bcf09c", + "rev": "f33f46c1e38b07b20a978ac39208058ab9ddedb1", "type": "github" }, "original": { @@ -1702,7 +1748,7 @@ "inputs": { "flake-compat": "flake-compat_6", "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1740,7 +1786,7 @@ "nix-index-database": "nix-index-database", "nix-ld-rs": "nix-ld-rs", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-small": "nixpkgs-small", "nixvim": "nixvim", "nur": "nur", @@ -2004,21 +2050,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2111,16 +2142,16 @@ }, "systems_8": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2186,11 +2217,11 @@ ] }, "locked": { - "lastModified": 1721132432, - "narHash": "sha256-3lTjgEocdOKT0ioxzcOqvrL/pkxZvSFbfRRveWnHHdw=", + "lastModified": 1721248812, + "narHash": "sha256-6AIEOU1l2WCNFNZxkOSrC4jzcBa5xnyJzEN9K+10hGs=", "owner": "Alexays", "repo": "Waybar", - "rev": "3f61df4e6634a79f047c9aa3f8c035fd970159f9", + "rev": "152053e0696b651edaa885c64895072501d27cf3", "type": "github" }, "original": { @@ -2205,7 +2236,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, diff --git a/modules/home/programs/graphical/bars/waybar/default.nix b/modules/home/programs/graphical/bars/waybar/default.nix index c3b7fff6f..2f0803a16 100644 --- a/modules/home/programs/graphical/bars/waybar/default.nix +++ b/modules/home/programs/graphical/bars/waybar/default.nix @@ -124,28 +124,7 @@ in programs.waybar = { enable = true; - package = waybar.packages.${system}.waybar.overrideAttrs (_oldAttrs: { - patches = [ - # TODO: remove when https://github.com/Alexays/Waybar/pull/3447 is merged - (pkgs.fetchpatch { - name = "disable-hyprland-not-in-use.patch"; - url = "https://github.com/Alexays/Waybar/pull/3447.patch"; - hash = "sha256-iQSjwmP/k8Iu3c5QgC+yQmqoUexLVGmIwczxszdQKmk="; - }) - # TODO: remove when https://github.com/Alexays/Waybar/pull/3443 is merged - (pkgs.fetchpatch { - name = "fix-tray-disappearing.patch"; - url = "https://github.com/Alexays/Waybar/pull/3443.patch"; - hash = "sha256-SL/1UUqff1iGkC2fQNc0XLlHq6xZL4YLgcc8Fg/Lut8="; - }) - # TODO: remove when https://github.com/Alexays/Waybar/pull/3448 is merged - (pkgs.fetchpatch { - name = "sway-ignore-empty-rewrite.patch"; - url = "https://github.com/Alexays/Waybar/pull/3448.patch"; - hash = "sha256-OOBhNNDryiZr70drvGKv55g+uSgYsK7IMCm1Dl+Mg5M="; - }) - ]; - }); + package = waybar.packages.${system}.waybar; systemd.enable = true; settings = mkMerge [