diff --git a/flake.lock b/flake.lock index aaa221d..72c9b05 100644 --- a/flake.lock +++ b/flake.lock @@ -592,7 +592,9 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1735894462, @@ -671,7 +673,7 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -822,22 +824,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -853,7 +839,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -869,7 +855,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1734424634, "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", @@ -885,7 +871,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -909,7 +895,7 @@ "git-hooks": "git-hooks_2", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -1022,7 +1008,7 @@ "hyprpanel": "hyprpanel", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", @@ -1034,7 +1020,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { diff --git a/flake.nix b/flake.nix index 2ac3153..3147ea4 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,10 @@ hardware.url = "github:NixOS/nixos-hardware/master"; firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; - hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + hyprpanel = { + url = "github:Jas-SinghFSU/HyprPanel"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 62bfbd6..75418b7 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -76,7 +76,7 @@ in "exec-once" = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "hyprpanel" + # "hyprpanel" "nm-applet" "hyprsunset" ]; diff --git a/home/common/programs/hyprland/hyprpanel.nix b/home/common/programs/hyprland/hyprpanel.nix index fee8cc3..6ca51bf 100644 --- a/home/common/programs/hyprland/hyprpanel.nix +++ b/home/common/programs/hyprland/hyprpanel.nix @@ -1,10 +1,11 @@ { inputs, - pkgs, ... }: { + imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; + programs.hyprpanel = { enable = true;