seems right

This commit is contained in:
unexplrd
2025-02-06 14:23:13 +02:00
parent 2e6e28ef32
commit d76e7f4f71
10 changed files with 88 additions and 92 deletions

View File

@ -7,31 +7,40 @@
with lib; let
cfg = config.desktop.hyprland;
in {
imports = [./misc/sound.nix ./misc/regreet.nix];
imports = [./common/pipewire.nix];
options = {
desktop.hyprland.enable =
mkEnableOption "enable hyprland desktop";
};
config = mkIf cfg.enable {
programs.hyprland.enable = true;
programs.hyprland.package = pkgs.hyprland;
fonts.fontDir.enable = true;
security.pam.services.hyprlock = {};
security.pam.loginLimits = [
{
domain = "@users";
item = "rtprio";
type = "-";
value = 1;
}
environment.systemPackages = with pkgs; [
brightnessctl
gcr_4
];
programs.dconf.enable = true;
programs.seahorse.enable = true;
services.gnome.gnome-keyring.enable = true;
services.udisks2.enable = true;
services.dbus = {
apparmor = "enabled";
implementation = "broker";
fonts.fontDir.enable = true;
security.pam = {
services.hyprlock = {};
loginLimits = [
{
domain = "@users";
item = "rtprio";
type = "-";
value = 1;
}
];
};
services = {
gnome.gnome-keyring.enable = true;
udisks2.enable = true;
dbus = {
apparmor = "enabled";
implementation = "broker";
};
};
programs = {
dconf.enable = true;
seahorse.enable = true;
};
xdg.portal = {
enable = true;
@ -39,18 +48,25 @@ in {
xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
];
config = {
common = {
default = [
"hyprland"
"gtk"
];
config.common.default = [
"hyprland"
"gtk"
];
};
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
initial_session = {
user = "user";
command = "Hyprland";
};
};
};
services.greetd.settings.initial_session = {
user = "user";
command = "Hyprland";
};
};
}

View File

@ -1,12 +0,0 @@
{pkgs, ...}: {
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
};
};
}

View File

@ -7,7 +7,7 @@
with lib; let
cfg = config.desktop.niri;
in {
imports = [./misc/sound.nix ./misc/regreet.nix];
imports = [./common/pipewire.nix];
options = {
desktop.niri.enable =
mkEnableOption "enable niri desktop";
@ -52,9 +52,19 @@ in {
"gtk"
];
};
services.greetd.settings.initial_session = {
user = "user";
command = "${pkgs.niri}/bin/niri-session";
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
initial_session = {
user = "user";
command = "${pkgs.niri}/bin/niri-session";
};
};
};
};
}

View File

@ -1,6 +1,5 @@
{
config,
pkgs,
lib,
...
}:
@ -8,7 +7,7 @@ with lib; let
cfg = config.desktop.plasma;
in {
imports = [
./misc/sound.nix
./common/pipewire.nix
];
options = {
desktop.plasma = {
@ -17,12 +16,13 @@ in {
};
};
config = mkIf cfg.enable {
services.displayManager.sddm = {
enable = cfg.sddmEnable;
wayland.enable = true;
services = {
desktopManager.plasma6.enable = true;
displayManager.sddm = {
enable = cfg.sddmEnable;
wayland.enable = true;
};
};
services.desktopManager.plasma6.enable = true;
fonts.fontDir.enable = true;
};
}