hyprland: use mkMerge

This commit is contained in:
Zynh Ludwig 2025-03-19 06:28:45 -07:00
parent e2f0d0a00a
commit 668902c9ba

View file

@ -8,35 +8,37 @@ in
enable = lib.mkEnableOption "hyprland"; enable = lib.mkEnableOption "hyprland";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable (lib.mkMerge [
services.graphical-desktop.enable = lib.mkDefault true; # Core Module
{
services.graphical-desktop.enable = lib.mkDefault true;
services.displayManager = { services.displayManager = {
enable = true; enable = true;
# sessionPackages = [ pkgs.hyprland ]; # sessionPackages = [ pkgs.hyprland ];
sddm = { sddm = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
wayland.enable = lib.mkDefault true; wayland.enable = lib.mkDefault true;
theme = "sddm-astronaut-theme"; theme = "sddm-astronaut-theme";
package = pkgs.kdePackages.sddm; package = pkgs.kdePackages.sddm;
extraPackages = [ extraPackages = [
(pkgs.sddm-astronaut.override { embeddedTheme = "pixel_sakura"; }) (pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; })
] ++ (with pkgs.kdePackages; [ ] ++ (with pkgs.kdePackages; [
qtsvg qtsvg
qtvirtualkeyboard qtvirtualkeyboard
qtmultimedia qtmultimedia
]); ]);
};
}; };
};
security = { security = {
polkit.enable = lib.mkDefault true; polkit.enable = lib.mkDefault true;
}; };
programs = { programs = {
dconf.enable = lib.mkDefault true; dconf.enable = lib.mkDefault true;
xwayland.enable = lib.mkDefault true; xwayland.enable = lib.mkDefault true;
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
@ -94,64 +96,10 @@ in
# sddm Theme # sddm Theme
(pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; }) (pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; })
]; ];
};
programs.waybar.enable = true; home-manager.sharedModules = [
./home/hyprland.nix
];
}
programs.hyprland = { ]);
enable = true;
withUWSM = true;
xwayland.enable = true;
};
services.hypridle.enable = true;
systemd.user.services.hypridle.path = [ pkgs.brightnessctl ];
# programs.hyprlock.enable = true;
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050913
xdg.portal.config.hyprland.default = lib.mkDefault [ "wlr" "gtk" ];
services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
environment.variables = {
QT_QPA_PLATFORM = "wayland;xcb";
MOZ_ENABLE_WAYLAND = 1;
SDL_VIDEODRIVEWR = "wayland,x11";
_JAVA_AWT_WM_NONREPARENTING = 1;
};
environment.systemPackages = with pkgs; [
# Screenshotting
grim
slurp
satty
# Hardware Control
brightnessctl
# Desktop
wofi
kitty
pipewire-controller
# Wayland Utilities
wdisplays
xorg.xlsclients
wl-clipboard
# sddm Theme
(pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; })
# Cursor Theme
inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default
];
home-manager.sharedModules = [
./home/hyprland.nix
];
};
} }