diff --git a/flake.lock b/flake.lock index d73a956..c9ff588 100644 --- a/flake.lock +++ b/flake.lock @@ -565,11 +565,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718273282, - "narHash": "sha256-Drdpjgw9ZHbS2SC5V41PmuFqVpxXqKJyi8Wl7gUneYI=", + "lastModified": 1718468441, + "narHash": "sha256-yLoQC4IaaM3xijxoGMkyPgwKKr3xYLdToA7j3zNRn7A=", "ref": "refs/heads/main", - "rev": "e6d10539af1fdca33b10bc3c1dfac16f1cdfe1c8", - "revCount": 4819, + "rev": "91fe58f8f278d126852877eadc87c50ca7b9b78d", + "revCount": 4836, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -580,6 +580,36 @@ "url": "https://github.com/hyprwm/Hyprland" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -1098,6 +1128,7 @@ "flux": "flux", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "impermanence": "impermanence", "microvm": "microvm", "neovim": "neovim", diff --git a/flake.nix b/flake.nix index bd2344c..34a9d5d 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,10 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; #### Iogamaster inputs nixos-generators.url = "github:nix-community/nixos-generators"; diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index c5e49a3..cf71645 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -87,6 +87,8 @@ in wayland.windowManager.hyprland = { # Whether to enable Hyprland wayland compositor enable = true; + package = inputs.hyprland.packages."${pkgs.system}".hyprland; + # The hyprland package to use (simplifies use of plugins) # package = inputs.hyprland.packages.${pkgs.system}.hyprland; # Whether to enable XWayland @@ -95,6 +97,10 @@ in # Optional # Whether to enable hyprland-session.target on hyprland startup systemd.enable = true; + # Make PATH available to systemd services + systemd.variables = [ "--all" ]; + + plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars ]; settings = { "$mod" = "SUPER"; @@ -283,6 +289,17 @@ in "$mod CTRL, 9, movetoworkspacesilent, 9" "$mod CTRL, 0, movetoworkspacesilent, 10" ]; + + plugin = { + hyprbars = { + bar_text_size = 10; + bar_height = 16; + bar_text_font = "Ubuntu Nerd Font"; + bar_precedence_over_border = false; + + hyprbars-button = [ "rgb(${palette.base03}), 14, 󰖭, hyprctl dispatch killactive" ]; + }; + }; }; }; };