From 427d5783baeeb6edac10995eae27603523756769 Mon Sep 17 00:00:00 2001 From: Uzair Mohammed Date: Sat, 28 Dec 2024 18:13:55 -0800 Subject: [PATCH] Nvm sticking with waybar lol --- flake.lock | 128 ++++++++++++++++++++++++++-- flake.nix | 6 -- home/modules/hyprland/hyprland.nix | 3 +- home/modules/hyprland/hyprpanel.nix | 5 -- 4 files changed, 122 insertions(+), 20 deletions(-) delete mode 100644 home/modules/hyprland/hyprpanel.nix diff --git a/flake.lock b/flake.lock index 250f69e..ed625c0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "ags": { + "inputs": { + "astal": "astal", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1734091628, + "narHash": "sha256-8O3i8zESjHVsGzyXb8gEpLztvANq3Ot5bwo60YKJc7k=", + "owner": "aylur", + "repo": "ags", + "rev": "27cd93147aba09142fa585fd16f13c56268b696c", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -33,6 +52,46 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733520119, + "narHash": "sha256-6K07ZJTnFu1xASBCMtVc9cFTbBEauwSc7gGBmjLkLSk=", + "owner": "aylur", + "repo": "astal", + "rev": "4c19d8d06fa25cc6389f37abe8839b4d8be5c0d6", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, + "astal_2": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1734814417, + "narHash": "sha256-R+tLGIxlaqsOmV52TdXHP0u33q5PdJ77gtiUPK5BbMg=", + "owner": "aylur", + "repo": "astal", + "rev": "3468763d51d389c67ec7b1a390ffa8a5328bddb6", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -616,6 +675,28 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags", + "astal": "astal_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735437320, + "narHash": "sha256-1K52XUPvQMP416+sW9i1f+xG4s7+ipr5qzHeRs4F6Pw=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "9343ae85a3020f18dc1c93680a6b9b6e4984f696", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -771,7 +852,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "zig-deps-fod": "zig-deps-fod" }, "locked": { @@ -893,6 +974,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1721970117, "narHash": "sha256-Hwm46lggqtihMaRuxbNaC1ACcU2a0jO/HXqrdjMatXk=", @@ -908,7 +1021,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -924,7 +1037,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1734649271, "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", @@ -940,7 +1053,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -1063,10 +1176,11 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-qtutils": "hyprland-qtutils_2", + "hyprpanel": "hyprpanel", "lanzaboote": "lanzaboote", "nixos-cli": "nixos-cli", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", "walker": "walker" @@ -1202,7 +1316,7 @@ "walker": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1735288946, @@ -1262,7 +1376,7 @@ "zig-deps-fod": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1720999842, diff --git a/flake.nix b/flake.nix index d5541a9..91073bc 100644 --- a/flake.nix +++ b/flake.nix @@ -50,11 +50,6 @@ walker = { url = "github:abenz1267/walker"; }; - - hyprpanel = { - url = "github:Jas-SinghFSU/HyprPanel"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -91,7 +86,6 @@ ./home/home.nix nixvim.homeManagerModules.nixvim walker.homeManagerModules.default - inputs.hyprpanel.homeManagerModules.hyprpanel ]; }; } diff --git a/home/modules/hyprland/hyprland.nix b/home/modules/hyprland/hyprland.nix index 2e4f203..5e426d4 100644 --- a/home/modules/hyprland/hyprland.nix +++ b/home/modules/hyprland/hyprland.nix @@ -13,7 +13,6 @@ ./cliphist.nix ./wlogout.nix ./wlsunset.nix - ./hyprpanel.nix ]; home.packages = [ @@ -205,7 +204,7 @@ }; extraConfig = '' - exec-once hyprpanel + exec-once waybar ''; }; } diff --git a/home/modules/hyprland/hyprpanel.nix b/home/modules/hyprland/hyprpanel.nix deleted file mode 100644 index 3047088..0000000 --- a/home/modules/hyprland/hyprpanel.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.hyprpanel = { - enable = true; - }; -}