switch sddm for greetd
This commit is contained in:
parent
817ad98de6
commit
767922cdd0
|
@ -9,7 +9,12 @@
|
||||||
let
|
let
|
||||||
cfg = config.${namespace}.graphical-interface.desktop-manager.addons.rofi;
|
cfg = config.${namespace}.graphical-interface.desktop-manager.addons.rofi;
|
||||||
|
|
||||||
inherit (lib) mkIf mkEnableOption mkOption types;
|
inherit (lib)
|
||||||
|
mkIf
|
||||||
|
mkEnableOption
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.${namespace}.graphical-interface.desktop-manager.addons.rofi = {
|
options.${namespace}.graphical-interface.desktop-manager.addons.rofi = {
|
||||||
|
|
|
@ -29,7 +29,6 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
|
||||||
|
|
||||||
wyrdgard.home.file = {
|
wyrdgard.home.file = {
|
||||||
".config/waybar/config".source = ./config;
|
".config/waybar/config".source = ./config;
|
||||||
".config/waybar/style.css".source = ./style.css;
|
".config/waybar/style.css".source = ./style.css;
|
||||||
|
|
|
@ -46,27 +46,40 @@ in
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
polkit
|
polkit-kde-agent
|
||||||
|
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wl-screenrec
|
wl-screenrec
|
||||||
wlr-randr
|
wlr-randr
|
||||||
grimblast
|
grimblast
|
||||||
|
xfce.thunar
|
||||||
rofi
|
dunst
|
||||||
|
|
||||||
jq
|
jq
|
||||||
focus-1password
|
focus-1password
|
||||||
];
|
];
|
||||||
|
|
||||||
services.xserver = enabled;
|
programs = {
|
||||||
|
hyprland = {
|
||||||
programs.hyprland = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
package = hyprland-package;
|
package = hyprland-package;
|
||||||
portalPackage =
|
portalPackage =
|
||||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services = {
|
||||||
|
xserver = enabled;
|
||||||
|
greetd = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
default_session = {
|
||||||
|
command = "${lib.getExe pkgs.greetd.tuigreet} --cmd Hyprland";
|
||||||
|
user = config.wyrdgard.user.name;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
wyrdgard = {
|
wyrdgard = {
|
||||||
graphical-interface.desktop-manager.addons = {
|
graphical-interface.desktop-manager.addons = {
|
||||||
|
@ -92,6 +105,9 @@ in
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
"waybar"
|
"waybar"
|
||||||
|
"dunst"
|
||||||
|
"systemctl --user start plasma-polkit-agent"
|
||||||
|
|
||||||
"[workspace 3 silent] steam"
|
"[workspace 3 silent] steam"
|
||||||
"[workspace 2 silent] discord"
|
"[workspace 2 silent] discord"
|
||||||
"[workspace 2 silent] noisetorch"
|
"[workspace 2 silent] noisetorch"
|
||||||
|
@ -176,6 +192,9 @@ in
|
||||||
"$mod, P, pseudo,"
|
"$mod, P, pseudo,"
|
||||||
"$mod ALT, ,resizeactive,"
|
"$mod ALT, ,resizeactive,"
|
||||||
|
|
||||||
|
"$mod CTRL, left, movecurrentworkspacetomonitor, l"
|
||||||
|
"$mod CTRL, right, movecurrentworkspacetomonitor, r"
|
||||||
|
|
||||||
# move focus
|
# move focus
|
||||||
"$mod, h, hy3:movefocus, l"
|
"$mod, h, hy3:movefocus, l"
|
||||||
"$mod, j, hy3:movefocus, d"
|
"$mod, j, hy3:movefocus, d"
|
||||||
|
|
|
@ -17,11 +17,8 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ xdg-utils ];
|
environment.systemPackages = with pkgs; [ xdg-utils ];
|
||||||
|
|
||||||
wyrdgard.graphical-interface = {
|
wyrdgard.graphical-interface =
|
||||||
display-manager.sddm = enabled;
|
{
|
||||||
desktop-manager = {
|
|
||||||
kde = enabled;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,8 +39,8 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
"hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
|
|
||||||
"xrandr --output DP-2 --primary"
|
"xrandr --output DP-2 --primary"
|
||||||
|
"hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
|
||||||
];
|
];
|
||||||
|
|
||||||
workspace = [
|
workspace = [
|
||||||
|
|
Loading…
Reference in a new issue