diff --git a/flake.lock b/flake.lock index f7159c9..050efff 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "ags": { + "inputs": { + "astal": "astal", + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736090999, + "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", + "owner": "aylur", + "repo": "ags", + "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -70,6 +92,28 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "owner": "aylur", + "repo": "astal", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -583,6 +627,25 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1737011541, + "narHash": "sha256-YAT1VozLQ29V56EvEzJQswBOCLZDqn/gTU05mf+UFts=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "88609f7e4c244326face34cb992a79053f2c7810", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -784,6 +847,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1736549401, "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", @@ -799,7 +878,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -869,8 +948,9 @@ "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-virtual-desktops": "hyprland-virtual-desktops", + "hyprpanel": "hyprpanel", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "walker": "walker" } @@ -923,7 +1003,7 @@ "walker": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 673fa68..277a5cf 100644 --- a/flake.nix +++ b/flake.nix @@ -9,18 +9,15 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Managing flatpak apps nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - # hyprland and plugins + # hyprland, plugins and related utils hyprland.url = "github:hyprwm/Hyprland"; - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.hyprland.follows = "hyprland"; - # }; hyprgrass = { url = "github:horriblename/hyprgrass"; inputs.hyprland.follows = "hyprland"; # IMPORTANT }; hyprland-virtual-desktops.url = "github:levnikmyskin/hyprland-virtual-desktops"; walker.url = "github:abenz1267/walker"; + hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; }; outputs = { @@ -29,14 +26,22 @@ home-manager, hyprgrass, hyprland-virtual-desktops, + hyprpanel, ... - } @ inputs: { + } @ inputs: + let + overlays = [ + inputs.hyprpanel.overlay + ]; + in + { ## NixOS configurations are the main output of this flake # HP Spectre x360 2018 nixosConfigurations.spectre = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; + modules = [ ./hosts/spectre-x360-2018 home-manager.nixosModules.home-manager diff --git a/modules/home-manager/hyprland-customization.nix b/modules/home-manager/hyprland-customization.nix index 8679d98..c6a0041 100644 --- a/modules/home-manager/hyprland-customization.nix +++ b/modules/home-manager/hyprland-customization.nix @@ -17,6 +17,9 @@ # plugin.virtual-desktops = { # } + exec-once = [ + "${pkgs.hyprpanel}/bin/hyprpanel" + ]; }; plugins = [