switch sddm for greetd

This commit is contained in:
Christoph Hollizeck 2024-09-12 20:52:09 +02:00
parent 817ad98de6
commit 767922cdd0
5 changed files with 41 additions and 21 deletions

View file

@ -9,10 +9,15 @@
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 = {
enable = mkEnableOption "Rofi"; enable = mkEnableOption "Rofi";
package = mkOption { package = mkOption {
type = types.package; type = types.package;

View file

@ -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;

View file

@ -46,36 +46,49 @@ 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 = {
enable = true;
package = hyprland-package;
portalPackage =
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
};
};
programs.hyprland = { services = {
enable = true; xserver = enabled;
package = hyprland-package; greetd = {
portalPackage = enable = true;
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; 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 = {
waybar = enabled; waybar = enabled;
rofi = { rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland-unwrapped; package = pkgs.rofi-wayland-unwrapped;
};
}; };
};
nix.extra-substituters.${cachix-url} = { nix.extra-substituters.${cachix-url} = {
key = cachix-key; key = cachix-key;
@ -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"

View file

@ -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;
}; };
};
}; };
} }

View file

@ -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 = [