christoph/flake-nixinator
1
Fork 0
Code Activity

System: Align system hyprland package with hyprland module

Browse Source
This commit is contained in:
Christoph Urlacher
2025-07-22 13:58:27 +02:00
parent cc77467709
commit 2412129204
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
home/modules/hyprland/default.nix
View File

@ -10,20 +10,21 @@
}: let }: let
inherit (config.modules) hyprland color; inherit (config.modules) hyprland color;
# Autostart programs
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
# Keybindings
always-bind = import ./mappings.nix {inherit lib config hyprland;}; always-bind = import ./mappings.nix {inherit lib config hyprland;};
# Mousebindings
always-bindm = { always-bindm = {
"$mainMod, mouse:272" = ["movewindow"]; "$mainMod, mouse:272" = ["movewindow"];
"$mainMod, mouse:273" = ["resizewindow"]; "$mainMod, mouse:273" = ["resizewindow"];
}; };
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
in { in {
options.modules.hyprland = import ./options.nix {inherit lib mylib;}; options.modules.hyprland = import ./options.nix {inherit lib mylib;};
config = lib.mkIf hyprland.enable { config = lib.mkIf hyprland.enable {
# Some assertion is not possible if HM is used standalone,
# because nixosConfig won't be available.
assertions = [ assertions = [
{ {
assertion = nixosConfig.programs.hyprland.enable; assertion = nixosConfig.programs.hyprland.enable;

6
system/default.nix
View File

@ -213,7 +213,7 @@ with mylib.networking; {
}; };
# https://github.com/NixOS/nixpkgs/issues/179486 # https://github.com/NixOS/nixpkgs/issues/179486
supportedLocales = ["en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8"]; supportedLocales = ["${en}/UTF-8" "${de}/UTF-8"];
}; };
console = { console = {
@ -339,6 +339,10 @@ with mylib.networking; {
hyprland = { hyprland = {
enable = !headless; enable = !headless;
package = inputs.hyprland.packages.${system}.hyprland;
portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
xwayland.enable = true; xwayland.enable = true;
withUWSM = true; withUWSM = true;
}; };

7
system/modules/desktopportal/default.nix
View File

@ -43,9 +43,10 @@ in {
xdg-desktop-portal-gtk # Fallback xdg-desktop-portal-gtk # Fallback
] ]
(lib.mkIf desktopportal.hyprland.enable [ # We don't need to install that explicitly
xdg-desktop-portal-hyprland # (lib.mkIf desktopportal.hyprland.enable [
]) # xdg-desktop-portal-hyprland
# ])
(lib.mkIf desktopportal.termfilechooser.enable [ (lib.mkIf desktopportal.termfilechooser.enable [
xdg-desktop-portal-termfilechooser # Filechooser using yazi xdg-desktop-portal-termfilechooser # Filechooser using yazi