diff --git a/hosts/slab/configuration.nix b/hosts/slab/configuration.nix index 551b8fb..a391d66 100644 --- a/hosts/slab/configuration.nix +++ b/hosts/slab/configuration.nix @@ -38,12 +38,12 @@ sessions.hyprland.enable = false; sessions.plasma.enable = true; }; - services.xserver.displayManager.sddm.enable = lib.mkForce true; + services.displayManager.sddm.enable = lib.mkForce true; services.xserver.displayManager.startx.enable = lib.mkForce false; }; # who needs a display manager? - services.xserver.displayManager.sddm.enable = false; + services.displayManager.sddm.enable = false; nixfiles = { profile.pc.enable = true; diff --git a/system/common/me.nix b/system/common/me.nix index 0ece4af..688b336 100644 --- a/system/common/me.nix +++ b/system/common/me.nix @@ -24,9 +24,6 @@ in # shell config programs.zsh.enable = true; - programs.fzf = { - keybindings = true; - fuzzyCompletion = true; - }; + programs.fzf.enable = true; }; } diff --git a/system/programs/greetd.nix b/system/programs/greetd.nix index 6006406..160a25f 100644 --- a/system/programs/greetd.nix +++ b/system/programs/greetd.nix @@ -6,7 +6,7 @@ let inherit (lib) optional optionals; optionalsSet = val: optionals (!(isNull val)); optionalSet = val: optional (!(isNull val)); - sessions = config.services.xserver.displayManager.sessionData.desktops; + sessions = config.services.displayManager.sessionData.desktops; xsessions = "${sessions}/share/xsessions"; wayland-sessions = "${sessions}/share/wayland-sessions"; @@ -27,7 +27,8 @@ in command = let st = cfg.settings; args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session" - "--sessions" "${xsessions}:${wayland-sessions}" ] + "--sessions" "${xsessions}:${wayland-sessions}" + ] ++ optionalsSet st.greeting [ "--greeting" st.greeting ] ++ optional st.time "--time" ++ optionalsSet st.command [ "--cmd" st.finalCommand ] diff --git a/system/sessions/plasma.nix b/system/sessions/plasma.nix index a6d9fff..94a3ddc 100644 --- a/system/sessions/plasma.nix +++ b/system/sessions/plasma.nix @@ -17,9 +17,9 @@ in config = mkIf cfg.enable { nixfiles.common.desktop.enable = true; - services.xserver.displayManager.sddm.enable = mkDefault true; + services.displayManager.sddm.enable = mkDefault true; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.displayManager.defaultSession = "plasmawayland"; programs.kdeconnect.enable = mkDefault true; nixfiles.meta.wayland = true;