From 636dcf4cda54c80db0ba06889f25d369a88b3d6e Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 26 May 2024 14:51:37 +0200 Subject: [PATCH] removed waybar from inputs, just taking it from nixpkgs --- flake.lock | 152 ++++++++++++++++++++--------------------- flake.nix | 3 +- modules/gui/waybar.nix | 3 +- 3 files changed, 78 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 66b2de1..cff6a30 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716397752, - "narHash": "sha256-T9AOVfpb9A3PCXIvi/0rTelhZvcMu+Duz+1BT4ziQds=", + "lastModified": 1716714348, + "narHash": "sha256-BKe2l6j185w6NCD5o2WbT3v6Ul8CYIUGlmI04MbS6QE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7481fce8f1bec8f8478c06142f75a6f4703dbba5", + "rev": "929e09706815a9e10cc749393eaa5895761de32a", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716359173, - "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", + "lastModified": 1716704729, + "narHash": "sha256-Yk0L1JdBTdC9ZtDreqcMMolOtTp0XnPjrACT8oTw2Wg=", "owner": "nix-community", "repo": "fenix", - "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", + "rev": "aaa27b4cf3729b6562cd4dd65ba24eeda3731002", "type": "github" }, "original": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716711219, + "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1715791817, - "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", + "lastModified": 1716576411, + "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", + "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", "type": "github" }, "original": { @@ -822,11 +822,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716410236, - "narHash": "sha256-lyxJeurqTLdsXVm8o9mc25gSD0L3m72cL20fnxJ7SO4=", + "lastModified": 1716669967, + "narHash": "sha256-wq91XpwR0tv7e7KwSp0qzvu31EMssznl8DzbNy4M4Hk=", "ref": "refs/heads/main", - "rev": "3775776a07dc54347dd0859c7b6fc63aa3a4c7fd", - "revCount": 4726, + "rev": "553232a3e4c112c8511309e6b685cb614895e714", + "revCount": 4743, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -901,11 +901,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -945,11 +945,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1716120557, - "narHash": "sha256-rvNq9YolMY1DRMgwdAti8qwNDjkhTsotSWa15/Ch7+A=", + "lastModified": 1716725378, + "narHash": "sha256-bNTVDAVBLFSSTU+q54cJnntmFKBi+F/D8sSqlZwBGiM=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "5fa64b174daa22fe0d20ebbcc0ec2c7905b503f1", + "rev": "dbc9130fe1455e0f6ee4d8f5f799f9be551f866b", "type": "github" }, "original": { @@ -966,11 +966,11 @@ ] }, "locked": { - "lastModified": 1715901937, - "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", + "lastModified": 1716511055, + "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", + "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ ] }, "locked": { - "lastModified": 1715826480, - "narHash": "sha256-e+DQFT2HS6pFaHPfmbjA6F9zZQPdEuLeJYz5rfpXXWY=", + "lastModified": 1716431440, + "narHash": "sha256-331cJMya1uuIKaq6wWfrHmBbg/cE7LW6d7W3CMornzQ=", "owner": "nixpak", "repo": "nixpak", - "rev": "d66f9e3ce18e9de5259e2c8c3c9a7ff31dc2945f", + "rev": "809ba0a420bc57c6eca2f5fdfef9919604c8903f", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1716079763, - "narHash": "sha256-DGRfb7fO7c3XDS3twmuaV5NAGPPdU3W7Q35fjIZc8iY=", + "lastModified": 1716684580, + "narHash": "sha256-sIbMJWJr4hl2PWd9/iWlh89QfVzBn1NJ3u5RjeZADuM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0df131b5ee4d928a4b664b6d0cd99cf134d6ab6b", + "rev": "d0d27192931680482081aa1c38389da2af84a651", "type": "github" }, "original": { @@ -1110,11 +1110,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716218643, - "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -1132,11 +1132,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1716402128, - "narHash": "sha256-0GiKUz7JImcx+TG082iSep1Ap/sFJ36IPzSYVSQDBhA=", + "lastModified": 1716726516, + "narHash": "sha256-hP2w967kUOj7o3dIeCUQpuz5B0sDWNEjGUGLqrFfr5M=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8b85dc01079bc537183cf9bcf4c17eb714121643", + "rev": "fac2b5867654ec71d351bf3de98b979e746bf5a3", "type": "github" }, "original": { @@ -1147,11 +1147,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1163,11 +1163,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -1179,11 +1179,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1211,11 +1211,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1288,11 +1288,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716326274, - "narHash": "sha256-1LyTvpjb8Cmlg3TRnP56rvqK1WSNa518pD6F0tjgM+U=", + "lastModified": 1716717390, + "narHash": "sha256-Hd8ky86xAFDrUqNPPx0bO/1x6WUEyWNLrdTEVShAMb8=", "owner": "nix-community", "repo": "nixvim", - "rev": "5d2e01495944dcf7cf7ee53a7074c4010165d756", + "rev": "beb86eec7cad226d100d2841aae09fc2d4e152a8", "type": "github" }, "original": { @@ -1303,11 +1303,11 @@ }, "nur": { "locked": { - "lastModified": 1716410853, - "narHash": "sha256-a90YI98Ha+nKwOOvNxvo81ZNhdFTsnCvvROC8xxXQ+g=", + "lastModified": 1716724003, + "narHash": "sha256-6h1tHpbhOXxXHkSGjrkURbOjXEdb39etHBCIdz9tdu8=", "owner": "nix-community", "repo": "NUR", - "rev": "f52674dd1a7f8539bedd6a0d19ab32e62771619b", + "rev": "d11d17cf532b29a0b19564b8d6dfd66faf4e4f3e", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -1369,11 +1369,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1716107283, - "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", + "lastModified": 1716572615, + "narHash": "sha256-mVUbarr4PNjERDk+uaoitPq7eL7De0ythZehezAzug8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", + "rev": "a55e8bf09cdfc25066b77823cc98976a51af8a8b", "type": "github" }, "original": { @@ -1489,11 +1489,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716395969, - "narHash": "sha256-Qse5s/R8QKdI6yYnDv9pcDSrR8qVWzJ2m1QMjkuVxuU=", + "lastModified": 1716456264, + "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=", "owner": "danth", "repo": "stylix", - "rev": "e7543c51eff9e73c85450c473e1f24513a5e0a0f", + "rev": "290c8aef476ce98fff9cefc059284429d561a085", "type": "github" }, "original": { @@ -1656,11 +1656,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1716362227, - "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", + "lastModified": 1716524201, + "narHash": "sha256-5+c0w1KegSmT4W2AzsW433YmmBm+SlNHlpcaXWVcg08=", "owner": "Alexays", "repo": "Waybar", - "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", + "rev": "63bb338343cad3337726739704b75d1b0b13a8a5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2a309bc..3ed331b 100644 --- a/flake.nix +++ b/flake.nix @@ -63,9 +63,8 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - agenix.url = "github:ryantm/agenix"; - waybar.url = "github:Alexays/Waybar"; + agenix.url = "github:ryantm/agenix"; fenix = { url = "github:nix-community/fenix"; diff --git a/modules/gui/waybar.nix b/modules/gui/waybar.nix index a352b75..cc3555f 100644 --- a/modules/gui/waybar.nix +++ b/modules/gui/waybar.nix @@ -1,7 +1,6 @@ { config, lib, - inputs, pkgs, ... }: let @@ -13,7 +12,7 @@ in { home-manager.users.${username} = { programs.waybar = { enable = true; - package = inputs.waybar.packages.${pkgs.system}.waybar; + package = pkgs.waybar; settings.mainBar = { gtk-layer-shell = true; layer = "top";